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

Merge "Remove all remaining usages of LooperMode.LEGACY" into main

Browse Source
This commit is contained in:
Fan Wu
2024-04-26 10:07:21 +00:00
committed by Android (Google) Code Review
parent 812eef847e 14c9806612
commit e82d0e94d4
7 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/robotests/src/com/android/settings/uwb/UwbPreferenceControllerTest.java
View File

@@ -49,6 +49,7 @@ import com.android.settings.R;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -60,6 +61,7 @@ import org.robolectric.RobolectricTestRunner;
/** Unit tests for UWB preference toggle. */ /** Unit tests for UWB preference toggle. */
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Ignore("b/337171922")
public class UwbPreferenceControllerTest { public class UwbPreferenceControllerTest {
private static final String TEST_SUMMARY = "uwb"; private static final String TEST_SUMMARY = "uwb";
private static final String TEST_AIRPLANE_SUMMARY = "apm_uwb"; private static final String TEST_AIRPLANE_SUMMARY = "apm_uwb";

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

@@ -44,7 +44,6 @@ import org.robolectric.android.controller.ActivityController;
import org.robolectric.annotation.Config; 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.annotation.LooperMode;
import org.robolectric.shadow.api.Shadow; import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowApplication;
@@ -52,7 +51,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@LooperMode(LooperMode.Mode.LEGACY)
public class FallbackHomeActivityTest { public class FallbackHomeActivityTest {
public final MockitoRule mMockitoRule = MockitoJUnit.rule(); public final MockitoRule mMockitoRule = MockitoJUnit.rule();

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

@@ -42,12 +42,10 @@ import org.robolectric.Shadows;
import org.robolectric.annotation.Config; 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.annotation.LooperMode;
import org.robolectric.annotation.Resetter; import org.robolectric.annotation.Resetter;
import org.robolectric.shadows.ShadowApplication; import org.robolectric.shadows.ShadowApplication;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@LooperMode(LooperMode.Mode.LEGACY)
public class WallpaperSuggestionActivityTest { public class WallpaperSuggestionActivityTest {
@Mock @Mock

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

@@ -33,10 +33,8 @@ import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule; import org.mockito.junit.MockitoRule;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.LooperMode;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@LooperMode(LooperMode.Mode.LEGACY)
public class WallpaperTypePreferenceControllerTest { public class WallpaperTypePreferenceControllerTest {
public final MockitoRule mMockitoRule = MockitoJUnit.rule(); public final MockitoRule mMockitoRule = MockitoJUnit.rule();

2
tests/robotests/src/com/android/settings/widget/RestrictedButtonTest.java
View File

@@ -39,13 +39,11 @@ import org.junit.runner.RunWith;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@LooperMode(LooperMode.Mode.LEGACY)
@Config(shadows = {ShadowUserManager.class, ShadowDevicePolicyManager.class}) @Config(shadows = {ShadowUserManager.class, ShadowDevicePolicyManager.class})
public class RestrictedButtonTest { public class RestrictedButtonTest {

2
tests/robotests/src/com/android/settings/widget/VideoPreferenceTest.java
View File

@@ -47,7 +47,6 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
import org.robolectric.annotation.LooperMode;
import org.robolectric.shadows.androidx.fragment.FragmentController; import org.robolectric.shadows.androidx.fragment.FragmentController;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@@ -141,7 +140,6 @@ public class VideoPreferenceTest {
assertThat(mAnimationController.isPlaying()).isTrue(); assertThat(mAnimationController.isPlaying()).isTrue();
} }
@LooperMode(LooperMode.Mode.LEGACY)
@Test @Test
@Config(qualifiers = "mcc999") @Config(qualifiers = "mcc999")
public void onViewVisible_createAnimationController() { public void onViewVisible_createAnimationController() {

2
tests/robotests/src/com/android/settings/wifi/WifiDialogActivityTest.java
View File

@@ -57,10 +57,8 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import org.robolectric.Robolectric; import org.robolectric.Robolectric;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.LooperMode;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@LooperMode(LooperMode.Mode.LEGACY)
public class WifiDialogActivityTest { public class WifiDialogActivityTest {
static final String CALLING_PACKAGE = "calling_package"; static final String CALLING_PACKAGE = "calling_package";