PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix 2 tests broken by fragment migration."

Browse Source
This commit is contained in:
TreeHugger Robot
2018-07-13 17:20:48 +00:00
committed by Android (Google) Code Review
parent 244c7586f9 0a80d936f8
commit 3889acd53f
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/robotests/src/com/android/settings/password/SetupChooseLockPasswordTest.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.password;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.robolectric.RuntimeEnvironment.application; import static org.robolectric.RuntimeEnvironment.application;
import android.app.AlertDialog;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
@@ -37,7 +36,6 @@ import com.android.settings.testutils.shadow.ShadowUtils;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.Shadows; import org.robolectric.Shadows;
@@ -45,18 +43,19 @@ import org.robolectric.annotation.Config;
import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implementation;
import org.robolectric.annotation.Implements; import org.robolectric.annotation.Implements;
import org.robolectric.shadows.ShadowActivity; import org.robolectric.shadows.ShadowActivity;
import org.robolectric.shadows.ShadowAlertDialog;
import org.robolectric.shadows.ShadowDialog; import org.robolectric.shadows.ShadowDialog;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import androidx.appcompat.app.AlertDialog;
@RunWith(SettingsRobolectricTestRunner.class) @RunWith(SettingsRobolectricTestRunner.class)
@Config(shadows = { @Config(shadows = {
SettingsShadowResources.class, SettingsShadowResources.class,
SettingsShadowResourcesImpl.class, SettingsShadowResourcesImpl.class,
SettingsShadowResources.SettingsShadowTheme.class, SettingsShadowResources.SettingsShadowTheme.class,
ShadowUtils.class ShadowUtils.class
}) })
public class SetupChooseLockPasswordTest { public class SetupChooseLockPasswordTest {
@@ -82,7 +81,6 @@ public class SetupChooseLockPasswordTest {
} }
@Test @Test
@Ignore("b/111194289")
public void createActivity_withShowOptionsButtonExtra_shouldShowButton() { public void createActivity_withShowOptionsButtonExtra_shouldShowButton() {
SetupChooseLockPassword activity = createSetupChooseLockPassword(); SetupChooseLockPassword activity = createSetupChooseLockPassword();
Button optionsButton = activity.findViewById(R.id.screen_lock_options); Button optionsButton = activity.findViewById(R.id.screen_lock_options);
@@ -101,12 +99,11 @@ public class SetupChooseLockPasswordTest {
} }
@Test @Test
@Ignore("b/111194289")
public void allSecurityOptions_shouldBeShown_When_OptionsButtonIsClicked() { public void allSecurityOptions_shouldBeShown_When_OptionsButtonIsClicked() {
SetupChooseLockPassword activity = createSetupChooseLockPassword(); SetupChooseLockPassword activity = createSetupChooseLockPassword();
activity.findViewById(R.id.screen_lock_options).performClick(); activity.findViewById(R.id.screen_lock_options).performClick();
AlertDialog latestAlertDialog = ShadowAlertDialog.getLatestAlertDialog(); AlertDialog latestAlertDialog = (AlertDialog) ShadowDialog.getLatestDialog();
int count = Shadows.shadowOf(latestAlertDialog).getAdapter().getCount(); int count = latestAlertDialog.getListView().getCount();
assertThat(count).named("List items shown").isEqualTo(3); assertThat(count).named("List items shown").isEqualTo(3);
} }

4
tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResourcesImpl.java
View File

@@ -42,7 +42,8 @@ public class SettingsShadowResourcesImpl extends ShadowResourcesImpl {
// The drawable item in switchbar_background.xml refers to a very recent color attribute // The drawable item in switchbar_background.xml refers to a very recent color attribute
// that Robolectric isn't yet aware of. // that Robolectric isn't yet aware of.
// TODO: Remove this once Robolectric is updated. // TODO: Remove this once Robolectric is updated.
if (id == R.drawable.switchbar_background) { if (id == R.drawable.switchbar_background
|| id == R.color.ripple_material_light) {
return new ColorDrawable(); return new ColorDrawable();
} else if (id == R.drawable.ic_launcher_settings) { } else if (id == R.drawable.ic_launcher_settings) {
// ic_launcher_settings uses adaptive-icon, which is not supported by robolectric, // ic_launcher_settings uses adaptive-icon, which is not supported by robolectric,
@@ -56,6 +57,7 @@ public class SettingsShadowResourcesImpl extends ShadowResourcesImpl {
// progress_horizontal drawable // progress_horizontal drawable
id = android.R.drawable.progress_horizontal; id = android.R.drawable.progress_horizontal;
} }
return super.loadDrawable(wrapper, value, id, density, theme); return super.loadDrawable(wrapper, value, id, density, theme);
} }
} }