Permalink
Browse files

FACES-2998 Upgrade Bridge TCK tests to the new test framework

  • Loading branch information...
1 parent 4d36689 commit 1a8f47ecd57ea43237d3a8eba23c1f518f6c0350 @stiemannkj1 stiemannkj1 committed with ngriffin7a Feb 7, 2017
Showing with 2,115 additions and 1,699 deletions.
  1. +20 −8 pom.xml
  2. +9 −4 tck/bridge-tck-harness/pom.xml
  3. +288 −420 tck/bridge-tck-harness/src/main/java/com/liferay/faces/bridge/tck/harness/TckTestCase.java
  4. +7 −7 ...arness/src/main/java/com/liferay/faces/bridge/tck/signature/GenericFacesPortletSignatureTest.java
  5. 0 ...rc/test/resources/test-exclusions.xml → bridge-tck-harness/src/main/resources/excluded-tests.xml}
  6. +0 −3 tck/bridge-tck-harness/src/main/resources/tomcat_pluto/login.properties
  7. +914 −650 tck/bridge-tck-harness/src/main/resources/tomcat_pluto/pluto-portal-driver-config.xml
  8. +47 −0 tck/bridge-tck-main-portlet/README.md
  9. +236 −134 tck/bridge-tck-main-portlet/pom.xml
  10. 0 tck/bridge-tck-main-portlet/src/main/webapp/WEB-INF/{web-pluto-tomcat.xml → web-pluto2-tomcat.xml}
  11. +73 −0 tck/bridge-tck-main-portlet/src/main/webapp/WEB-INF/web-pluto3-tomcat.xml
  12. +1 −1 tck/bridge-tck-main-portlet/src/main/webapp/tests/resourceDestroyTest.jsp
  13. 0 ...in/resources/test-exclusions.xml → bridge-tck-main-portlet/src/test/resources/excluded-tests.xml}
  14. BIN tck/bridge-tck-main-portlet/src/test/resources/liferay-jsf-jersey.png
  15. +211 −211 tck/bridge-tck-main-portlet/src/test/resources/liferay-tests.xml
  16. +0 −3 tck/bridge-tck-main-portlet/src/test/resources/liferay6-login.properties
  17. +0 −3 tck/bridge-tck-main-portlet/src/test/resources/liferay7-login.properties
  18. +211 −211 tck/bridge-tck-main-portlet/src/test/resources/pluto-tests.xml
  19. +0 −3 tck/bridge-tck-main-portlet/src/test/resources/pluto3-login.properties
  20. +1 −1 tck/bridge-tck-main-portlet/test-liferay71-glassfish.sh
  21. +1 −1 tck/bridge-tck-main-portlet/test-liferay71-jboss.sh
  22. +1 −1 tck/bridge-tck-main-portlet/test-liferay71-jetty.sh
  23. +1 −1 tck/bridge-tck-main-portlet/test-liferay71-resin.sh
  24. +1 −1 tck/bridge-tck-main-portlet/test-liferay71-tomcat.sh
  25. +1 −1 tck/bridge-tck-main-portlet/test-liferay71-weblogic.sh
  26. +1 −1 tck/bridge-tck-main-portlet/test-liferay71-websphere.sh
  27. +1 −1 tck/bridge-tck-main-portlet/test-pluto-tomcat.sh
  28. +4 −2 test/integration/README.md
  29. +86 −31 test/integration/pom.xml
View
@@ -929,12 +929,6 @@
<version>${weld.version}</version>
</dependency>
<dependency>
- <groupId>org.seleniumhq.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- <version>1.0.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
@@ -972,8 +966,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <!-- Note: the tests require that Firefox 21 is installed on the system. -->
- <!-- TODO allow tests to run on a more recent version of Firefox -->
+ <!-- Note: the tests require that Firefox 46.0 is installed on the system. -->
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-firefox-driver</artifactId>
<version>2.53.0</version>
@@ -1010,6 +1003,25 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>htmlunit-driver</artifactId>
+ <version>2.23.2</version>
+ <scope>test</scope>
+ </dependency>
+ <!--
+ <dependency>
+ <groupId>net.sourceforge.htmlunit</groupId>
+ <artifactId>htmlunit</artifactId>
+ <version>2.23</version>
+ </dependency>
+ -->
+ <dependency>
+ <groupId>com.machinepublishers</groupId>
+ <artifactId>jbrowserdriver</artifactId>
+ <version>0.17.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
@@ -18,13 +18,18 @@
<artifactId>com.liferay.faces.bridge.api</artifactId>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <groupId>org.seleniumhq.selenium</groupId>
+ <artifactId>selenium-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>org.seleniumhq.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
+ <groupId>com.liferay.faces.test</groupId>
+ <artifactId>com.liferay.faces.test.selenium</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
Oops, something went wrong.

0 comments on commit 1a8f47e

Please sign in to comment.