|
@@ -94,7 +94,7 @@ public class NavigatorTest extends BaseTest {
|
94
|
94
|
StackController stack2 = newStack();
|
95
|
95
|
stack1.push(child1);
|
96
|
96
|
stack2.push(child2);
|
97
|
|
- bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
|
|
97
|
+ bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
|
98
|
98
|
uut.setRoot(bottomTabsController);
|
99
|
99
|
|
100
|
100
|
SimpleViewController newChild = new SimpleViewController(activity, "new child");
|
|
@@ -121,7 +121,7 @@ public class NavigatorTest extends BaseTest {
|
121
|
121
|
stack2.push(child2);
|
122
|
122
|
stack2.push(child3);
|
123
|
123
|
stack2.push(child4);
|
124
|
|
- bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
|
|
124
|
+ bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
|
125
|
125
|
uut.setRoot(bottomTabsController);
|
126
|
126
|
|
127
|
127
|
uut.pop("child4");
|
|
@@ -138,7 +138,7 @@ public class NavigatorTest extends BaseTest {
|
138
|
138
|
stack2.push(child2);
|
139
|
139
|
stack2.push(child3);
|
140
|
140
|
stack2.push(child4);
|
141
|
|
- bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
|
|
141
|
+ bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
|
142
|
142
|
uut.setRoot(bottomTabsController);
|
143
|
143
|
|
144
|
144
|
uut.popSpecific(child2.getId());
|
|
@@ -156,7 +156,7 @@ public class NavigatorTest extends BaseTest {
|
156
|
156
|
stack2.push(child3);
|
157
|
157
|
stack2.push(child4);
|
158
|
158
|
stack2.push(child5);
|
159
|
|
- bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
|
|
159
|
+ bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
|
160
|
160
|
uut.setRoot(bottomTabsController);
|
161
|
161
|
|
162
|
162
|
uut.popTo(child2.getId());
|
|
@@ -175,7 +175,7 @@ public class NavigatorTest extends BaseTest {
|
175
|
175
|
stack2.push(child4);
|
176
|
176
|
stack2.push(child5);
|
177
|
177
|
|
178
|
|
- bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
|
|
178
|
+ bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
|
179
|
179
|
uut.setRoot(bottomTabsController);
|
180
|
180
|
|
181
|
181
|
uut.popToRoot(child3.getId());
|
|
@@ -272,7 +272,7 @@ public class NavigatorTest extends BaseTest {
|
272
|
272
|
stack2.push(child2);
|
273
|
273
|
stack2.push(child3);
|
274
|
274
|
stack2.push(child4);
|
275
|
|
- bottomTabsController.setTabs(Arrays.<ViewController>asList(stack1, stack2));
|
|
275
|
+ bottomTabsController.setTabs(Arrays.asList(stack1, stack2));
|
276
|
276
|
uut.setRoot(bottomTabsController);
|
277
|
277
|
|
278
|
278
|
uut.pop("child4", new MockPromise() {
|
|
@@ -282,4 +282,13 @@ public class NavigatorTest extends BaseTest {
|
282
|
282
|
}
|
283
|
283
|
});
|
284
|
284
|
}
|
|
285
|
+
|
|
286
|
+ @Test
|
|
287
|
+ public void pushIntoModal() throws Exception {
|
|
288
|
+ StackController stackController = newStack();
|
|
289
|
+ stackController.push(child1);
|
|
290
|
+ uut.showModal(stackController, new MockPromise());
|
|
291
|
+ uut.push(stackController.getId(), child2);
|
|
292
|
+ assertIsChildById(stackController.getView(), child2.getView());
|
|
293
|
+ }
|
285
|
294
|
}
|