From 9997df38d3cea42678c4716d0e4c347d6d404d76 Mon Sep 17 00:00:00 2001 From: Fan Wu Date: Thu, 21 Mar 2024 16:41:57 +0800 Subject: [PATCH] Fix test failures under settings/wallpaper Bug: 315124270 Test: atest Change-Id: I95a87c3644880ba29d310b45142c3c1d20870cdf --- .../wallpaper/FallbackHomeActivityTest.java | 15 ++++++++------- .../WallpaperSuggestionActivityTest.java | 7 +++---- .../WallpaperTypePreferenceControllerTest.java | 11 +++++------ 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java index 0c2583ff239..c1debb59486 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java @@ -27,14 +27,15 @@ import android.os.Handler; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import androidx.test.core.app.ApplicationProvider; import com.android.settings.FallbackHome; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.MockitoAnnotations; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; @@ -43,6 +44,7 @@ import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; +import org.robolectric.annotation.LooperMode; import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowApplication; @@ -50,15 +52,15 @@ import java.util.ArrayList; import java.util.List; @RunWith(RobolectricTestRunner.class) +@LooperMode(LooperMode.Mode.LEGACY) public class FallbackHomeActivityTest { + public final MockitoRule mMockitoRule = MockitoJUnit.rule(); private ActivityController mController; @Before public void setUp() { - MockitoAnnotations.initMocks(this); - - final Application application = RuntimeEnvironment.application; + final Application application = ApplicationProvider.getApplicationContext(); WallpaperManager wallpaperManager = WallpaperManager.getInstance(application); ShadowApplication shadowApplication = Shadows.shadowOf(application); shadowApplication.setSystemService(Context.WALLPAPER_SERVICE, wallpaperManager); @@ -66,7 +68,6 @@ public class FallbackHomeActivityTest { mController = Robolectric.buildActivity(FallbackHome.class); } - @Ignore("b/315124270") @Test @Config(shadows = ShadowWallpaperManager.class) public void wallpaperColorsChangedListener_ensured_removed() { @@ -83,7 +84,7 @@ public class FallbackHomeActivityTest { @Implements(WallpaperManager.class) public static class ShadowWallpaperManager extends - org.robolectric.shadows.ShadowWallpaperManager { + org.robolectric.shadows.ShadowWallpaperManager { private final List mListener = new ArrayList<>(); diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java index 1fff4061180..dd82714148c 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java @@ -31,7 +31,6 @@ import com.google.android.setupcompat.util.WizardManagerHelper; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -43,10 +42,12 @@ import org.robolectric.Shadows; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; +import org.robolectric.annotation.LooperMode; import org.robolectric.annotation.Resetter; import org.robolectric.shadows.ShadowApplication; @RunWith(RobolectricTestRunner.class) +@LooperMode(LooperMode.Mode.LEGACY) public class WallpaperSuggestionActivityTest { @Mock @@ -101,7 +102,6 @@ public class WallpaperSuggestionActivityTest { .isTrue(); } - @Ignore("b/315124270") @Test public void addExtras_intentFromSetupWizard_extrasHasWallpaperOnlyAndLaunchedSuw() { WallpaperSuggestionActivity activity = @@ -119,7 +119,6 @@ public class WallpaperSuggestionActivityTest { .isEqualTo("app_launched_suw"); } - @Ignore("b/315124270") @Test public void addExtras_intentNotFromSetupWizard_extrasHasFocusWallpaper() { WallpaperSuggestionActivity activity = Robolectric.buildActivity( @@ -135,7 +134,7 @@ public class WallpaperSuggestionActivityTest { @Implements(WallpaperManager.class) public static class ShadowWallpaperManager extends - org.robolectric.shadows.ShadowWallpaperManager { + org.robolectric.shadows.ShadowWallpaperManager { private static int sWallpaperId; diff --git a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java index c88b263083a..995bac6da9e 100644 --- a/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java @@ -27,15 +27,18 @@ import androidx.preference.Preference; import com.android.settings.core.BasePreferenceController; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.MockitoAnnotations; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.LooperMode; @RunWith(RobolectricTestRunner.class) +@LooperMode(LooperMode.Mode.LEGACY) public class WallpaperTypePreferenceControllerTest { + public final MockitoRule mMockitoRule = MockitoJUnit.rule(); private Context mContext; private WallpaperTypePreferenceController mController; @@ -44,21 +47,18 @@ public class WallpaperTypePreferenceControllerTest { @Before public void setUp() { - MockitoAnnotations.initMocks(this); mContext = Robolectric.setupActivity(Activity.class); mController = new WallpaperTypePreferenceController(mContext, "pref_key"); mIntent = new Intent(); mPreference = new Preference(mContext); } - @Ignore("b/315124270") @Test public void getAvailabilityStatus_byDefault_shouldBeShown() { assertThat(mController.getAvailabilityStatus()) .isEqualTo(BasePreferenceController.AVAILABLE); } - @Ignore("b/315124270") @Test public void testHandlePreferenceTreeClick_intentNull_shouldDoNothing() { mPreference.setIntent(null); @@ -68,7 +68,6 @@ public class WallpaperTypePreferenceControllerTest { assertThat(handled).isFalse(); } - @Ignore("b/315124270") @Test public void testHandlePreferenceTreeClick_shouldLaunchIntent() { mPreference.setIntent(mIntent);