You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by me...@apache.org on 2022/12/19 21:51:10 UTC
[myfaces] branch main updated: fix: enable integration tests (#443)
This is an automated email from the ASF dual-hosted git repository.
melloware pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/main by this push:
new fea43a6fc fix: enable integration tests (#443)
fea43a6fc is described below
commit fea43a6fc0b1c3e060f5f8172b37e7f39fc7cb6c
Author: Bernd Bohmann <bo...@apache.org>
AuthorDate: Mon Dec 19 22:51:05 2022 +0100
fix: enable integration tests (#443)
* fix: enable integration tests
* fix: enable integration tests
* fix: enable integration tests
* fix: enable integration tests
* fix: enable integration tests
* fix: enable integration tests
---
.../integrationtests/ajax/IntegrationTest.java | 15 ++++------
.../ajax/src/test/resources/arquillian.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 15 ++++------
.../src/test/resources/arquillian.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 15 ++++------
.../src/test/resources/arquillian.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 15 ++++------
.../exactMapping/src/test/resources/arquillian.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 15 ++++------
.../src/test/resources/arquillian.xml | 2 +-
.../core/integrationtests/IntegrationTest.java | 15 ++++------
.../src/test/resources/arquillian.xml | 2 +-
integration-tests/pom.xml | 35 +++++++++++++++++++---
.../core/integrationtests/IntegrationTest.java | 15 ++++------
.../src/test/resources/arquillian.xml | 2 +-
pom.xml | 2 +-
16 files changed, 74 insertions(+), 82 deletions(-)
diff --git a/integration-tests/ajax/src/test/java/org/apache/myfaces/core/integrationtests/ajax/IntegrationTest.java b/integration-tests/ajax/src/test/java/org/apache/myfaces/core/integrationtests/ajax/IntegrationTest.java
index a7793f240..55c5c51ae 100644
--- a/integration-tests/ajax/src/test/java/org/apache/myfaces/core/integrationtests/ajax/IntegrationTest.java
+++ b/integration-tests/ajax/src/test/java/org/apache/myfaces/core/integrationtests/ajax/IntegrationTest.java
@@ -25,8 +25,9 @@ import org.jboss.arquillian.graphene.javascript.JavaScript;
import org.jboss.arquillian.graphene.request.RequestGuard;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.importer.ZipImporter;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.embedded.EmbeddedMaven;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -59,15 +60,9 @@ public class IntegrationTest {
@Deployment(testable = false)
public static WebArchive createDeployment() {
- WebArchive webArchive = (WebArchive) EmbeddedMaven.forProject(new File("pom.xml"))
- .useMaven3Version("3.3.9")
- .setGoals("package")
- .setQuiet()
- .skipTests(true)
- .ignoreFailure()
- .build().getDefaultBuiltArchive();
-
- return webArchive;
+ return ShrinkWrap.create(ZipImporter.class, "ajax.war")
+ .importFrom(new File("target/ajax.war"))
+ .as(WebArchive.class);
}
@Drone
diff --git a/integration-tests/ajax/src/test/resources/arquillian.xml b/integration-tests/ajax/src/test/resources/arquillian.xml
index aafd3619d..80cad0817 100644
--- a/integration-tests/ajax/src/test/resources/arquillian.xml
+++ b/integration-tests/ajax/src/test/resources/arquillian.xml
@@ -22,7 +22,7 @@
xmlns="http://jboss.org/schema/arquillian">
<extension qualifier="webdriver">
- <property name="browser">chrome</property>
+ <property name="browser">chromeHeadless</property>
</extension>
<container qualifier="tomcat" default="true">
diff --git a/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index 0c7eed028..b2321c373 100644
--- a/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -25,8 +25,9 @@ import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.drone.api.annotation.Drone;
import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.importer.ZipImporter;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.embedded.EmbeddedMaven;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -41,15 +42,9 @@ public class IntegrationTest
@Deployment(testable = false)
public static WebArchive createDeployment()
{
- WebArchive webArchive = (WebArchive) EmbeddedMaven.forProject(new File("pom.xml"))
- .useMaven3Version("3.3.9")
- .setGoals("package")
- .setQuiet()
- .skipTests(true)
- .ignoreFailure()
- .build().getDefaultBuiltArchive();
-
- return webArchive;
+ return ShrinkWrap.create(ZipImporter.class, "exactMapping.war")
+ .importFrom(new File("target/autoLookupExpressionFactoryWithoutJSP.war"))
+ .as(WebArchive.class);
}
@Drone
diff --git a/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/resources/arquillian.xml b/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/resources/arquillian.xml
index aafd3619d..80cad0817 100644
--- a/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/resources/arquillian.xml
+++ b/integration-tests/autoLookupExpressionFactoryWithoutJSP/src/test/resources/arquillian.xml
@@ -22,7 +22,7 @@
xmlns="http://jboss.org/schema/arquillian">
<extension qualifier="webdriver">
- <property name="browser">chrome</property>
+ <property name="browser">chromeHeadless</property>
</extension>
<container qualifier="tomcat" default="true">
diff --git a/integration-tests/automaticExtensionlessMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/automaticExtensionlessMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index f1aa77e6a..483915662 100644
--- a/integration-tests/automaticExtensionlessMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/automaticExtensionlessMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -25,8 +25,9 @@ import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.drone.api.annotation.Drone;
import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.importer.ZipImporter;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.embedded.EmbeddedMaven;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -41,15 +42,9 @@ public class IntegrationTest
@Deployment(testable = false)
public static WebArchive createDeployment()
{
- WebArchive webArchive = (WebArchive) EmbeddedMaven.forProject(new File("pom.xml"))
- .useMaven3Version("3.3.9")
- .setGoals("package")
- .setQuiet()
- .skipTests(true)
- .ignoreFailure()
- .build().getDefaultBuiltArchive();
-
- return webArchive;
+ return ShrinkWrap.create(ZipImporter.class, "automaticExtensionlessMapping.war")
+ .importFrom(new File("target/automaticExtensionlessMapping.war"))
+ .as(WebArchive.class);
}
@Drone
diff --git a/integration-tests/automaticExtensionlessMapping/src/test/resources/arquillian.xml b/integration-tests/automaticExtensionlessMapping/src/test/resources/arquillian.xml
index aafd3619d..80cad0817 100644
--- a/integration-tests/automaticExtensionlessMapping/src/test/resources/arquillian.xml
+++ b/integration-tests/automaticExtensionlessMapping/src/test/resources/arquillian.xml
@@ -22,7 +22,7 @@
xmlns="http://jboss.org/schema/arquillian">
<extension qualifier="webdriver">
- <property name="browser">chrome</property>
+ <property name="browser">chromeHeadless</property>
</extension>
<container qualifier="tomcat" default="true">
diff --git a/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index ebe0efcc4..dff135f6c 100644
--- a/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/exactMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -26,8 +26,9 @@ import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.drone.api.annotation.Drone;
import org.jboss.arquillian.graphene.Graphene;
import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.importer.ZipImporter;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.embedded.EmbeddedMaven;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -44,15 +45,9 @@ public class IntegrationTest
@Deployment(testable = false)
public static WebArchive createDeployment()
{
- WebArchive webArchive = (WebArchive) EmbeddedMaven.forProject(new File("pom.xml"))
- .useMaven3Version("3.3.9")
- .setGoals("package")
- .setQuiet()
- .skipTests(true)
- .ignoreFailure()
- .build().getDefaultBuiltArchive();
-
- return webArchive;
+ return ShrinkWrap.create(ZipImporter.class, "exactMapping.war")
+ .importFrom(new File("target/exactMapping.war"))
+ .as(WebArchive.class);
}
@Drone
diff --git a/integration-tests/exactMapping/src/test/resources/arquillian.xml b/integration-tests/exactMapping/src/test/resources/arquillian.xml
index aafd3619d..80cad0817 100644
--- a/integration-tests/exactMapping/src/test/resources/arquillian.xml
+++ b/integration-tests/exactMapping/src/test/resources/arquillian.xml
@@ -22,7 +22,7 @@
xmlns="http://jboss.org/schema/arquillian">
<extension qualifier="webdriver">
- <property name="browser">chrome</property>
+ <property name="browser">chromeHeadless</property>
</extension>
<container qualifier="tomcat" default="true">
diff --git a/integration-tests/faceletToXhtmlMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/faceletToXhtmlMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index 025f0ef2e..3c87770d0 100644
--- a/integration-tests/faceletToXhtmlMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/faceletToXhtmlMapping/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -25,8 +25,9 @@ import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.drone.api.annotation.Drone;
import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.importer.ZipImporter;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.embedded.EmbeddedMaven;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -41,15 +42,9 @@ public class IntegrationTest
@Deployment(testable = false)
public static WebArchive createDeployment()
{
- WebArchive webArchive = (WebArchive) EmbeddedMaven.forProject(new File("pom.xml"))
- .useMaven3Version("3.3.9")
- .setGoals("package")
- .setQuiet()
- .skipTests(true)
- .ignoreFailure()
- .build().getDefaultBuiltArchive();
-
- return webArchive;
+ return ShrinkWrap.create(ZipImporter.class, "faceletToXhtmlMapping.war")
+ .importFrom(new File("target/faceletToXhtmlMapping.war"))
+ .as(WebArchive.class);
}
@Drone
diff --git a/integration-tests/faceletToXhtmlMapping/src/test/resources/arquillian.xml b/integration-tests/faceletToXhtmlMapping/src/test/resources/arquillian.xml
index aafd3619d..80cad0817 100644
--- a/integration-tests/faceletToXhtmlMapping/src/test/resources/arquillian.xml
+++ b/integration-tests/faceletToXhtmlMapping/src/test/resources/arquillian.xml
@@ -22,7 +22,7 @@
xmlns="http://jboss.org/schema/arquillian">
<extension qualifier="webdriver">
- <property name="browser">chrome</property>
+ <property name="browser">chromeHeadless</property>
</extension>
<container qualifier="tomcat" default="true">
diff --git a/integration-tests/faceletToXhtmlMappingDisabled/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/faceletToXhtmlMappingDisabled/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index 1c17c06d6..e87de9c19 100644
--- a/integration-tests/faceletToXhtmlMappingDisabled/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/faceletToXhtmlMappingDisabled/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -25,8 +25,9 @@ import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.drone.api.annotation.Drone;
import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.importer.ZipImporter;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.embedded.EmbeddedMaven;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -41,15 +42,9 @@ public class IntegrationTest
@Deployment(testable = false)
public static WebArchive createDeployment()
{
- WebArchive webArchive = (WebArchive) EmbeddedMaven.forProject(new File("pom.xml"))
- .useMaven3Version("3.3.9")
- .setGoals("package")
- .setQuiet()
- .skipTests(true)
- .ignoreFailure()
- .build().getDefaultBuiltArchive();
-
- return webArchive;
+ return ShrinkWrap.create(ZipImporter.class, "faceletToXhtmlMappingDisabled.war")
+ .importFrom(new File("target/faceletToXhtmlMappingDisabled.war"))
+ .as(WebArchive.class);
}
@Drone
diff --git a/integration-tests/faceletToXhtmlMappingDisabled/src/test/resources/arquillian.xml b/integration-tests/faceletToXhtmlMappingDisabled/src/test/resources/arquillian.xml
index 9c9469437..089e0c98c 100644
--- a/integration-tests/faceletToXhtmlMappingDisabled/src/test/resources/arquillian.xml
+++ b/integration-tests/faceletToXhtmlMappingDisabled/src/test/resources/arquillian.xml
@@ -22,7 +22,7 @@
xmlns="http://jboss.org/schema/arquillian">
<extension qualifier="webdriver">
- <property name="browser">chrome</property>
+ <property name="browser">chromeHeadless</property>
</extension>
<container qualifier="tomcat" default="true">
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 2bf23b1af..742764bbc 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -28,6 +28,7 @@
<packaging>pom</packaging>
<build>
+ <finalName>${project.artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -40,13 +41,33 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
+ <version>3.0.0-M7</version>
<configuration>
+ <trimStackTrace>false</trimStackTrace>
<systemPropertyVariables>
<tomcat.util.scan.StandardJarScanFilter.jarsToSkip>serializer.jar</tomcat.util.scan.StandardJarScanFilter.jarsToSkip>
<tomcat.util.scan.DefaultJarScanner.jarsToSkip>serializer.jar</tomcat.util.scan.DefaultJarScanner.jarsToSkip>
</systemPropertyVariables>
+ <excludes>
+ <exclude>**/*IntegrationTest</exclude>
+ </excludes>
</configuration>
+ <executions>
+ <execution>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <exclude>none</exclude>
+ </excludes>
+ <includes>
+ <include>**/*IntegrationTest</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
@@ -93,7 +114,13 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
- <version>3.13.0</version>
+ <version>3.141.59</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.10</version>
<scope>test</scope>
</dependency>
@@ -101,7 +128,7 @@
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
- <version>1.7.0.Alpha10</version>
+ <version>1.7.0.Alpha13</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -171,7 +198,7 @@
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-tomcat-embedded-10</artifactId>
- <version>1.2.0.Alpha1</version>
+ <version>1.2.0.Final</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/integration-tests/protectedViews/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java b/integration-tests/protectedViews/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
index 462c691ef..6c763be1d 100644
--- a/integration-tests/protectedViews/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
+++ b/integration-tests/protectedViews/src/test/java/org/apache/myfaces/core/integrationtests/IntegrationTest.java
@@ -26,8 +26,9 @@ import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.drone.api.annotation.Drone;
import org.jboss.arquillian.graphene.Graphene;
import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.importer.ZipImporter;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.resolver.api.maven.embedded.EmbeddedMaven;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -44,15 +45,9 @@ public class IntegrationTest
@Deployment(testable = false)
public static WebArchive createDeployment()
{
- WebArchive webArchive = (WebArchive) EmbeddedMaven.forProject(new File("pom.xml"))
- .useMaven3Version("3.3.9")
- .setGoals("package")
- .setQuiet()
- .skipTests(true)
- .ignoreFailure()
- .build().getDefaultBuiltArchive();
-
- return webArchive;
+ return ShrinkWrap.create(ZipImporter.class, "protectedViews.war")
+ .importFrom(new File("target/protectedViews.war"))
+ .as(WebArchive.class);
}
@Drone
diff --git a/integration-tests/protectedViews/src/test/resources/arquillian.xml b/integration-tests/protectedViews/src/test/resources/arquillian.xml
index aafd3619d..80cad0817 100644
--- a/integration-tests/protectedViews/src/test/resources/arquillian.xml
+++ b/integration-tests/protectedViews/src/test/resources/arquillian.xml
@@ -22,7 +22,7 @@
xmlns="http://jboss.org/schema/arquillian">
<extension qualifier="webdriver">
- <property name="browser">chrome</property>
+ <property name="browser">chromeHeadless</property>
</extension>
<container qualifier="tomcat" default="true">
diff --git a/pom.xml b/pom.xml
index 88f3fa327..46de22253 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,8 +55,8 @@
<module>test</module>
<module>impl</module>
<module>bundle</module>
- <!--
<module>integration-tests</module>
+ <!--
<module>extensions</module>
-->
</modules>