Try to reduce flakiness of LoaderTest
Bug 63450334
LoaderActivity wasn't extending FragmentTestActivity, which protects
from the lock screen. This solves that issue.
Additionally, the flaky test now waits until the FragmentManager
has completed its work before testing the loader values. This should
give the loader enough time to complete its work.
Test: ran LoaderTest
Change-Id: I005e6f943065f9ee87c64c26191ba65495266b9c
diff --git a/tests/fragment/src/android/fragment/cts/LoaderTest.java b/tests/fragment/src/android/fragment/cts/LoaderTest.java
index be6e032..e154722 100755
--- a/tests/fragment/src/android/fragment/cts/LoaderTest.java
+++ b/tests/fragment/src/android/fragment/cts/LoaderTest.java
@@ -97,10 +97,12 @@
public void startWhenReused() throws Throwable {
LoaderActivity activity = mActivityRule.getActivity();
activity.waitForResume(mActivityRule);
+ FragmentTestUtil.waitForExecution(mActivityRule);
assertEquals("Loaded!", activity.textView.getText().toString());
activity = FragmentTestUtil.recreateActivity(mActivityRule, activity);
+ FragmentTestUtil.waitForExecution(mActivityRule);
// After orientation change, the text should still be loaded properly
assertEquals("Loaded!", activity.textView.getText().toString());
diff --git a/tests/fragment/src/android/fragment/cts/RecreatedActivity.java b/tests/fragment/src/android/fragment/cts/RecreatedActivity.java
index 57011bd..833d532 100644
--- a/tests/fragment/src/android/fragment/cts/RecreatedActivity.java
+++ b/tests/fragment/src/android/fragment/cts/RecreatedActivity.java
@@ -24,7 +24,7 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-public class RecreatedActivity extends Activity {
+public class RecreatedActivity extends FragmentTestActivity {
// These must be cleared after each test using clearState()
public static RecreatedActivity sActivity;
public static CountDownLatch sResumed;
