summaryrefslogtreecommitdiffstats
path: root/server/src/test
diff options
context:
space:
mode:
authorLeif Åstrand <legioth@gmail.com>2017-01-09 10:21:13 +0200
committerGitHub <noreply@github.com>2017-01-09 10:21:13 +0200
commitc5c6a350b53652616176c4f6074ce7478bd85175 (patch)
tree0e005447975053bdd24d44c1d7b96fa168453eda /server/src/test
parent74342821007c1fa1f99df9c7b3703404c3fc7c08 (diff)
downloadvaadin-framework-c5c6a350b53652616176c4f6074ce7478bd85175.tar.gz
vaadin-framework-c5c6a350b53652616176c4f6074ce7478bd85175.zip
Remove uriFragmentChanged from the public API of UriFragmentManager (#8164)
It's an implementation detail that UriFragmentManager uses a UriFragmentChangedListener, so this shouldn't be exposed in its public API.
Diffstat (limited to 'server/src/test')
-rw-r--r--server/src/test/java/com/vaadin/tests/server/navigator/NavigatorTest.java8
-rw-r--r--server/src/test/java/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java5
2 files changed, 3 insertions, 10 deletions
diff --git a/server/src/test/java/com/vaadin/tests/server/navigator/NavigatorTest.java b/server/src/test/java/com/vaadin/tests/server/navigator/NavigatorTest.java
index 20271defe5..9ac9492d95 100644
--- a/server/src/test/java/com/vaadin/tests/server/navigator/NavigatorTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/navigator/NavigatorTest.java
@@ -32,14 +32,12 @@ import org.junit.Test;
import com.vaadin.navigator.NavigationStateManager;
import com.vaadin.navigator.Navigator;
-import com.vaadin.navigator.Navigator.UriFragmentManager;
import com.vaadin.navigator.View;
import com.vaadin.navigator.ViewChangeListener;
import com.vaadin.navigator.ViewChangeListener.ViewChangeEvent;
import com.vaadin.navigator.ViewDisplay;
import com.vaadin.navigator.ViewProvider;
import com.vaadin.server.Page;
-import com.vaadin.server.Page.UriFragmentChangedEvent;
import com.vaadin.server.VaadinRequest;
import com.vaadin.shared.Registration;
import com.vaadin.tests.server.navigator.ClassBasedViewProviderTest.TestView;
@@ -298,11 +296,9 @@ public class NavigatorTest {
page.removeUriFragmentCalled());
Assert.assertNull("Navigator is not null in UI after destroy",
ui.getNavigator());
- UriFragmentManager manager = (UriFragmentManager) navigator
- .getStateManager();
- manager.uriFragmentChanged(
- EasyMock.createMock(UriFragmentChangedEvent.class));
+ page.setUriFragment("foobar", true);
+
Assert.fail(
"Expected null pointer exception after call uriFragmentChanged "
+ "for destroyed navigator");
diff --git a/server/src/test/java/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java b/server/src/test/java/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
index 6c7a3cf0d8..230f2f2a65 100644
--- a/server/src/test/java/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
import com.vaadin.navigator.Navigator;
import com.vaadin.navigator.Navigator.UriFragmentManager;
import com.vaadin.server.Page;
-import com.vaadin.server.Page.UriFragmentChangedEvent;
import com.vaadin.shared.Registration;
public class UriFragmentManagerTest {
@@ -62,9 +61,7 @@ public class UriFragmentManagerTest {
navigator.navigateTo("test");
control.replay();
- UriFragmentChangedEvent event = new UriFragmentChangedEvent(page,
- "oldtest");
- manager.uriFragmentChanged(event);
+ page.setUriFragment("oldtest", true);
}
@Test