From 53674a7cafc22e8e21f5a7d46df0f5c126fb76c6 Mon Sep 17 00:00:00 2001 From: Teemu Suo-Anttila Date: Wed, 1 Feb 2017 17:17:15 +0200 Subject: Refactor testing of the framework (#8393) * Integration tests moved from uitest to separate test modules * Run TB4 tests with maven profile * Remove old ant/ivy build scripts from uitest * Add 'needs-ssh' test category for reconnection test * Add default values for testing and validation builds * Add placeholder build.xml with instructions to run Maven --- uitest/build.xml | 96 +----- uitest/integration_base_files/base.xml | 144 --------- uitest/integration_base_files/cleanup.sh | 26 -- uitest/integration_base_files/lock_age.sh | 21 -- uitest/integration_tests.xml | 330 --------------------- uitest/ivy.xml | 134 --------- uitest/pom.xml | 168 +++++++---- uitest/src/main/webapp/WEB-INF/jboss-web.xml | 7 - .../tests/application/ReconnectDialogUITest.java | 2 +- .../tests/integration/AbstractIntegrationTest.java | 56 ---- .../AbstractServletIntegrationTest.java | 81 ----- .../integration/LongPollingProxyServerTest.java | 107 ------- .../ServletIntegrationDefaultPushUITest.java | 21 -- .../ServletIntegrationJSR356WebsocketUITest.java | 32 -- .../ServletIntegrationLongPollingUITest.java | 21 -- .../ServletIntegrationStreamingUITest.java | 21 -- .../integration/ServletIntegrationUITest.java | 20 -- .../ServletIntegrationWebsocketUITest.java | 21 -- .../vaadin/tests/tb3/ServletIntegrationTests.java | 84 ------ uitest/tb3test.xml | 55 ---- uitest/vaadin-server.xml | 34 --- 21 files changed, 114 insertions(+), 1367 deletions(-) delete mode 100644 uitest/integration_base_files/base.xml delete mode 100644 uitest/integration_base_files/cleanup.sh delete mode 100644 uitest/integration_base_files/lock_age.sh delete mode 100644 uitest/integration_tests.xml delete mode 100644 uitest/ivy.xml delete mode 100644 uitest/src/main/webapp/WEB-INF/jboss-web.xml delete mode 100644 uitest/src/test/java/com/vaadin/tests/integration/AbstractIntegrationTest.java delete mode 100644 uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java delete mode 100644 uitest/src/test/java/com/vaadin/tests/integration/LongPollingProxyServerTest.java delete mode 100644 uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java delete mode 100644 uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java delete mode 100644 uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUITest.java delete mode 100644 uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java delete mode 100644 uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationUITest.java delete mode 100644 uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java delete mode 100644 uitest/src/test/java/com/vaadin/tests/tb3/ServletIntegrationTests.java delete mode 100644 uitest/tb3test.xml delete mode 100644 uitest/vaadin-server.xml (limited to 'uitest') diff --git a/uitest/build.xml b/uitest/build.xml index 6a40f8e539..8dbf659383 100644 --- a/uitest/build.xml +++ b/uitest/build.xml @@ -1,97 +1,7 @@ - + - - - Provides a uitest WAR containing Vaadin UI tests - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + This Ant script is no longer used to test the framework. Run `mvn verify -P test` to execute browser tests. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/uitest/integration_base_files/base.xml b/uitest/integration_base_files/base.xml deleted file mode 100644 index f2064c3007..0000000000 --- a/uitest/integration_base_files/base.xml +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${server}: Getting the lock - - - - - - - - ${server}: Got the lock - - - - - - - - - - - - ${server}: Released the lock - - - - - - - diff --git a/uitest/integration_base_files/cleanup.sh b/uitest/integration_base_files/cleanup.sh deleted file mode 100644 index 42fb5a434d..0000000000 --- a/uitest/integration_base_files/cleanup.sh +++ /dev/null @@ -1,26 +0,0 @@ -#! /bin/bash -echo checking and killing open servers - -# Find all java processes, except -# * grep, as we're running it -# * get-lock, as that one is just waiting for this cleanup to happen -# * shutdown-and-cleanup, as that could be the one we're running from -ps x | grep -E bin/java | grep -v grep | grep -v get-lock | grep -v shutdown-and-cleanup | awk '{print $1}' > temp - -#Read and kill processes marked to temp -while read line -do - kill -9 $line -done < temp - -#Remove temp -rm temp - -if [ -a /home/integration/demo.war ] - then - echo removing old demo.war - rm /home/integration/demo.war -fi - -echo Cleaning deploy dir -rm -rf /home/integration/deploy/* diff --git a/uitest/integration_base_files/lock_age.sh b/uitest/integration_base_files/lock_age.sh deleted file mode 100644 index 115a8fef79..0000000000 --- a/uitest/integration_base_files/lock_age.sh +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/bash -if lockfile -r0 -! /home/integration/deploy/lock.file &> /dev/null - then - # If we could not get the lock, check how old the lock file is - DATE=$(date +%s) - # What if the file is not there any more? - LOCK_AGE=$(stat -c %Z /home/integration/deploy/lock.file) - - AGE=$[($DATE - $LOCK_AGE)/60] - - if [ "$AGE" -gt "20" ] - then - echo lock.file is $AGE min old. - ./cleanup.sh -# else -# echo lock.file is $AGE min old. - fi - else - # If we got the lock, do a cleanup (releasing the lock) just in case something has still been left running - ./cleanup.sh &> /dev/null -fi diff --git a/uitest/integration_tests.xml b/uitest/integration_tests.xml deleted file mode 100644 index 818c0095b6..0000000000 --- a/uitest/integration_tests.xml +++ /dev/null @@ -1,330 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Delaying startup of ${target-server} with ${startDelay} seconds - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Starting TB3 test for ${target-server} - - - - - - - - - - - - - - - - - - - - - - - - - ##teamcity[testStarted name='${target-server}' flowId='${target-server}'] - - - - - - - - - - ##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}'] - - - ##teamcity[testFinished name='${target-server}' flowId='${target-server}']" - - - - - - - - - - - - - - - - ##teamcity[testStarted name='${target-server}' flowId='${target-server}'] - - - - - - - - - - ##teamcity[testFailed name='${target-server}' flowId='${target-server}' message='Integration test for ${target-server} failed.' details='${tried-escaped}']" - - - ##teamcity[testFinished name='${target-server}' flowId='${target-server}']" - - - - - - - - - - - - - - - diff --git a/uitest/ivy.xml b/uitest/ivy.xml deleted file mode 100644 index 33ac7c7c04..0000000000 --- a/uitest/ivy.xml +++ /dev/null @@ -1,134 +0,0 @@ - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/uitest/pom.xml b/uitest/pom.xml index 84eeb9566d..ac7fe17758 100644 --- a/uitest/pom.xml +++ b/uitest/pom.xml @@ -12,6 +12,7 @@ war true + true true @@ -259,6 +260,24 @@ + + com.github.klieber + phantomjs-maven-plugin + + ${skip.uitest.failsafe} + + + + + install + + + ${phantomjs.version} + + + + + org.eclipse.jetty jetty-maven-plugin @@ -267,6 +286,10 @@ 8888 + -1 + 8889 + 5 + foo @@ -283,18 +306,39 @@ - maven-surefire-plugin + org.codehaus.mojo + animal-sniffer-maven-plugin true - org.codehaus.mojo - animal-sniffer-maven-plugin + maven-surefire-plugin true + + maven-failsafe-plugin + + ${skip.uitest.failsafe} + + **/AllTB3Tests.java + + + ${project.parent.basedir}/tests/screenshots + 2 + + + + + + integration-test + verify + + + + @@ -327,20 +371,43 @@ - default + test - true + false + + false + - - - maven-surefire-plugin - - com.vaadin.testcategory.MeasurementTest - - - + + + + org.eclipse.jetty + jetty-maven-plugin + + + + + start-jetty + pre-integration-test + + start + + + + stop-jetty + post-integration-test + + stop + + + + + + + measurements @@ -369,54 +436,39 @@ - - org.eclipse.jetty - jetty-maven-plugin - - - 8888 - - -1 - 8081 - 5 - foo - - - - - start-jetty - pre-integration-test - - start - - - - stop-jetty - post-integration-test - - stop - - - - - - com.github.klieber - phantomjs-maven-plugin - - - - install - - - ${phantomjs.version} - - - - + + validation + + false + + + + + + maven-failsafe-plugin + + + true + phantomjs1 + push,needs-ssh + + + + + + integration-test + verify + + + + + + + + diff --git a/uitest/src/main/webapp/WEB-INF/jboss-web.xml b/uitest/src/main/webapp/WEB-INF/jboss-web.xml deleted file mode 100644 index 12548b7c5c..0000000000 --- a/uitest/src/main/webapp/WEB-INF/jboss-web.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - true - diff --git a/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogUITest.java b/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogUITest.java index e733bf0d2e..3cbf8c38c7 100644 --- a/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogUITest.java +++ b/uitest/src/test/java/com/vaadin/tests/application/ReconnectDialogUITest.java @@ -27,7 +27,7 @@ import com.vaadin.testbench.elements.ButtonElement; import com.vaadin.testbench.parallel.TestCategory; import com.vaadin.tests.tb3.MultiBrowserTestWithProxy; -@TestCategory("communication") +@TestCategory("needs-ssh") public class ReconnectDialogUITest extends MultiBrowserTestWithProxy { @Test diff --git a/uitest/src/test/java/com/vaadin/tests/integration/AbstractIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/AbstractIntegrationTest.java deleted file mode 100644 index da0d6cb08e..0000000000 --- a/uitest/src/test/java/com/vaadin/tests/integration/AbstractIntegrationTest.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2000-2016 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; - -import com.vaadin.testbench.By; -import com.vaadin.testbench.elements.UIElement; -import com.vaadin.testbench.parallel.TestNameSuffix; -import com.vaadin.tests.tb3.SingleBrowserTestPhantomJS2; - -/** - * Base class for integration tests. Integration tests use the - * {@literal deployment.url} parameter to determine the base deployment url - * (http://hostname:123) - * - * @author Vaadin Ltd - */ -@TestNameSuffix(property = "server-name") -public abstract class AbstractIntegrationTest - extends SingleBrowserTestPhantomJS2 { - @Override - protected String getBaseURL() { - String deploymentUrl = System.getProperty("deployment.url"); - if (deploymentUrl == null || deploymentUrl.equals("")) { - throw new RuntimeException( - "Deployment url must be given as deployment.url"); - } - return deploymentUrl; - } - - @Override - protected void openTestURL() { - super.openTestURL(); - - waitForApplication(); - } - - protected void waitForApplication() { - if (!isElementPresent(UIElement.class)) { - // Wait for UI element. - waitForElementPresent(By.vaadin("//com.vaadin.ui.UI")); - } - } -} diff --git a/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java b/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java deleted file mode 100644 index a8f291d79d..0000000000 --- a/uitest/src/test/java/com/vaadin/tests/integration/AbstractServletIntegrationTest.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright 2000-2016 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; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized.Parameters; - -import com.vaadin.testbench.elements.TableElement; -import com.vaadin.tests.tb3.ParameterizedTB3Runner; - -/** - * Base class for servlet integration tests. Automatically prepends "/demo" to - * the deployment path - * - * @author Vaadin Ltd - */ -@RunWith(ParameterizedTB3Runner.class) -public abstract class AbstractServletIntegrationTest - extends AbstractIntegrationTest { - - private String contextPath = "/demo"; - - @Test - public void runTest() throws IOException, AssertionError { - openTestURL(); - // make sure no fading progress indicator from table update is lingering - sleep(2000); - compareScreen("initial"); - $(TableElement.class).first().getCell(0, 1).click(); - // without this, table fetch might have a fading progress indicator - sleep(2000); - compareScreen("finland"); - } - - @Override - protected String getDeploymentPath(Class uiClass) { - return contextPath + super.getDeploymentPath(uiClass); - } - - public void setContextPath(String contextPath) { - this.contextPath = contextPath; - } - - @Parameters - public static Collection getContextPaths() { - if (getServerName().equals("wildfly9-nginx")) { - ArrayList paths = new ArrayList<>(); - paths.add("/buffering/demo"); - paths.add("/nonbuffering/demo"); - paths.add("/buffering-timeout/demo"); - paths.add("/nonbuffering-timeout/demo"); - return paths; - } else { - return Collections.emptyList(); - } - } - - protected static String getServerName() { - return System.getProperty("server-name"); - } - -} diff --git a/uitest/src/test/java/com/vaadin/tests/integration/LongPollingProxyServerTest.java b/uitest/src/test/java/com/vaadin/tests/integration/LongPollingProxyServerTest.java deleted file mode 100644 index 7a86ff4cba..0000000000 --- a/uitest/src/test/java/com/vaadin/tests/integration/LongPollingProxyServerTest.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright 2000-2016 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; - -import java.util.Collections; -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.remote.DesiredCapabilities; -import org.openqa.selenium.support.ui.ExpectedCondition; - -import com.vaadin.testbench.parallel.Browser; -import com.vaadin.tests.push.BasicPushLongPolling; -import com.vaadin.tests.push.BasicPushTest; -import com.vaadin.tests.tb3.IncludeIfProperty; - -@IncludeIfProperty(property = "server-name", value = "wildfly9-nginx") -public class LongPollingProxyServerTest extends AbstractIntegrationTest { - - @Override - protected Class getUIClass() { - return BasicPushLongPolling.class; - } - - @Test - public void bufferingTimeoutBasicPush() throws Exception { - basicPush("buffering-timeout"); - } - - @Test - public void nonbufferingTimeoutBasicPush() throws Exception { - basicPush("nonbuffering-timeout"); - } - - @Test - public void bufferingBasicPush() throws Exception { - basicPush("buffering"); - } - - @Test - public void nonbufferingBasicPush() throws Exception { - basicPush("nonbuffering"); - } - - @Test - public void bufferingTimeoutActionAfterFirstTimeout() throws Exception { - actionAfterFirstTimeout("buffering-timeout"); - } - - @Test - public void nonbufferingTimeoutActionAfterFirstTimeout() throws Exception { - actionAfterFirstTimeout("nonbuffering-timeout"); - } - - private String getUrl(String bufferingOrNot) { - return getBaseURL() + "/" + bufferingOrNot + "/demo" - + getDeploymentPath(); - } - - private void actionAfterFirstTimeout(String bufferingOrNot) - throws Exception { - String url = getUrl(bufferingOrNot); - getDriver().get(url); - // The wildfly9-nginx server has a configured timeout of 10s for - // *-timeout urls - Thread.sleep(15000); - Assert.assertEquals(0, BasicPushTest.getClientCounter(this)); - BasicPushTest.getIncrementButton(this).click(); - Assert.assertEquals(1, BasicPushTest.getClientCounter(this)); - } - - private void basicPush(String bufferingOrNot) throws Exception { - String url = getUrl(bufferingOrNot); - getDriver().get(url); - - Assert.assertEquals(0, BasicPushTest.getServerCounter(this)); - BasicPushTest.getServerCounterStartButton(this).click(); - waitUntil(new ExpectedCondition() { - @Override - public Boolean apply(WebDriver input) { - return BasicPushTest - .getServerCounter(LongPollingProxyServerTest.this) > 1; - } - }); - } - - @Override - public List getBrowsersToTest() { - return Collections - .singletonList(Browser.PHANTOMJS.getDesiredCapabilities()); - } -} diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java deleted file mode 100644 index 20c17a3424..0000000000 --- a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationDefaultPushUITest.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2000-2016 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 ServletIntegrationDefaultPushUITest - extends AbstractServletIntegrationTest { - // Uses the test method declared in the super class -} diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java deleted file mode 100644 index 32338e2c37..0000000000 --- a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationJSR356WebsocketUITest.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2000-2016 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 ServletIntegrationJSR356WebsocketUITest - extends AbstractServletIntegrationTest { - // Uses the test method declared in the super class - - @Override - protected String getDeploymentPath(Class uiClass) { - return super.getDeploymentPath(uiClass).replace("/run/", - "/run-jsr356/"); - } - - @Override - protected Class getUIClass() { - return ServletIntegrationWebsocketUI.class; - } -} diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUITest.java deleted file mode 100644 index 06f51de57d..0000000000 --- a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationLongPollingUITest.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2000-2016 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 ServletIntegrationLongPollingUITest - extends AbstractServletIntegrationTest { - // Uses the test method declared in the super class -} diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java deleted file mode 100644 index 29d5afc06f..0000000000 --- a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationStreamingUITest.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2000-2016 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 -} diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationUITest.java deleted file mode 100644 index 16c3c24685..0000000000 --- a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationUITest.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2000-2016 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 -} diff --git a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java b/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java deleted file mode 100644 index 204b1e29b3..0000000000 --- a/uitest/src/test/java/com/vaadin/tests/integration/ServletIntegrationWebsocketUITest.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2000-2016 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 -} diff --git a/uitest/src/test/java/com/vaadin/tests/tb3/ServletIntegrationTests.java b/uitest/src/test/java/com/vaadin/tests/tb3/ServletIntegrationTests.java deleted file mode 100644 index 9698068621..0000000000 --- a/uitest/src/test/java/com/vaadin/tests/tb3/ServletIntegrationTests.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2000-2016 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.tb3; - -import java.io.IOException; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.junit.runner.RunWith; -import org.junit.runners.model.InitializationError; - -import com.vaadin.tests.integration.AbstractIntegrationTest; -import com.vaadin.tests.integration.ServletIntegrationJSR356WebsocketUITest; -import com.vaadin.tests.integration.ServletIntegrationWebsocketUITest; -import com.vaadin.tests.tb3.ServletIntegrationTests.ServletIntegrationTestSuite; - -@RunWith(ServletIntegrationTestSuite.class) -public class ServletIntegrationTests { - - public static Set notJSR356Compatible = new HashSet<>(); - public static Set notWebsocketCompatible = new HashSet<>(); - static { - - notJSR356Compatible.add("jetty8"); - notJSR356Compatible.add("tomcat7"); - notJSR356Compatible.add("tomcat7apacheproxy"); - - notWebsocketCompatible.add("tomcat7apacheproxy"); - notWebsocketCompatible.add("weblogic10"); - notWebsocketCompatible.add("wildfly9-nginx"); - - // Jetty 9 but no ws support by default - notWebsocketCompatible.add("karaf4"); - - // If a server does not support any kind of websockets it does not - // support JSR-356 either.. - notJSR356Compatible.addAll(notWebsocketCompatible); - } - - public static class ServletIntegrationTestSuite extends TB3TestSuite { - public ServletIntegrationTestSuite(Class klass) - throws InitializationError, IOException { - super(klass, AbstractIntegrationTest.class, - "com.vaadin.tests.integration", new String[] {}, - new ServletTestLocator()); - } - } - - public static class ServletTestLocator extends TB3TestLocator { - @Override - protected List> findClasses(Class baseClass, - String basePackage, String[] ignoredPackages) - throws IOException { - List> allClasses = super.findClasses(baseClass, - basePackage, ignoredPackages); - String serverName = System.getProperty("server-name"); - - if (notJSR356Compatible.contains(serverName)) { - allClasses - .remove(ServletIntegrationJSR356WebsocketUITest.class); - } - - if (notWebsocketCompatible.contains(serverName)) { - allClasses.remove(ServletIntegrationWebsocketUITest.class); - } - return allClasses; - } - } -} diff --git a/uitest/tb3test.xml b/uitest/tb3test.xml deleted file mode 100644 index 1e4eb02d4e..0000000000 --- a/uitest/tb3test.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/uitest/vaadin-server.xml b/uitest/vaadin-server.xml deleted file mode 100644 index 5e9090a536..0000000000 --- a/uitest/vaadin-server.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - Waiting for Servlet Container to start up. - - - - - - - -- cgit v1.2.3