Skip to content

Commit ec9d638

Browse files
WonderCsaboWonderCsabo
committed
Fix test suite for Robolectric 3.1
Add a workaround until Robolectlectric is not fixed. robolectric/robolectric#2562 (comment)
1 parent 1079913 commit ec9d638

17 files changed

Lines changed: 46 additions & 27 deletions

File tree

‎AndroidAnnotations/androidannotations-core/androidannotations-test/pom.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767
<version>${robolectric.version}</version>
6868
<scope>test</scope>
6969
</dependency>
70+
<dependency>
71+
<groupId>org.robolectric</groupId>
72+
<artifactId>android-all</artifactId>
73+
</dependency>
7074
<dependency>
7175
<groupId>org.easytesting</groupId>
7276
<artifactId>fest-reflect</artifactId>

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/CustomShadowBundle.java‎

Whitespace-only changes.

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/FromHtmlActivityTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ public void setUp() {
3939
@Test
4040
public void injectionOfHtmlTest() {
4141
assertNotNull(activity.textView);
42-
assertEquals(Html.fromHtml(activity.getString(R.string.hello_html)),
43-
activity.textView.getText());
42+
assertEquals(Html.fromHtml(activity.getString(R.string.hello_html)).toString(),
43+
activity.textView.getText().toString());
4444
}
4545

4646
@Test
4747
public void injectionOfHtmlWithDefaultName() {
4848
assertNotNull(activity.someView);
49-
assertEquals(Html.fromHtml(activity.getString(R.string.someView)),
50-
activity.someView.getText());
49+
assertEquals(Html.fromHtml(activity.getString(R.string.someView)).toString(),
50+
activity.someView.getText().toString());
5151
}
5252
}

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/TestApplication.java‎

Whitespace-only changes.

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ebean/CyclicSingletonTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package org.androidannotations.test.ebean;
1717

1818
import static org.fest.assertions.api.Assertions.assertThat;
19+
import static org.robolectric.Robolectric.setupActivity;
1920

2021
import org.androidannotations.test.EmptyActivityWithoutLayout_;
2122
import org.junit.Test;
@@ -27,7 +28,7 @@ public class CyclicSingletonTest {
2728

2829
@Test
2930
public void cyclicSingleton() {
30-
EmptyActivityWithoutLayout_ context = new EmptyActivityWithoutLayout_();
31+
EmptyActivityWithoutLayout_ context = setupActivity(EmptyActivityWithoutLayout_.class);
3132
SomeCyclicSingletonA_ singletonA = SomeCyclicSingletonA_.getInstance_(context);
3233
SomeCyclicSingletonB_ singletonB = SomeCyclicSingletonB_.getInstance_(context);
3334
assertThat(singletonA.singletonB).isSameAs(singletonB);

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ebean/SomeSingletonTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import static org.fest.assertions.api.Assertions.assertThat;
1919
import static org.mockito.Mockito.mock;
20+
import static org.robolectric.Robolectric.setupActivity;
2021

2122
import java.lang.reflect.Field;
2223

@@ -41,7 +42,7 @@ public void setUp() throws Exception {
4142

4243
@Test
4344
public void getInstanceReturnsSameInstance() {
44-
EmptyActivityWithoutLayout_ context = new EmptyActivityWithoutLayout_();
45+
EmptyActivityWithoutLayout_ context = setupActivity(EmptyActivityWithoutLayout_.class);
4546
SomeSingleton_ firstInstance = SomeSingleton_.getInstance_(context);
4647
SomeSingleton_ secondInstance = SomeSingleton_.getInstance_(context);
4748
assertThat(firstInstance).isSameAs(secondInstance);

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/eintentservice/MyIntentServiceTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package org.androidannotations.test.eintentservice;
1717

1818
import static org.fest.assertions.api.Assertions.assertThat;
19+
import static org.robolectric.Robolectric.setupActivity;
1920

2021
import org.androidannotations.test.EmptyActivityWithoutLayout;
2122
import org.androidannotations.test.EmptyActivityWithoutLayout_;
@@ -33,7 +34,7 @@ public void testAction() {
3334
IntentServiceHandledAction.actionForTestHandled = null;
3435

3536
// Simulate call to intent builder and retrieve the configured Intent
36-
EmptyActivityWithoutLayout context = new EmptyActivityWithoutLayout_();
37+
EmptyActivityWithoutLayout context = setupActivity(EmptyActivityWithoutLayout_.class);
3738
Intent intent = IntentServiceHandledAction_.intent(context) //
3839
.myActionOneParam("test") //
3940
.get();

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/ereceiver/ReceiverWithActionsTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public void onIntentParametersActionTest() {
9292
Intent extraIntent = new Intent("someAction");
9393
intent.putExtra("extraIntent", extraIntent);
9494

95-
receiver.onReceive(Robolectric.application, intent);
95+
receiver.onReceive(RuntimeEnvironment.application, intent);
9696

9797
assertEquals(intent, receiver.originalIntent);
9898
assertEquals(extraIntent, receiver.extraIntent);

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/receiver/EViewAndEViewGroupWithReceiverTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.junit.runner.RunWith;
2323
import org.robolectric.Robolectric;
2424
import org.robolectric.RobolectricTestRunner;
25+
import org.robolectric.RuntimeEnvironment;
2526

2627
import android.content.Intent;
2728
import android.support.v4.content.LocalBroadcastManager;
@@ -64,7 +65,7 @@ public void eViewAndEViewGroupReceivedAction2WithExtraTest() {
6465
Intent extraIntent = new Intent("someAction");
6566
intent.putExtra("extra", extraIntent);
6667

67-
LocalBroadcastManager.getInstance(Robolectric.application).sendBroadcast(intent);
68+
LocalBroadcastManager.getInstance(RuntimeEnvironment.application).sendBroadcast(intent);
6869

6970
assertTrue(activity.viewWithReceiver.action2Received);
7071
assertTrue(activity.viewWithReceiver.action2Extra.equals(extraIntent));

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/res/ResActivityTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,12 @@ public void htmlInjectedNotNull() {
111111

112112
@Test
113113
public void htmlResCorrectlySet() {
114-
assertEquals(Html.fromHtml(activity.getString(R.string.hello_html)), activity.helloHtml);
114+
assertEquals(Html.fromHtml(activity.getString(R.string.hello_html)).toString(), activity.helloHtml.toString());
115115
}
116116

117117
@Test
118118
public void htmlInjectedCorrectlySet() {
119-
assertEquals(Html.fromHtml(activity.getString(R.string.hello_html)), activity.htmlInjected);
119+
assertEquals(Html.fromHtml(activity.getString(R.string.hello_html)).toString(), activity.htmlInjected.toString());
120120
}
121121

122122
@Test

0 commit comments

Comments
 (0)