diff options
| author | Leif Åstrand <leif@vaadin.com> | 2012-09-24 16:51:40 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2012-09-24 16:51:40 +0300 |
| commit | aa20ecbfb7cebb719a05ec1be6439badd228366e (patch) | |
| tree | deb47fed4553a8885b3d9f4540cf36a50d710fd1 /server/tests | |
| parent | cb474f17b6de48f85287491ba24f4c8975c62b0f (diff) | |
| download | vaadin-framework-aa20ecbfb7cebb719a05ec1be6439badd228366e.tar.gz vaadin-framework-aa20ecbfb7cebb719a05ec1be6439badd228366e.zip | |
Rename getVaadinXyz() methods to getXyz() (#9726)
Diffstat (limited to 'server/tests')
3 files changed, 6 insertions, 6 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/root/CustomUIClassLoader.java b/server/tests/src/com/vaadin/tests/server/component/root/CustomUIClassLoader.java index e84d1c9939..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 @@ -81,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); 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(); |