Fix call order of postCreate() and start() in LocalActivityInvoker. See

https://developer.android.com/reference/android/app/Activity.html#onPostCreate%28android.os.Bundle%29 PiperOrigin-RevId: 236735511
robolectric · Mar 4, 2019 · d64534c · d64534c
1 parent e64f675
commit d64534c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...droidx_test/src/test/java/org/robolectric/integration_tests/axt/ActivityScenarioTest.java b/...droidx_test/src/test/java/org/robolectric/integration_tests/axt/ActivityScenarioTest.java
@@ -39,6 +39,12 @@ public void onStart() {
       callbacks.add("onStart");
     }
 
+    @Override
+    public void onPostCreate(Bundle savedInstanceState) {
+      super.onPostCreate(savedInstanceState);
+      callbacks.add("onPostCreate");
+    }
+
     @Override
     public void onResume() {
       super.onResume();
@@ -95,7 +101,8 @@ public void launch_callbackSequence() {
         ActivityScenario.launch(TranscriptActivity.class);
     assertThat(activityScenario).isNotNull();
     assertThat(callbacks)
-        .containsExactly("onCreate", "onStart", "onResume", "onWindowFocusChanged true");
+        .containsExactly(
+            "onCreate", "onStart", "onPostCreate", "onResume", "onWindowFocusChanged true");
   }
 
   @Test

diff --git a/robolectric/src/main/java/org/robolectric/android/internal/LocalActivityInvoker.java b/robolectric/src/main/java/org/robolectric/android/internal/LocalActivityInvoker.java
@@ -40,8 +40,8 @@ public void startActivity(Intent intent) {
       controller =
           Robolectric.buildActivity(activityClass, intent)
               .create()
-              .postCreate(null)
               .start()
+              .postCreate(null)
               .resume()
               .postResume()
               .visible()