summaryrefslogtreecommitdiffstats
path: root/server/tests/src
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2012-09-11 12:05:43 +0300
committerJohannes Dahlström <johannesd@vaadin.com>2012-09-11 12:09:03 +0300
commit3736f01b5918c292416559d72394aea07435e09e (patch)
tree17d77bab5e00eec43cf9e764dd76eae29e0d661a /server/tests/src
parent3877b51ddfe651907e02b2ee9bec8d854be55225 (diff)
downloadvaadin-framework-3736f01b5918c292416559d72394aea07435e09e.tar.gz
vaadin-framework-3736f01b5918c292416559d72394aea07435e09e.zip
Rename isViewChangeAllowed()/navigatorViewChanged() to beforeViewChange()/afterViewChange() (#9511)
Diffstat (limited to 'server/tests/src')
-rw-r--r--server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java12
1 files changed, 6 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 bcc4c83b1e..a78c76cb70 100644
--- a/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java
+++ b/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java
@@ -135,14 +135,14 @@ public class NavigatorTest extends TestCase {
}
@Override
- public boolean isViewChangeAllowed(ViewChangeEvent event) {
+ public boolean beforeViewChange(ViewChangeEvent event) {
if (referenceEvents.isEmpty()) {
- fail("Unexpected call to isViewChangeAllowed()");
+ fail("Unexpected call to beforeViewChange()");
}
ViewChangeEvent reference = referenceEvents.remove();
Boolean isCheck = referenceIsCheck.remove();
if (!isCheck) {
- fail("Expected navigatorViewChanged(), received isViewChangeAllowed()");
+ fail("Expected afterViewChange(), received beforeViewChange()");
}
// here to make sure exactly the correct values are removed from
// each queue
@@ -154,14 +154,14 @@ public class NavigatorTest extends TestCase {
}
@Override
- public void navigatorViewChanged(ViewChangeEvent event) {
+ public void afterViewChange(ViewChangeEvent event) {
if (referenceEvents.isEmpty()) {
- fail("Unexpected call to navigatorViewChanged()");
+ fail("Unexpected call to afterViewChange()");
}
ViewChangeEvent reference = referenceEvents.remove();
Boolean isCheck = referenceIsCheck.remove();
if (isCheck) {
- fail("Expected isViewChangeAllowed(), received navigatorViewChanged()");
+ fail("Expected beforeViewChange(), received afterViewChange()");
}
if (!equalsReferenceEvent(event, reference)) {
fail("View change event does not match reference event");