From 7f1cfd03d5b55f41ea911fcd53ce6fd168517cff Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Thu, 16 Feb 2017 08:56:32 +0200 Subject: [PATCH] Eliminate module uitest-common (#8583) The use of the module in the test project was removed earlier, and eliminating the module permits simpler and more reliable builds as it was not deployed. The classes that were in uitest-common are now in uitest. --- pom.xml | 1 - test/servlet-containers/generic/ivy.xml | 4 - .../generic/ivysettings.xml | 2 - .../jsp-integration/pom.xml | 6 - uitest-common/pom.xml | 113 ------------------ uitest/pom.xml | 15 +-- .../AbstractDateFieldElement.java | 0 .../customelements/DateFieldElement.java | 0 .../customelements/DateTimeFieldElement.java | 0 .../InlineDateTimeFieldElement.java | 0 .../customelements/LoginFormElement.java | 0 .../com/vaadin/tests/tb3/AbstractTB3Test.java | 0 .../tests/tb3/BrowserStackBrowserFactory.java | 0 .../tb3/CustomTestBenchCommandExecutor.java | 0 .../vaadin/tests/tb3/ExcludeFromSuite.java | 0 .../vaadin/tests/tb3/IncludeIfProperty.java | 0 .../vaadin/tests/tb3/MultiBrowserTest.java | 0 .../vaadin/tests/tb3/ParallelScheduler.java | 0 .../tests/tb3/ParameterizedTB3Runner.java | 0 .../tests/tb3/PrivateTB3Configuration.java | 0 .../com/vaadin/tests/tb3/RetryOnFail.java | 0 .../tests/tb3/SauceLabsBrowserFactory.java | 0 .../vaadin/tests/tb3/ScreenshotTB3Test.java | 0 .../vaadin/tests/tb3/SingleBrowserTest.java | 0 .../tb3/SingleBrowserTestPhantomJS2.java | 0 .../java/com/vaadin/tests/tb3/TB3Runner.java | 0 .../com/vaadin/tests/tb3/TB3TestLocator.java | 0 .../com/vaadin/tests/tb3/TB3TestSuite.java | 0 .../tests/tb3/VaadinBrowserFactory.java | 0 29 files changed, 8 insertions(+), 133 deletions(-) delete mode 100644 uitest-common/pom.xml rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/testbench/customelements/AbstractDateFieldElement.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/testbench/customelements/DateFieldElement.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/testbench/customelements/DateTimeFieldElement.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/testbench/customelements/InlineDateTimeFieldElement.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/testbench/customelements/LoginFormElement.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/tests/tb3/AbstractTB3Test.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/tests/tb3/ExcludeFromSuite.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/tests/tb3/IncludeIfProperty.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/tests/tb3/MultiBrowserTest.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/tests/tb3/ParallelScheduler.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/tests/tb3/RetryOnFail.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/tests/tb3/SauceLabsBrowserFactory.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/tests/tb3/SingleBrowserTest.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/tests/tb3/TB3Runner.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/tests/tb3/TB3TestLocator.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/tests/tb3/TB3TestSuite.java (100%) rename {uitest-common/src/main => uitest/src/test}/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java (100%) diff --git a/pom.xml b/pom.xml index e1d3a5073f..7436601f90 100644 --- a/pom.xml +++ b/pom.xml @@ -585,7 +585,6 @@ client-compiler client-compiled themes - uitest-common uitest liferay all diff --git a/test/servlet-containers/generic/ivy.xml b/test/servlet-containers/generic/ivy.xml index 33ac7c7c04..414f26d71b 100644 --- a/test/servlet-containers/generic/ivy.xml +++ b/test/servlet-containers/generic/ivy.xml @@ -27,10 +27,6 @@ - - - diff --git a/test/servlet-containers/generic/ivysettings.xml b/test/servlet-containers/generic/ivysettings.xml index f28250c3c1..e807d3d36e 100644 --- a/test/servlet-containers/generic/ivysettings.xml +++ b/test/servlet-containers/generic/ivysettings.xml @@ -69,8 +69,6 @@ resolver="vaadin-maven" /> - diff --git a/test/servlet-containers/jsp-integration/pom.xml b/test/servlet-containers/jsp-integration/pom.xml index c32914c3c0..5bb5fd9959 100644 --- a/test/servlet-containers/jsp-integration/pom.xml +++ b/test/servlet-containers/jsp-integration/pom.xml @@ -19,12 +19,6 @@ vaadin-client-compiled - - com.vaadin - vaadin-uitest-common - ${project.version} - test - diff --git a/uitest-common/pom.xml b/uitest-common/pom.xml deleted file mode 100644 index f87ece9f3a..0000000000 --- a/uitest-common/pom.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - 4.0.0 - - com.vaadin - vaadin-root - 8.0-SNAPSHOT - - vaadin-uitest-common - vaadin-uitest-common - jar - - true - - true - - - https://vaadin.com/ - Vaadin UI test common classes and dependencies - - - - vaadin-addons - http://maven.vaadin.com/vaadin-addons - - - - - - - ${project.groupId} - vaadin-server - ${project.version} - - - javax.servlet - javax.servlet-api - - - - - - junit - junit - compile - - - commons-io - commons-io - - - com.vaadin - vaadin-testbench-api - ${project.version} - - - - - - - maven-deploy-plugin - - ${skip.uitest.deployment} - - - - maven-surefire-plugin - - true - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - true - - - - - - - org.sonatype.plugins - nexus-staging-maven-plugin - - true - - - - maven-javadoc-plugin - - true - - - - - - - - - - dev-build - - false - - - false - - - - - diff --git a/uitest/pom.xml b/uitest/pom.xml index d2abf4cd7c..5473a9d2f8 100644 --- a/uitest/pom.xml +++ b/uitest/pom.xml @@ -184,13 +184,6 @@ provided - - ${project.groupId} - vaadin-uitest-common - ${project.version} - test - - com.jcraft jsch @@ -228,6 +221,14 @@ + + + com.vaadin + vaadin-testbench-api + ${project.version} + test + + diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/AbstractDateFieldElement.java b/uitest/src/test/java/com/vaadin/testbench/customelements/AbstractDateFieldElement.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/testbench/customelements/AbstractDateFieldElement.java rename to uitest/src/test/java/com/vaadin/testbench/customelements/AbstractDateFieldElement.java diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/DateFieldElement.java b/uitest/src/test/java/com/vaadin/testbench/customelements/DateFieldElement.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/testbench/customelements/DateFieldElement.java rename to uitest/src/test/java/com/vaadin/testbench/customelements/DateFieldElement.java diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/DateTimeFieldElement.java b/uitest/src/test/java/com/vaadin/testbench/customelements/DateTimeFieldElement.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/testbench/customelements/DateTimeFieldElement.java rename to uitest/src/test/java/com/vaadin/testbench/customelements/DateTimeFieldElement.java diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/InlineDateTimeFieldElement.java b/uitest/src/test/java/com/vaadin/testbench/customelements/InlineDateTimeFieldElement.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/testbench/customelements/InlineDateTimeFieldElement.java rename to uitest/src/test/java/com/vaadin/testbench/customelements/InlineDateTimeFieldElement.java diff --git a/uitest-common/src/main/java/com/vaadin/testbench/customelements/LoginFormElement.java b/uitest/src/test/java/com/vaadin/testbench/customelements/LoginFormElement.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/testbench/customelements/LoginFormElement.java rename to uitest/src/test/java/com/vaadin/testbench/customelements/LoginFormElement.java diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java b/uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/tests/tb3/AbstractTB3Test.java rename to uitest/src/test/java/com/vaadin/tests/tb3/AbstractTB3Test.java diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java b/uitest/src/test/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java rename to uitest/src/test/java/com/vaadin/tests/tb3/BrowserStackBrowserFactory.java diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java b/uitest/src/test/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java rename to uitest/src/test/java/com/vaadin/tests/tb3/CustomTestBenchCommandExecutor.java diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/ExcludeFromSuite.java b/uitest/src/test/java/com/vaadin/tests/tb3/ExcludeFromSuite.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/tests/tb3/ExcludeFromSuite.java rename to uitest/src/test/java/com/vaadin/tests/tb3/ExcludeFromSuite.java diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/IncludeIfProperty.java b/uitest/src/test/java/com/vaadin/tests/tb3/IncludeIfProperty.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/tests/tb3/IncludeIfProperty.java rename to uitest/src/test/java/com/vaadin/tests/tb3/IncludeIfProperty.java diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/MultiBrowserTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/tests/tb3/MultiBrowserTest.java rename to uitest/src/test/java/com/vaadin/tests/tb3/MultiBrowserTest.java diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/ParallelScheduler.java b/uitest/src/test/java/com/vaadin/tests/tb3/ParallelScheduler.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/tests/tb3/ParallelScheduler.java rename to uitest/src/test/java/com/vaadin/tests/tb3/ParallelScheduler.java diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java b/uitest/src/test/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java rename to uitest/src/test/java/com/vaadin/tests/tb3/ParameterizedTB3Runner.java diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java b/uitest/src/test/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java rename to uitest/src/test/java/com/vaadin/tests/tb3/PrivateTB3Configuration.java diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/RetryOnFail.java b/uitest/src/test/java/com/vaadin/tests/tb3/RetryOnFail.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/tests/tb3/RetryOnFail.java rename to uitest/src/test/java/com/vaadin/tests/tb3/RetryOnFail.java diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/SauceLabsBrowserFactory.java b/uitest/src/test/java/com/vaadin/tests/tb3/SauceLabsBrowserFactory.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/tests/tb3/SauceLabsBrowserFactory.java rename to uitest/src/test/java/com/vaadin/tests/tb3/SauceLabsBrowserFactory.java diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java b/uitest/src/test/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java rename to uitest/src/test/java/com/vaadin/tests/tb3/ScreenshotTB3Test.java diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTest.java b/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTest.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTest.java rename to uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTest.java diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java b/uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java rename to uitest/src/test/java/com/vaadin/tests/tb3/SingleBrowserTestPhantomJS2.java diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3Runner.java b/uitest/src/test/java/com/vaadin/tests/tb3/TB3Runner.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/tests/tb3/TB3Runner.java rename to uitest/src/test/java/com/vaadin/tests/tb3/TB3Runner.java diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestLocator.java b/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestLocator.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestLocator.java rename to uitest/src/test/java/com/vaadin/tests/tb3/TB3TestLocator.java diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestSuite.java b/uitest/src/test/java/com/vaadin/tests/tb3/TB3TestSuite.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/tests/tb3/TB3TestSuite.java rename to uitest/src/test/java/com/vaadin/tests/tb3/TB3TestSuite.java diff --git a/uitest-common/src/main/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java b/uitest/src/test/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java similarity index 100% rename from uitest-common/src/main/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java rename to uitest/src/test/java/com/vaadin/tests/tb3/VaadinBrowserFactory.java -- 2.39.5