Fix test cases broken
- AndroiX AlertDialog needs to use Theme.AppCompat. - Create a ShadowAlertDialogCompat which can be compatible with AndroidX AlertDialog. Fix: 111247403 Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER=com.android.settings.password.ChooseLockTypeDialogFragmentTest Change-Id: I3e4bca285ecaefa5705c8d170050c21d1bc649e0
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (C) 2017 Google Inc.
|
||||
* Copyright (C) 2017 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
@@ -16,38 +16,33 @@
|
||||
|
||||
package com.android.settings.password;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotNull;
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Matchers.any;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.times;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.app.AlertDialog;
|
||||
import android.content.Context;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.password.ChooseLockTypeDialogFragment.OnLockTypeSelectedListener;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.testutils.shadow.ShadowUserManager;
|
||||
import com.android.settings.testutils.shadow.ShadowUtils;
|
||||
import com.android.settings.testutils.shadow.SettingsShadowResourcesImpl;
|
||||
import com.android.settings.testutils.shadow.ShadowAlertDialogCompat;
|
||||
import com.android.settingslib.testutils.FragmentTestUtils;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Ignore;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.Shadows;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadows.ShadowAlertDialog;
|
||||
import org.robolectric.shadows.ShadowDialog;
|
||||
|
||||
import androidx.appcompat.app.AlertDialog;
|
||||
import androidx.fragment.app.Fragment;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(shadows = {ShadowUserManager.class, ShadowUtils.class})
|
||||
@Config(shadows = {SettingsShadowResourcesImpl.class, ShadowAlertDialogCompat.class})
|
||||
public class ChooseLockTypeDialogFragmentTest {
|
||||
|
||||
private Context mContext;
|
||||
@@ -61,32 +56,36 @@ public class ChooseLockTypeDialogFragmentTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore("b/111247403")
|
||||
public void testThatDialog_IsShown() {
|
||||
AlertDialog latestDialog = startLockFragment();
|
||||
assertNotNull(latestDialog);
|
||||
ShadowDialog shadowDialog = Shadows.shadowOf(latestDialog);
|
||||
ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(
|
||||
latestDialog);
|
||||
|
||||
assertThat(latestDialog).isNotNull();
|
||||
assertThat(latestDialog.isShowing()).isTrue();
|
||||
// verify that we are looking at the expected dialog.
|
||||
assertEquals(shadowDialog.getTitle(),
|
||||
assertThat(shadowAlertDialog.getTitle()).isEqualTo(
|
||||
mContext.getString(R.string.setup_lock_settings_options_dialog_title));
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore("b/111247403")
|
||||
public void testThat_OnClickListener_IsCalled() {
|
||||
mFragment.mDelegate = mock(OnLockTypeSelectedListener.class);
|
||||
AlertDialog lockDialog = startLockFragment();
|
||||
ShadowAlertDialog shadowAlertDialog = Shadows.shadowOf(lockDialog);
|
||||
ShadowAlertDialogCompat shadowAlertDialog = ShadowAlertDialogCompat.shadowOf(lockDialog);
|
||||
|
||||
shadowAlertDialog.clickOnItem(0);
|
||||
|
||||
verify(mFragment.mDelegate, times(1)).onLockTypeSelected(any(ScreenLockType.class));
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore("b/111247403")
|
||||
public void testThat_OnClickListener_IsNotCalledWhenCancelled() {
|
||||
mFragment.mDelegate = mock(OnLockTypeSelectedListener.class);
|
||||
AlertDialog lockDialog = startLockFragment();
|
||||
|
||||
lockDialog.dismiss();
|
||||
|
||||
verify(mFragment.mDelegate, never()).onLockTypeSelected(any(ScreenLockType.class));
|
||||
}
|
||||
|
||||
@@ -94,7 +93,7 @@ public class ChooseLockTypeDialogFragmentTest {
|
||||
ChooseLockTypeDialogFragment chooseLockTypeDialogFragment =
|
||||
ChooseLockTypeDialogFragment.newInstance(1234);
|
||||
chooseLockTypeDialogFragment.show(mFragment.getChildFragmentManager(), null);
|
||||
return ShadowAlertDialog.getLatestAlertDialog();
|
||||
return ShadowAlertDialogCompat.getLatestAlertDialog();
|
||||
}
|
||||
|
||||
public static class TestFragment extends Fragment implements OnLockTypeSelectedListener {
|
||||
|
Reference in New Issue
Block a user