Activity instances should not be attached by default.
Closes #826, #934.
diff --git a/src/main/java/org/robolectric/util/ActivityController.java b/src/main/java/org/robolectric/util/ActivityController.java
index b223af2..f656d12 100644
--- a/src/main/java/org/robolectric/util/ActivityController.java
+++ b/src/main/java/org/robolectric/util/ActivityController.java
@@ -48,16 +48,13 @@
}
public ActivityController(Class<T> activityClass) {
- this.activity = constructor().in(activityClass).newInstance();
- shadowActivity = shadowOf_(activity);
- shadowMainLooper = shadowOf_(Looper.getMainLooper());
+ this(constructor().in(activityClass).newInstance());
}
public ActivityController(T activity) {
this.activity = activity;
shadowActivity = shadowOf_(activity);
shadowMainLooper = shadowOf_(Looper.getMainLooper());
- attached = true;
}
public T get() {
diff --git a/src/test/java/org/robolectric/util/ActivityControllerTest.java b/src/test/java/org/robolectric/util/ActivityControllerTest.java
index 020c6fd..b4c486d 100644
--- a/src/test/java/org/robolectric/util/ActivityControllerTest.java
+++ b/src/test/java/org/robolectric/util/ActivityControllerTest.java
@@ -41,6 +41,12 @@
}
@Test
+ public void shouldSetIntentForGivenActivityInstance() throws Exception {
+ ActivityController<MyActivity> activityController = ActivityController.of(new MyActivity()).create();
+ assertThat(activityController.get().getIntent()).isNotNull();
+ }
+
+ @Test
public void whenLooperIsNotPaused_shouldCreateWithMainLooperPaused() throws Exception {
Robolectric.unPauseMainLooper();
controller.create();