Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Commit 15c6015

Browse files
WonderCsaboWonderCsabo
committed
Update dependencies
1 parent fd8c1bf commit 15c6015

13 files changed

Lines changed: 120 additions & 53 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
</dependency>
6565
<dependency>
6666
<groupId>org.robolectric</groupId>
67-
<artifactId>shadows-support-v4</artifactId>
67+
<artifactId>shadows-supportv4</artifactId>
6868
<version>${robolectric.version}</version>
6969
<scope>test</scope>
7070
</dependency>

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ActivityWithServices.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import android.app.admin.DevicePolicyManager;
3333
import android.appwidget.AppWidgetManager;
3434
import android.hardware.SensorManager;
35+
import android.hardware.input.InputManager;
3536
import android.hardware.usb.UsbManager;
3637
import android.location.LocationManager;
3738
import android.media.AudioManager;
@@ -145,9 +146,8 @@ public class ActivityWithServices extends Activity {
145146
// @SystemService
146147
// HdmiControlManager hdmiControlManager; // hidden API
147148

148-
// TODO no support yet in Robolectric
149-
// @SystemService
150-
// InputManager inputManager;
149+
@SystemService
150+
InputManager inputManager;
151151

152152
@SystemService
153153
InputMethodManager inputMethodManager;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.androidannotations.test;
1818

1919
import static org.fest.assertions.api.Assertions.assertThat;
20-
import static org.robolectric.internal.ShadowExtractor.extract;
20+
import static org.robolectric.shadow.api.Shadow.extract;
2121
import static org.robolectric.shadows.support.v4.SupportFragmentTestUtil.startFragment;
2222

2323
import org.junit.Before;
@@ -46,7 +46,7 @@ public void setUp() {
4646
public void testOnResultCalledInFragment() {
4747
FragmentStartedActivity_.intent(fragment).startForResult(AwaitingResultFragment.FIRST_REQUEST);
4848

49-
ShadowActivity a = (ShadowActivity) extract(fragment.getActivity());
49+
ShadowActivity a = extract(fragment.getActivity());
5050
a.receiveResult(FragmentStartedActivity_.intent(fragment).get(), Activity.RESULT_OK, new Intent());
5151

5252
assertThat(fragment.onResultCalled).isTrue();

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

Lines changed: 93 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,81 +22,130 @@
2222
import java.util.List;
2323

2424
import org.androidannotations.test.parceler.ParcelerBean;
25-
import org.junit.Before;
2625
import org.junit.Test;
2726
import org.junit.runner.RunWith;
2827
import org.robolectric.Robolectric;
2928
import org.robolectric.RobolectricTestRunner;
30-
import org.robolectric.util.ActivityController;
29+
import org.robolectric.android.controller.ActivityController;
3130

3231
import android.app.Activity;
3332
import android.content.Context;
33+
import android.content.Intent;
3434

3535
@RunWith(RobolectricTestRunner.class)
3636
public class InjectExtraTest {
3737

38-
private ExtraInjectedActivity_ activity;
3938
private Context context = Robolectric.buildActivity(Activity.class).create().get();
40-
private ActivityController<ExtraInjectedActivity_> controller;
41-
42-
@Before
43-
public void setUp() {
44-
controller = Robolectric.buildActivity(ExtraInjectedActivity_.class);
45-
activity = controller.get();
46-
}
4739

4840
@Test
4941
public void simpleStringExtraInjected() {
50-
controller.withIntent(ExtraInjectedActivity_.intent(context).stringExtra("Hello!").get()).create();
42+
Intent intent = ExtraInjectedActivity_.intent(context)
43+
.stringExtra("Hello!")
44+
.get();
45+
46+
ExtraInjectedActivity activity = Robolectric.buildActivity(ExtraInjectedActivity_.class, intent)
47+
.setup()
48+
.get();
49+
5150
assertThat(activity.stringExtra).isEqualTo("Hello!");
5251
}
5352

5453
@Test
5554
public void arrayExtraInjected() {
5655
CustomData[] customData = { new CustomData("42") };
57-
controller.withIntent(ExtraInjectedActivity_.intent(context).arrayExtra(customData).get()).create();
56+
57+
Intent intent = ExtraInjectedActivity_.intent(context)
58+
.arrayExtra(customData)
59+
.get();
60+
61+
ExtraInjectedActivity activity = Robolectric.buildActivity(ExtraInjectedActivity_.class, intent)
62+
.setup()
63+
.get();
64+
5865
assertThat(activity.arrayExtra).isEqualTo(customData);
5966
}
6067

6168
@Test
6269
public void listExtraInjected() {
6370
ArrayList<String> list = new ArrayList<String>();
6471
list.add("Hello !");
65-
controller.withIntent(ExtraInjectedActivity_.intent(context).listExtra(list).get()).create();
72+
73+
Intent intent = ExtraInjectedActivity_.intent(context)
74+
.listExtra(list)
75+
.get();
76+
77+
ExtraInjectedActivity activity = Robolectric.buildActivity(ExtraInjectedActivity_.class, intent)
78+
.setup()
79+
.get();
80+
6681
assertThat(activity.listExtra).isEqualTo(list);
6782
}
6883

6984
@Test
7085
public void intExtraInjected() {
71-
controller.withIntent(ExtraInjectedActivity_.intent(context).intExtra(42).get()).create();
86+
Intent intent = ExtraInjectedActivity_.intent(context)
87+
.intExtra(42)
88+
.get();
89+
90+
ExtraInjectedActivity activity = Robolectric.buildActivity(ExtraInjectedActivity_.class, intent)
91+
.setup()
92+
.get();
93+
7294
assertThat(activity.intExtra).isEqualTo(42);
7395
}
7496

7597
@Test
7698
public void intArrayExtraInjected() {
7799
byte[] byteArray = { 0, 2 };
78-
controller.withIntent(ExtraInjectedActivity_.intent(context).byteArrayExtra(byteArray).get()).create();
100+
101+
Intent intent = ExtraInjectedActivity_.intent(context)
102+
.byteArrayExtra(byteArray)
103+
.get();
104+
105+
ExtraInjectedActivity activity = Robolectric.buildActivity(ExtraInjectedActivity_.class, intent)
106+
.setup()
107+
.get();
108+
79109
assertThat(activity.byteArrayExtra).isEqualTo(byteArray);
80110
}
81111

82112
@Test
83113
public void setIntentReinjectsExtra() {
84-
controller.withIntent(ExtraInjectedActivity_.intent(context).stringExtra("Hello!").get()).create();
114+
Intent intent = ExtraInjectedActivity_.intent(context)
115+
.stringExtra("Hello!")
116+
.get();
117+
118+
ActivityController<ExtraInjectedActivity_> controller = Robolectric.buildActivity(ExtraInjectedActivity_.class, intent)
119+
.setup();
85120

86121
controller.newIntent(ExtraInjectedActivity_.intent(context).stringExtra("Hello Again!").get());
87122

88-
assertThat(activity.stringExtra).isEqualTo("Hello Again!");
123+
assertThat(controller.get().stringExtra).isEqualTo("Hello Again!");
89124
}
90125

91126
@Test
92127
public void extraWithoutValueInjected() {
93-
controller.withIntent(ExtraInjectedActivity_.intent(context).extraWithoutValue("Hello!").get()).create();
128+
Intent intent = ExtraInjectedActivity_.intent(context)
129+
.extraWithoutValue("Hello!")
130+
.get();
131+
132+
ExtraInjectedActivity activity = Robolectric.buildActivity(ExtraInjectedActivity_.class, intent)
133+
.setup()
134+
.get();
135+
94136
assertThat(activity.extraWithoutValue).isEqualTo("Hello!");
95137
}
96138

97139
@Test
98140
public void parcelerExtraInjected() {
99-
controller.withIntent(ExtraInjectedActivity_.intent(context).parcelerExample(new ParcelerBean("Andy", 42)).get()).create();
141+
Intent intent = ExtraInjectedActivity_.intent(context)
142+
.parcelerExample(new ParcelerBean("Andy", 42))
143+
.get();
144+
145+
ExtraInjectedActivity activity = Robolectric.buildActivity(ExtraInjectedActivity_.class, intent)
146+
.setup()
147+
.get();
148+
100149
assertThat(activity.parcelerExample.getName()).isEqualTo("Andy");
101150
assertThat(activity.parcelerExample.getAge()).isEqualTo(42);
102151
}
@@ -105,7 +154,15 @@ public void parcelerExtraInjected() {
105154
public void parcelerExtraCollectionInjected() {
106155
List<ParcelerBean> parcelerBeans = new ArrayList<ParcelerBean>();
107156
parcelerBeans.add(new ParcelerBean("Duke", 1337));
108-
controller.withIntent(ExtraInjectedActivity_.intent(context).parcelerExampleCollection(parcelerBeans).get()).create();
157+
158+
Intent intent = ExtraInjectedActivity_.intent(context)
159+
.parcelerExampleCollection(parcelerBeans)
160+
.get();
161+
162+
ExtraInjectedActivity activity = Robolectric.buildActivity(ExtraInjectedActivity_.class, intent)
163+
.setup()
164+
.get();
165+
109166
assertThat(activity.parcelerExampleCollection.size()).isEqualTo(1);
110167
ParcelerBean bean = activity.parcelerExampleCollection.iterator().next();
111168
assertThat(bean.getName()).isEqualTo("Duke");
@@ -114,13 +171,27 @@ public void parcelerExtraCollectionInjected() {
114171

115172
@Test
116173
public void methodInjectedExtra() {
117-
controller.withIntent(ExtraInjectedActivity_.intent(context).methodInjectedExtra("Hello!").get()).create();
174+
Intent intent = ExtraInjectedActivity_.intent(context)
175+
.methodInjectedExtra("Hello!")
176+
.get();
177+
178+
ExtraInjectedActivity activity = Robolectric.buildActivity(ExtraInjectedActivity_.class, intent)
179+
.setup()
180+
.get();
181+
118182
assertThat(activity.methodInjectedExtra).isEqualTo("Hello!");
119183
}
120184

121185
@Test
122186
public void multiInjectedExtra() {
123-
controller.withIntent(ExtraInjectedActivity_.intent(context).multiInjectedExtra("Hello!", "World").get()).create();
187+
Intent intent = ExtraInjectedActivity_.intent(context)
188+
.multiInjectedExtra("Hello!", "World")
189+
.get();
190+
191+
ExtraInjectedActivity activity = Robolectric.buildActivity(ExtraInjectedActivity_.class, intent)
192+
.setup()
193+
.get();
194+
124195
assertThat(activity.multiInjectedExtra).isEqualTo("Hello!");
125196
}
126197
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import static org.fest.assertions.api.Assertions.assertThat;
2020
import static org.robolectric.Robolectric.setupActivity;
21-
import static org.robolectric.internal.ShadowExtractor.extract;
21+
import static org.robolectric.shadow.api.Shadow.extract;
2222

2323
import org.junit.Before;
2424
import org.junit.Test;
@@ -39,7 +39,7 @@ public class SeekBarChangeListenedActivityTest {
3939
public void setUp() {
4040
activity = setupActivity(SeekBarChangeListenedActivity_.class);
4141
seekBar = (SeekBar) activity.findViewById(R.id.seekBar1);
42-
shadowSeekBar = (ShadowSeekBar) extract(seekBar);
42+
shadowSeekBar = extract(seekBar);
4343
}
4444

4545
@Test

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,13 @@ public void servicesAreInjected() {
104104
assertThat(activity.uiModeManager).isNotNull();
105105
// assertThat(activity.updateLock).isNotNull(); // hidden API
106106
// assertThat(activity.usageStatsManager).isNotNull(); // TODO API 21
107-
// assertThat(activity.usbManager).isNotNull(); // TODO no support yet in Robolectric
107+
assertThat(activity.usbManager).isNotNull();
108108
// assertThat(activity.userManager).isNotNull(); // TODO API 19
109109
assertThat(activity.vibrator).isNotNull();
110-
// assertThat(activity.wallpaperManager).isNotNull(); // TODO no support yet in Robolectric
110+
assertThat(activity.wallpaperManager).isNotNull();
111111
assertThat(activity.wifiManager).isNotNull();
112112
// assertThat(activity.wifiPasspointManager).isNotNull(); // hidden API
113-
// assertThat(activity.wifiP2pManager).isNotNull(); // TODO no support yet in Robolectric
113+
assertThat(activity.wifiP2pManager).isNotNull();
114114
// assertThat(activity.rttManager).isNotNull(); // hidden API
115115
assertThat(activity.windowManager).isNotNull();
116116
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import static org.fest.assertions.api.Assertions.assertThat;
2020
import static org.robolectric.Robolectric.setupActivity;
21-
import static org.robolectric.internal.ShadowExtractor.extract;
21+
import static org.robolectric.shadow.api.Shadow.extract;
2222

2323
import org.junit.Before;
2424
import org.junit.Test;
@@ -175,21 +175,21 @@ public void testBeforeTextChangeParametersPassed() {
175175
}
176176

177177
private static void afterTextChanged(TextView textView, Editable s) {
178-
ShadowTextView shadowTextView = (ShadowTextView) extract(textView);
178+
ShadowTextView shadowTextView = extract(textView);
179179
for (TextWatcher textWatcher : shadowTextView.getWatchers()) {
180180
textWatcher.afterTextChanged(s);
181181
}
182182
}
183183

184184
private static void beforeTextChanged(TextView textView, CharSequence s, int start, int count, int after) {
185-
ShadowTextView shadowTextView = (ShadowTextView) extract(textView);
185+
ShadowTextView shadowTextView = extract(textView);
186186
for (TextWatcher textWatcher : shadowTextView.getWatchers()) {
187187
textWatcher.beforeTextChanged(s, start, count, after);
188188
}
189189
}
190190

191191
private static void onTextChanged(TextView textView, CharSequence s, int start, int before, int count) {
192-
ShadowTextView shadowTextView = (ShadowTextView) extract(textView);
192+
ShadowTextView shadowTextView = extract(textView);
193193
for (TextWatcher textWatcher : shadowTextView.getWatchers()) {
194194
textWatcher.onTextChanged(s, start, before, count);
195195
}

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/afterextras/AfterExtrasActivityTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.junit.runner.RunWith;
2424
import org.robolectric.Robolectric;
2525
import org.robolectric.RobolectricTestRunner;
26-
import org.robolectric.util.ActivityController;
26+
import org.robolectric.android.controller.ActivityController;
2727

2828
import android.content.Intent;
2929

@@ -59,7 +59,8 @@ public void afterExtraCalledActivityInOnCreate() throws Exception {
5959
assertThat(activity.extraDataSet).isFalse();
6060
assertThat(activity.afterExtrasCalled).isFalse();
6161

62-
activityController.withIntent(intent).create();
62+
activity = Robolectric.buildActivity(AfterExtrasActivity_.class, intent).setup().get();
63+
6364
assertThat(activity.extraDataSet).isTrue();
6465
assertThat(activity.afterExtrasCalled).isTrue();
6566
}

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/afterinject/AfterInjectActivityTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.junit.runner.RunWith;
2424
import org.robolectric.Robolectric;
2525
import org.robolectric.RobolectricTestRunner;
26-
import org.robolectric.util.ActivityController;
26+
import org.robolectric.android.controller.ActivityController;
2727

2828
@RunWith(RobolectricTestRunner.class)
2929
public class AfterInjectActivityTest {

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/test/java/org/androidannotations/test/afterviews/AfterViewsActivityTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.junit.runner.RunWith;
2424
import org.robolectric.Robolectric;
2525
import org.robolectric.RobolectricTestRunner;
26-
import org.robolectric.util.ActivityController;
26+
import org.robolectric.android.controller.ActivityController;
2727

2828
@RunWith(RobolectricTestRunner.class)
2929
public class AfterViewsActivityTest {

0 commit comments

Comments
 (0)