diff options
Diffstat (limited to 'server/tests')
6 files changed, 109 insertions, 24 deletions
diff --git a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java index 18f7fae166..533bcc8422 100644 --- a/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java +++ b/server/tests/src/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java @@ -78,7 +78,7 @@ public class TestAbstractApplicationServletStaticFilesLocation extends TestCase // Set request into replay mode replay(request); - String location = servlet.getVaadinService().getStaticFileLocation( + String location = servlet.getService().getStaticFileLocation( servlet.createVaadinRequest(request)); return location; } @@ -91,7 +91,7 @@ public class TestAbstractApplicationServletStaticFilesLocation extends TestCase // Set request into replay mode replay(request); - String location = servlet.getVaadinService().getStaticFileLocation( + String location = servlet.getService().getStaticFileLocation( servlet.createVaadinRequest(request)); return location; } diff --git a/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldValidators.java b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldValidators.java new file mode 100644 index 0000000000..19c58fe6d3 --- /dev/null +++ b/server/tests/src/com/vaadin/tests/server/component/abstractfield/AbstractFieldValidators.java @@ -0,0 +1,64 @@ +package com.vaadin.tests.server.component.abstractfield; + +import junit.framework.TestCase; + +import org.easymock.EasyMock; + +import com.vaadin.data.Validator; +import com.vaadin.ui.AbstractField; +import com.vaadin.ui.Field; + +public class AbstractFieldValidators extends TestCase { + + Field<Object> field = new AbstractField<Object>() { + @Override + public Class getType() { + return Object.class; + } + }; + + Validator validator = EasyMock.createMock(Validator.class); + Validator validator2 = EasyMock.createMock(Validator.class); + + public void testAddValidator() { + assertNotNull(field.getValidators()); + assertEquals(0, field.getValidators().size()); + + field.addValidator(validator); + assertEquals(1, field.getValidators().size()); + assertTrue(field.getValidators().contains(validator)); + + field.addValidator(validator2); + assertEquals(2, field.getValidators().size()); + assertTrue(field.getValidators().contains(validator)); + assertTrue(field.getValidators().contains(validator2)); + } + + public void testRemoveValidator() { + field.addValidator(validator); + field.addValidator(validator2); + + field.removeValidator(validator); + assertNotNull(field.getValidators()); + assertEquals(1, field.getValidators().size()); + assertFalse(field.getValidators().contains(validator)); + assertTrue(field.getValidators().contains(validator2)); + + field.removeValidator(validator2); + assertNotNull(field.getValidators()); + assertEquals(0, field.getValidators().size()); + assertFalse(field.getValidators().contains(validator)); + assertFalse(field.getValidators().contains(validator2)); + } + + public void testRemoveAllValidators() { + field.addValidator(validator); + field.addValidator(validator2); + + field.removeAllValidators(); + assertNotNull(field.getValidators()); + assertEquals(0, field.getValidators().size()); + assertFalse(field.getValidators().contains(validator)); + assertFalse(field.getValidators().contains(validator2)); + } +} diff --git a/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java b/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java index 858a18b223..c7730e9294 100644 --- a/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java +++ b/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java @@ -11,6 +11,7 @@ import org.easymock.EasyMock; import com.vaadin.DefaultDeploymentConfiguration; import com.vaadin.server.DefaultUIProvider; import com.vaadin.server.DeploymentConfiguration; +import com.vaadin.server.UIClassSelectionEvent; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinService; import com.vaadin.server.VaadinSession; @@ -59,7 +60,7 @@ public class CustomUIClassLoader extends TestCase { DefaultUIProvider uiProvider = new DefaultUIProvider(); Class<? extends UI> uiClass = uiProvider - .getUIClass(createRequestMock(null)); + .getUIClass(new UIClassSelectionEvent(createRequestMock(null))); assertEquals(MyUI.class, uiClass); } @@ -80,7 +81,7 @@ public class CustomUIClassLoader extends TestCase { // Mock a VaadinRequest to give the mocked vaadin service VaadinRequest requestMock = EasyMock.createMock(VaadinRequest.class); - EasyMock.expect(requestMock.getVaadinService()).andReturn( + EasyMock.expect(requestMock.getService()).andReturn( configurationMock); EasyMock.replay(configurationMock, requestMock); @@ -103,7 +104,7 @@ public class CustomUIClassLoader extends TestCase { DefaultUIProvider uiProvider = new DefaultUIProvider(); Class<? extends UI> uiClass = uiProvider - .getUIClass(createRequestMock(loggingClassLoader)); + .getUIClass(new UIClassSelectionEvent(createRequestMock(null))); assertEquals(MyUI.class, uiClass); assertEquals(1, loggingClassLoader.requestedClasses.size()); diff --git a/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java b/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java index a41b200664..09cb75a9eb 100644 --- a/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java +++ b/server/tests/src/com/vaadin/tests/server/component/window/AttachDetachWindow.java @@ -238,12 +238,12 @@ public class AttachDetachWindow { private void assertUnattached(TestContainer win) { assertSame("window not detached", win.getSession(), null); assertSame("window content not detached", - getVaadinSession(win.getTestContent()), null); + getSession(win.getTestContent()), null); assertSame("window children not detached", - getVaadinSession(win.getTestContent().child), null); + getSession(win.getTestContent().child), null); } - private VaadinSession getVaadinSession(ClientConnector testContainer) { + private VaadinSession getSession(ClientConnector testContainer) { UI ui = testContainer.getUI(); if (ui != null) { return ui.getSession(); 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 fc36c77e56..cf8a2870a9 100644 --- a/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java +++ b/server/tests/src/com/vaadin/tests/server/navigator/NavigatorTest.java @@ -33,6 +33,7 @@ import com.vaadin.navigator.ViewDisplay; import com.vaadin.navigator.ViewProvider; import com.vaadin.tests.server.navigator.ClassBasedViewProviderTest.TestView; import com.vaadin.tests.server.navigator.ClassBasedViewProviderTest.TestView2; +import com.vaadin.ui.UI; public class NavigatorTest extends TestCase { @@ -56,6 +57,11 @@ public class NavigatorTest extends TestCase { public void setState(String fragment) { // do nothing } + + @Override + public void setNavigator(Navigator navigator) { + // do nothing + } } public static class TestDisplay implements ViewDisplay { @@ -73,7 +79,7 @@ public class NavigatorTest extends TestCase { public static class TestNavigator extends Navigator { public TestNavigator() { - super(null, new NullFragmentManager(), new TestDisplay()); + super(createMockUI(), new NullFragmentManager(), new TestDisplay()); } public View getView(String viewAndParameters) { @@ -190,6 +196,18 @@ public class NavigatorTest extends TestCase { return null; } + private static UI createMockUI() { + UI ui = EasyMock.createMock(UI.class); + ui.setNavigator(EasyMock.anyObject(Navigator.class)); + EasyMock.replay(ui); + return ui; + } + + private static Navigator createNavigator(NavigationStateManager manager, + ViewDisplay display) { + return new Navigator(createMockUI(), manager, display); + } + public void testBasicNavigation() { IMocksControl control = EasyMock.createControl(); NavigationStateManager manager = control @@ -200,6 +218,8 @@ public class NavigatorTest extends TestCase { View view2 = control.createMock(View.class); // prepare mocks: what to expect + manager.setNavigator(EasyMock.anyObject(Navigator.class)); + EasyMock.expect(provider.getViewName("test1")).andReturn("test1"); EasyMock.expect(provider.getView("test1")).andReturn(view1); EasyMock.expect(manager.getState()).andReturn(""); @@ -225,7 +245,7 @@ public class NavigatorTest extends TestCase { control.replay(); // create and test navigator - Navigator navigator = new Navigator(null, manager, display); + Navigator navigator = createNavigator(manager, display); navigator.addProvider(provider); navigator.navigateTo("test1"); @@ -243,6 +263,8 @@ public class NavigatorTest extends TestCase { View view2 = control.createMock(View.class); // prepare mocks: what to expect + manager.setNavigator(EasyMock.anyObject(Navigator.class)); + EasyMock.expect(provider.getViewName("test2")).andReturn("test2"); EasyMock.expect(provider.getView("test2")).andReturn(view2); EasyMock.expect(manager.getState()).andReturn("view1"); @@ -268,7 +290,7 @@ public class NavigatorTest extends TestCase { control.replay(); // create and test navigator - Navigator navigator = new Navigator(null, manager, display); + Navigator navigator = createNavigator(manager, display); navigator.addProvider(provider); navigator.navigateTo("test2"); @@ -287,7 +309,7 @@ public class NavigatorTest extends TestCase { ViewChangeTestListener listener = new ViewChangeTestListener(); // create navigator to test - Navigator navigator = new Navigator(null, manager, display); + Navigator navigator = createNavigator(manager, display); // prepare mocks: what to expect EasyMock.expect(provider.getViewName("test1")).andReturn("test1"); @@ -337,7 +359,7 @@ public class NavigatorTest extends TestCase { ViewChangeTestListener listener1 = new ViewChangeTestListener(); ViewChangeTestListener listener2 = new ViewChangeTestListener(); - Navigator navigator = new Navigator(null, manager, display); + Navigator navigator = createNavigator(manager, display); // prepare mocks: what to expect // first listener blocks first view change @@ -471,8 +493,7 @@ public class NavigatorTest extends TestCase { } public void testAddViewWithNullName() throws Exception { - Navigator navigator = new Navigator(null, new NullFragmentManager(), - new NullDisplay()); + Navigator navigator = new TestNavigator(); try { navigator.addView(null, new TestView()); @@ -487,8 +508,7 @@ public class NavigatorTest extends TestCase { } public void testAddViewWithNullInstance() throws Exception { - Navigator navigator = new Navigator(null, new NullFragmentManager(), - new NullDisplay()); + Navigator navigator = new TestNavigator(); try { navigator.addView("test", (View) null); @@ -498,8 +518,7 @@ public class NavigatorTest extends TestCase { } public void testAddViewWithNullClass() throws Exception { - Navigator navigator = new Navigator(null, new NullFragmentManager(), - new NullDisplay()); + Navigator navigator = new TestNavigator(); try { navigator.addView("test", (Class<View>) null); diff --git a/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java b/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java index 905ddb529b..41bebfcf0c 100644 --- a/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java +++ b/server/tests/src/com/vaadin/tests/server/navigator/UriFragmentManagerTest.java @@ -30,12 +30,12 @@ public class UriFragmentManagerTest extends TestCase { public void testGetSetFragment() { Page page = EasyMock.createMock(Page.class); - UriFragmentManager manager = new UriFragmentManager(page, null); + UriFragmentManager manager = new UriFragmentManager(page); // prepare mock EasyMock.expect(page.getFragment()).andReturn(""); - page.setFragment("test", false); - EasyMock.expect(page.getFragment()).andReturn("test"); + page.setFragment("!test", false); + EasyMock.expect(page.getFragment()).andReturn("!test"); EasyMock.replay(page); // test manager using the mock @@ -50,9 +50,10 @@ public class UriFragmentManagerTest extends TestCase { Navigator navigator = control.createMock(Navigator.class); Page page = control.createMock(Page.class); - UriFragmentManager manager = new UriFragmentManager(page, navigator); + UriFragmentManager manager = new UriFragmentManager(page); + manager.setNavigator(navigator); - EasyMock.expect(page.getFragment()).andReturn("test"); + EasyMock.expect(page.getFragment()).andReturn("!test"); navigator.navigateTo("test"); control.replay(); |