ShadowFragmentActivity.OnRestoreInstanceState() stashes the bundle in…

… the rehydrated Fragment so that it can be passed to the Fragment's OnActivityCreated() method, this is the same strategy Android uses to accomplish the same effect.

TestFragmentManager.addFragment() passes the Fragment's saved instance state to onActivityCreated()

src/main/java/com/xtremelabs/robolectric/shadows/ShadowFragment.java

@@ -1,6 +1,7 @@
 package com.xtremelabs.robolectric.shadows;
 
 import android.content.Intent;
+import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
 import android.support.v4.app.FragmentManager;
@@ -13,6 +14,7 @@ public class ShadowFragment {
     protected View view;
     protected FragmentActivity activity;
     private String tag;
+    private Bundle savedInstanceState;
 
     public void setView(View view) {
         this.view = view;
@@ -55,4 +57,12 @@ public String getTag() {
     public void setTag(String tag) {
         this.tag = tag;
     }
+
+    public void setSavedInstanceState(Bundle savedInstanceState) {
+        this.savedInstanceState = savedInstanceState;
+    }
+
+    public Bundle getSavedInstanceState() {
+        return savedInstanceState;
+    }
 }

src/main/java/com/xtremelabs/robolectric/shadows/ShadowFragmentActivity.java

@@ -13,6 +13,8 @@
 import java.util.List;
 import java.util.Map;
 
+import static com.xtremelabs.robolectric.Robolectric.shadowOf;
+
 @Implements(FragmentActivity.class)
 public class ShadowFragmentActivity extends ShadowActivity {
     @RealObject
@@ -53,7 +55,11 @@ public void onRestoreInstanceState_forBogusActivityShadows(Bundle savedInstanceS
             SerializedFragmentState fragmentState = (SerializedFragmentState) o;
 
             try {
-                fragmentManager.beginTransaction().add(fragmentState.containerId, fragmentState.fragmentClass.newInstance(), fragmentState.tag).commit();
+                Fragment fragment = fragmentState.fragmentClass.newInstance();
+                shadowOf(fragment).setSavedInstanceState(savedInstanceState);
+                fragmentManager.beginTransaction()
+                        .add(fragmentState.containerId, fragment, fragmentState.tag)
+                        .commit();
             } catch (InstantiationException e) {
                 throw new RuntimeException(e);
             } catch (IllegalAccessException e) {

src/main/java/com/xtremelabs/robolectric/tester/android/util/TestFragmentManager.java

@@ -150,7 +150,7 @@ public void addFragment(int containerViewId, String tag, Fragment fragment, bool
         }
 
         // These calls happen in the FragmentActivity's onStart in real Android
-        fragment.onActivityCreated(null);
+        fragment.onActivityCreated(shadowOf(fragment).getSavedInstanceState());
         fragment.onStart();
     }
 

src/test/java/com/xtremelabs/robolectric/shadows/FragmentActivityTest.java

@@ -12,6 +12,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import static com.xtremelabs.robolectric.Robolectric.shadowOf;
 import static junit.framework.Assert.*;
 
 @RunWith(WithTestDefaultsRunner.class)
@@ -102,6 +103,7 @@ public void onRestoreInstanceState_shouldRecreateFragments() throws Exception {
         TestFragment restoredFrag = (TestFragment) fragmentManager.getFragments().get(containerId);
         assertEquals(restoredFrag.getId(), dynamicFrag.getId());
         assertEquals(restoredFrag.getTag(), dynamicFrag.getTag());
+        assertEquals(bundle, shadowOf(restoredFrag).getSavedInstanceState());
     }
 
     private static class TestFragmentActivity extends FragmentActivity {

src/test/java/com/xtremelabs/robolectric/shadows/FragmentManagerTest.java

@@ -127,6 +127,14 @@ public void getFragment_whenBundleSavedByShadowFragmentActivity_shouldGetFragmen
         assertEquals(TestFragment.class, retrievedFragment.getClass());
     }
 
+    @Test
+    public void addFragment_shouldPassSavedInstanceStateToOnCreateMethodOfFragment() throws Exception {
+        shadowOf(fragment).setSavedInstanceState(new Bundle());
+        manager.addFragment(CONTAINER_VIEW_ID, null, fragment, true);
+
+        assertTrue(fragment.onActivityCreated_savedInstanceState != null);
+    }
+
     private static class TestFragmentActivity extends FragmentActivity {
         @Override
         public void onCreate(Bundle savedInstanceState) {

src/test/java/com/xtremelabs/robolectric/shadows/TestFragment.java

@@ -10,7 +10,6 @@
 import com.xtremelabs.robolectric.util.Transcript;
 
 public class TestFragment extends Fragment {
-
     public static final int FRAGMENT_VIEW_ID = 2323;
     public boolean onAttachWasCalled;
     public boolean onCreateWasCalled;
@@ -21,7 +20,8 @@ public class TestFragment extends Fragment {
     public boolean onStartWasCalled;
     public boolean onResumeWasCalled;
     public Activity onAttachActivity;
-
+    public Bundle onActivityCreated_savedInstanceState;
+
     Transcript transcript = new Transcript();
 
     @Override
@@ -55,6 +55,7 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         onActivityCreatedWasCalled = true;
+        onActivityCreated_savedInstanceState = savedInstanceState;
         transcript.add("onActivityCreated");
     }