Refactor setup of AwaitingResultActivityTest

WonderCsabo · WonderCsabo · commit 8c176d42e211 · 2016-03-04T14:39:52.000+01:00
diff --git a/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/AwaitingResultActivityTest.java b/AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/AwaitingResultActivityTest.java
@@ -17,19 +17,26 @@
 
 import static org.fest.assertions.api.Assertions.assertThat;
 
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 
 import android.content.Intent;
 
 @RunWith(RobolectricTestRunner.class)
 public class AwaitingResultActivityTest {
 
+	private AwaitingResultActivity_ activity;
+
+	@Before
+	public void setUp() {
+		activity = Robolectric.setupActivity(AwaitingResultActivity_.class);
+	}
+
 	@Test
 	public void onlyFirstRequestAnnotatedMethodAreCalled() {
-		AwaitingResultActivity_ activity = new AwaitingResultActivity_();
-
 		activity.onActivityResult(AwaitingResultActivity.FIRST_REQUEST, 0, null);
 
 		assertThat(activity.onResultCalled).isTrue();
@@ -45,8 +52,6 @@ public void onlyFirstRequestAnnotatedMethodAreCalled() {
 
 	@Test
 	public void onlySecondRequestAnnotatedMethodAreCalled() {
-		AwaitingResultActivity_ activity = new AwaitingResultActivity_();
-
 		activity.onActivityResult(AwaitingResultActivity.SECOND_REQUEST, 0,
 				null);
 
@@ -63,8 +68,6 @@ public void onlySecondRequestAnnotatedMethodAreCalled() {
 
 	@Test
 	public void onlyThirdRequestAnnotatedMethodAreCalled() {
-		AwaitingResultActivity_ activity = new AwaitingResultActivity_();
-
 		activity.onActivityResult(AwaitingResultActivity.THIRD_REQUEST, 0, null);
 
 		assertThat(activity.onResultCalled).isFalse();
@@ -80,8 +83,6 @@ public void onlyThirdRequestAnnotatedMethodAreCalled() {
 
 	@Test
 	public void onlyForthRequestAnnotatedMethodAreCalled() {
-		AwaitingResultActivity_ activity = new AwaitingResultActivity_();
-
 		activity.onActivityResult(AwaitingResultActivity.FORTH_REQUEST, 0, null);
 
 		assertThat(activity.onResultCalled).isFalse();
@@ -97,8 +98,6 @@ public void onlyForthRequestAnnotatedMethodAreCalled() {
 
 	@Test
 	public void onResultWithIntentExtrasPassed() {
-		AwaitingResultActivity_ activity = new AwaitingResultActivity_();
-
 		Intent intent = new Intent();
 		Intent extraIntent = new Intent("someAction");
 		intent.putExtra("extraIntent", extraIntent);
