summaryrefslogtreecommitdiffstats
path: root/server/tests/src/com/vaadin
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2012-08-30 18:26:58 +0300
committerJohannes Dahlström <johannesd@vaadin.com>2012-08-31 11:06:45 +0300
commit1544c711166ade7b4ec5130a4c7f3ff4b2a864f2 (patch)
treed5b2ab8dbd9f666e36a5c6b18950558428970074 /server/tests/src/com/vaadin
parent14d6aa6975cd0f100ae24bf5f3f679aeaf5a841a (diff)
downloadvaadin-framework-1544c711166ade7b4ec5130a4c7f3ff4b2a864f2.tar.gz
vaadin-framework-1544c711166ade7b4ec5130a4c7f3ff4b2a864f2.zip
Replace references to "fragment" and "viewAndParameters" with "navigation state" where appropriate (#9367)
Diffstat (limited to 'server/tests/src/com/vaadin')
-rw-r--r--server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java15
1 files changed, 9 insertions, 6 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 5bde04a3b4..ca060a4651 100644
--- a/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java
+++ b/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java
@@ -119,8 +119,7 @@ public class NavigatorTest extends TestCase {
if (!stringEquals(reference.getViewName(), event.getViewName())) {
return false;
}
- if (!stringEquals(reference.getFragmentParameters(),
- event.getFragmentParameters())) {
+ if (!stringEquals(reference.getParameters(), event.getParameters())) {
return false;
}
return true;
@@ -171,7 +170,8 @@ public class NavigatorTest extends TestCase {
public void testBasicNavigation() {
IMocksControl control = EasyMock.createControl();
- NavigationStateManager manager = control.createMock(NavigationStateManager.class);
+ NavigationStateManager manager = control
+ .createMock(NavigationStateManager.class);
ViewDisplay display = control.createMock(ViewDisplay.class);
ViewProvider provider = control.createMock(ViewProvider.class);
View view1 = control.createMock(View.class);
@@ -213,7 +213,8 @@ public class NavigatorTest extends TestCase {
public void testMainView() {
IMocksControl control = EasyMock.createControl();
- NavigationStateManager manager = control.createMock(NavigationStateManager.class);
+ NavigationStateManager manager = control
+ .createMock(NavigationStateManager.class);
ViewDisplay display = control.createMock(ViewDisplay.class);
ViewProvider provider = control.createMock(ViewProvider.class);
View view1 = control.createMock(View.class);
@@ -255,7 +256,8 @@ public class NavigatorTest extends TestCase {
public void testListeners() {
IMocksControl control = EasyMock.createControl();
- NavigationStateManager manager = control.createMock(NavigationStateManager.class);
+ NavigationStateManager manager = control
+ .createMock(NavigationStateManager.class);
ViewDisplay display = control.createMock(ViewDisplay.class);
ViewProvider provider = control.createMock(ViewProvider.class);
View view1 = control.createMock(View.class);
@@ -304,7 +306,8 @@ public class NavigatorTest extends TestCase {
public void testBlockNavigation() {
IMocksControl control = EasyMock.createControl();
- NavigationStateManager manager = control.createMock(NavigationStateManager.class);
+ NavigationStateManager manager = control
+ .createMock(NavigationStateManager.class);
ViewDisplay display = control.createMock(ViewDisplay.class);
ViewProvider provider = control.createMock(ViewProvider.class);
View view1 = control.createMock(View.class);