summaryrefslogtreecommitdiffstats
path: root/server/tests/src
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2012-09-19 17:22:49 +0300
committerJohannes Dahlström <johannesd@vaadin.com>2012-09-19 17:22:49 +0300
commit6949ba97ab5d79b23903475ab92a2f0e950bc3b2 (patch)
tree257d94b2aef199990e08ac568f06beb6c95a9b66 /server/tests/src
parentc4323e999fcbc05e04388dd37374487cb9f72634 (diff)
downloadvaadin-framework-6949ba97ab5d79b23903475ab92a2f0e950bc3b2.tar.gz
vaadin-framework-6949ba97ab5d79b23903475ab92a2f0e950bc3b2.zip
Bind Navigator to a UI (#9550)
Diffstat (limited to 'server/tests/src')
-rw-r--r--server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java b/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java
index a78c76cb70..f97c2fdeb5 100644
--- a/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java
+++ b/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java
@@ -73,7 +73,7 @@ public class NavigatorTest extends TestCase {
public static class TestNavigator extends Navigator {
public TestNavigator() {
- super(new NullFragmentManager(), new TestDisplay());
+ super(null, new NullFragmentManager(), new TestDisplay());
}
public View getView(String viewAndParameters) {
@@ -221,7 +221,7 @@ public class NavigatorTest extends TestCase {
control.replay();
// create and test navigator
- Navigator navigator = new Navigator(manager, display);
+ Navigator navigator = new Navigator(null, manager, display);
navigator.addProvider(provider);
navigator.navigateTo("test1");
@@ -264,7 +264,7 @@ public class NavigatorTest extends TestCase {
control.replay();
// create and test navigator
- Navigator navigator = new Navigator(manager, display);
+ Navigator navigator = new Navigator(null, manager, display);
navigator.addProvider(provider);
navigator.navigateTo("test2");
@@ -283,7 +283,7 @@ public class NavigatorTest extends TestCase {
ViewChangeTestListener listener = new ViewChangeTestListener();
// create navigator to test
- Navigator navigator = new Navigator(manager, display);
+ Navigator navigator = new Navigator(null, manager, display);
// prepare mocks: what to expect
EasyMock.expect(provider.getViewName("test1")).andReturn("test1");
@@ -333,7 +333,7 @@ public class NavigatorTest extends TestCase {
ViewChangeTestListener listener1 = new ViewChangeTestListener();
ViewChangeTestListener listener2 = new ViewChangeTestListener();
- Navigator navigator = new Navigator(manager, display);
+ Navigator navigator = new Navigator(null, manager, display);
// prepare mocks: what to expect
// first listener blocks first view change
@@ -467,7 +467,7 @@ public class NavigatorTest extends TestCase {
}
public void testAddViewWithNullName() throws Exception {
- Navigator navigator = new Navigator(new NullFragmentManager(),
+ Navigator navigator = new Navigator(null, new NullFragmentManager(),
new NullDisplay());
try {
@@ -483,7 +483,7 @@ public class NavigatorTest extends TestCase {
}
public void testAddViewWithNullInstance() throws Exception {
- Navigator navigator = new Navigator(new NullFragmentManager(),
+ Navigator navigator = new Navigator(null, new NullFragmentManager(),
new NullDisplay());
try {
@@ -494,7 +494,7 @@ public class NavigatorTest extends TestCase {
}
public void testAddViewWithNullClass() throws Exception {
- Navigator navigator = new Navigator(new NullFragmentManager(),
+ Navigator navigator = new Navigator(null, new NullFragmentManager(),
new NullDisplay());
try {