diff options
12 files changed, 73 insertions, 24 deletions
diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index b93e0670fc..8a917966a1 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -92,7 +92,7 @@ <servlet-class>com.vaadin.server.VaadinServlet</servlet-class> <init-param> <param-name>UI</param-name> - <param-value>com.vaadin.tests.integration.IntegrationTestUI</param-value> + <param-value>com.vaadin.tests.integration.ServletIntegrationUI</param-value> </init-param> <async-supported>true</async-supported> </servlet> diff --git a/WebContent/WEB-INF/web.xml.2.4 b/WebContent/WEB-INF/web.xml.2.4 index bcc5f3a651..96144b8036 100644 --- a/WebContent/WEB-INF/web.xml.2.4 +++ b/WebContent/WEB-INF/web.xml.2.4 @@ -86,7 +86,7 @@ <servlet-class>com.vaadin.server.VaadinServlet</servlet-class> <init-param> <param-name>UI</param-name> - <param-value>com.vaadin.tests.integration.IntegrationTestUI</param-value> + <param-value>com.vaadin.tests.integration.ServletIntegrationUI</param-value> </init-param> </servlet> <servlet-mapping> diff --git a/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTestTB3.java b/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java index e170450619..5f4ae41361 100644 --- a/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTestTB3.java +++ b/uitest/src/com/vaadin/tests/integration/AbstractIntegrationTest.java @@ -32,7 +32,7 @@ import com.vaadin.tests.tb3.PrivateTB3Configuration; * @author Vaadin Ltd */ @RunWith(IntegrationTestRunner.class) -public abstract class AbstractIntegrationTestTB3 extends +public abstract class AbstractIntegrationTest extends PrivateTB3Configuration { @Override protected String getBaseURL() { diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationTestTB3.java b/uitest/src/com/vaadin/tests/integration/AbstractServletIntegrationTest.java index 2a2f8ab3d1..f736a126a5 100644 --- a/uitest/src/com/vaadin/tests/integration/ServletIntegrationTestTB3.java +++ b/uitest/src/com/vaadin/tests/integration/AbstractServletIntegrationTest.java @@ -26,8 +26,8 @@ import org.openqa.selenium.WebElement; * * @author Vaadin Ltd */ -public abstract class ServletIntegrationTestTB3 extends - AbstractIntegrationTestTB3 { +public abstract class AbstractServletIntegrationTest extends + AbstractIntegrationTest { @Test public void runTest() throws IOException, AssertionError { diff --git a/uitest/src/com/vaadin/tests/integration/IntegrationTestRunner.java b/uitest/src/com/vaadin/tests/integration/IntegrationTestRunner.java index 29ee4e6023..f5042b54b6 100644 --- a/uitest/src/com/vaadin/tests/integration/IntegrationTestRunner.java +++ b/uitest/src/com/vaadin/tests/integration/IntegrationTestRunner.java @@ -45,7 +45,7 @@ public class IntegrationTestRunner extends TB3Runner { */ @Override protected String testName(FrameworkMethod method) { - if (AbstractIntegrationTestTB3.class.isAssignableFrom(testClass)) { + if (AbstractIntegrationTest.class.isAssignableFrom(testClass)) { return System.getProperty("server-name"); } else { return super.testName(method); diff --git a/uitest/src/com/vaadin/tests/integration/IntegrationTestStreaming.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java index 20ddac9dd1..0d92fb1bb8 100644 --- a/uitest/src/com/vaadin/tests/integration/IntegrationTestStreaming.java +++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationStreamingUI.java @@ -25,11 +25,6 @@ import com.vaadin.shared.ui.ui.Transport; * @author Vaadin Ltd */ @Push(transport = Transport.STREAMING) -public class IntegrationTestStreaming extends IntegrationTestUI { - - public static class IntegrationTestStreamingTB3 extends - ServletIntegrationTestTB3 { - // Uses the test method declared in the super class - } +public class ServletIntegrationStreamingUI extends ServletIntegrationUI { } diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java new file mode 100644 index 0000000000..36a946bfa3 --- /dev/null +++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java @@ -0,0 +1,21 @@ +/* + * Copyright 2000-2013 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.integration; + +public class ServletIntegrationStreamingUITest extends + AbstractServletIntegrationTest { + // Uses the test method declared in the super class +}
\ No newline at end of file diff --git a/uitest/src/com/vaadin/tests/integration/IntegrationTestUI.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationUI.java index 3d0a338bba..6aec2c8e2a 100755 --- a/uitest/src/com/vaadin/tests/integration/IntegrationTestUI.java +++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationUI.java @@ -11,11 +11,7 @@ import com.vaadin.ui.Table; import com.vaadin.ui.UI; import com.vaadin.ui.VerticalLayout; -public class IntegrationTestUI extends UI { - - public class IntegrationTestXhrTB3 extends ServletIntegrationTestTB3 { - // Uses the test method declared in the super class - } +public class ServletIntegrationUI extends UI { @Override protected void init(VaadinRequest request) { diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationUITest.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationUITest.java new file mode 100644 index 0000000000..25ffdac4a2 --- /dev/null +++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationUITest.java @@ -0,0 +1,20 @@ +/* + * Copyright 2000-2013 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.integration; + +public class ServletIntegrationUITest extends AbstractServletIntegrationTest { + // Uses the test method declared in the super class +}
\ No newline at end of file diff --git a/uitest/src/com/vaadin/tests/integration/IntegrationTestWebsocket.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java index eaa23de3cf..905b80fd85 100644 --- a/uitest/src/com/vaadin/tests/integration/IntegrationTestWebsocket.java +++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUI.java @@ -26,11 +26,7 @@ import com.vaadin.shared.ui.ui.Transport; * @author Vaadin Ltd */ @Push(transport = Transport.WEBSOCKET) -public class IntegrationTestWebsocket extends IntegrationTestUI { - - public class IntegrationTestWebsocketTB3 extends ServletIntegrationTestTB3 { - // Uses the test method declared in the super class - } +public class ServletIntegrationWebsocketUI extends ServletIntegrationUI { /* * (non-Javadoc) diff --git a/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java b/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java new file mode 100644 index 0000000000..f2e7a6f2d0 --- /dev/null +++ b/uitest/src/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java @@ -0,0 +1,21 @@ +/* + * Copyright 2000-2013 Vaadin Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package com.vaadin.tests.integration; + +public class ServletIntegrationWebsocketUITest extends + AbstractServletIntegrationTest { + // Uses the test method declared in the super class +}
\ No newline at end of file diff --git a/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java b/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java index d2aa413749..c511b99e6e 100644 --- a/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java +++ b/uitest/src/com/vaadin/tests/tb3/ServletIntegrationTests.java @@ -19,7 +19,7 @@ package com.vaadin.tests.tb3; import org.junit.runner.RunWith; import org.junit.runners.model.InitializationError; -import com.vaadin.tests.integration.ServletIntegrationTestTB3; +import com.vaadin.tests.integration.AbstractServletIntegrationTest; import com.vaadin.tests.tb3.ServletIntegrationTests.ServletIntegrationTestSuite; @RunWith(ServletIntegrationTestSuite.class) @@ -28,7 +28,7 @@ public class ServletIntegrationTests { public static class ServletIntegrationTestSuite extends TB3TestSuite { public ServletIntegrationTestSuite(Class<?> klass) throws InitializationError { - super(klass, ServletIntegrationTestTB3.class, + super(klass, AbstractServletIntegrationTest.class, "com.vaadin.tests.integration", new String[] {}); } } |