Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move ActivityThreadTests to presubmit" into sc-dev

Browse Source
This commit is contained in:
Louis Chang
2021-04-14 14:13:40 +00:00
committed by Android (Google) Code Review
parent 2052add72d a0f189ff0a
commit 708d39e53e
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/tests/coretests/src/android/app/activity/ActivityThreadTest.java
View File

@@ -86,7 +86,6 @@ import java.util.function.Consumer;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
@MediumTest @MediumTest
@Presubmit @Presubmit
@FlakyTest(detail = "Promote once confirmed non-flaky")
public class ActivityThreadTest { public class ActivityThreadTest {
private static final int TIMEOUT_SEC = 10; private static final int TIMEOUT_SEC = 10;
@@ -352,8 +351,9 @@ public class ActivityThreadTest {
final Rect bounds = activity.getWindowManager().getCurrentWindowMetrics().getBounds(); final Rect bounds = activity.getWindowManager().getCurrentWindowMetrics().getBounds();
assertEquals(activityConfigPortrait.windowConfiguration.getBounds(), bounds); assertEquals(activityConfigPortrait.windowConfiguration.getBounds(), bounds);
// Ensure that Activity#onConfigurationChanged() is only called once. // Ensure that Activity#onConfigurationChanged() not be called because the changes in
assertEquals(numOfConfig + 1, activity.mNumOfConfigChanges); // WindowConfiguration shouldn't be reported.
assertEquals(numOfConfig, activity.mNumOfConfigChanges);
} }
@Test @Test
@@ -379,7 +379,7 @@ public class ActivityThreadTest {
Configuration config = new Configuration(); Configuration config = new Configuration();
config.seq = BASE_SEQ + 1; config.seq = BASE_SEQ + 1;
config.smallestScreenWidthDp = 100; config.orientation = ORIENTATION_LANDSCAPE;
appThread.scheduleTransaction(newActivityConfigTransaction(activity, config)); appThread.scheduleTransaction(newActivityConfigTransaction(activity, config));
// Wait until the main thread is performing the configuration change for the configuration // Wait until the main thread is performing the configuration change for the configuration
@@ -389,17 +389,17 @@ public class ActivityThreadTest {
config = new Configuration(); config = new Configuration();
config.seq = BASE_SEQ + 2; config.seq = BASE_SEQ + 2;
config.smallestScreenWidthDp = 200; config.orientation = ORIENTATION_PORTRAIT;
appThread.scheduleTransaction(newActivityConfigTransaction(activity, config)); appThread.scheduleTransaction(newActivityConfigTransaction(activity, config));
config = new Configuration(); config = new Configuration();
config.seq = BASE_SEQ + 3; config.seq = BASE_SEQ + 3;
config.smallestScreenWidthDp = 300; config.orientation = ORIENTATION_LANDSCAPE;
appThread.scheduleTransaction(newActivityConfigTransaction(activity, config)); appThread.scheduleTransaction(newActivityConfigTransaction(activity, config));
config = new Configuration(); config = new Configuration();
config.seq = BASE_SEQ + 4; config.seq = BASE_SEQ + 4;
config.smallestScreenWidthDp = 400; config.orientation = ORIENTATION_PORTRAIT;
appThread.scheduleTransaction(newActivityConfigTransaction(activity, config)); appThread.scheduleTransaction(newActivityConfigTransaction(activity, config));
activity.mConfigLatch.countDown(); activity.mConfigLatch.countDown();
@@ -411,7 +411,7 @@ public class ActivityThreadTest {
// Only two more configuration changes: one with seq BASE_SEQ + 1; another with seq // Only two more configuration changes: one with seq BASE_SEQ + 1; another with seq
// BASE_SEQ + 4. Configurations scheduled in between should be dropped. // BASE_SEQ + 4. Configurations scheduled in between should be dropped.
assertEquals(numOfConfig + 2, activity.mNumOfConfigChanges); assertEquals(numOfConfig + 2, activity.mNumOfConfigChanges);
assertEquals(400, activity.mConfig.smallestScreenWidthDp); assertEquals(ORIENTATION_PORTRAIT, activity.mConfig.orientation);
} }
@Test @Test
@@ -515,6 +515,7 @@ public class ActivityThreadTest {
} }
@Test @Test
@FlakyTest(bugId = 176134235)
public void testHandleConfigurationChanged_DoesntOverrideActivityConfig() { public void testHandleConfigurationChanged_DoesntOverrideActivityConfig() {
final TestActivity activity = mActivityTestRule.launchActivity(new Intent()); final TestActivity activity = mActivityTestRule.launchActivity(new Intent());