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

Merge "Fix test failures under settings/wallpaper" into main

Browse Source
This commit is contained in:
Fan Wu
2024-03-22 04:13:11 +00:00
committed by Android (Google) Code Review
parent 7f1a96537b 9997df38d3
commit e4bfb2d2b5
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/robotests/src/com/android/settings/wallpaper/FallbackHomeActivityTest.java
View File

@@ -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<FallbackHome> 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<OnColorsChangedListener> mListener = new ArrayList<>();

7
tests/robotests/src/com/android/settings/wallpaper/WallpaperSuggestionActivityTest.java
View File

@@ -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;

11
tests/robotests/src/com/android/settings/wallpaper/WallpaperTypePreferenceControllerTest.java
View File

@@ -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);