Skip to content

Commit

Permalink
feature: introduce JUnit Jupiter container. Fixes arquillian#137
Browse files Browse the repository at this point in the history
  • Loading branch information
@gastaldi
gastaldi committed Sep 11, 2019
1 parent 3abe30f commit 4b98704
Show file tree
Hide file tree
Showing 7 changed files with 333 additions and 1 deletion.
17 changes: 17 additions & 0 deletions bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,23 @@
<version>${project.version}</version>
</dependency>

<!-- JUnit Jupiter-->
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-jupiter-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-jupiter-container</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-jupiter-standalone</artifactId>
<version>${project.version}</version>
</dependency>

<!-- TestNG -->
<dependency>
<groupId>org.jboss.arquillian.testng</groupId>
Expand Down
11 changes: 11 additions & 0 deletions build/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<!-- Arquillian Core common Deps, Test related -->
<version.javax.inject>1</version.javax.inject>
<version.junit>4.12</version.junit>
<version.junit.jupiter>5.5.2</version.junit.jupiter>
<version.mockito_all>1.10.19</version.mockito_all>
<version.testng>6.14.3</version.testng>
<version.assertj>2.9.1</version.assertj>
Expand Down Expand Up @@ -55,12 +56,22 @@
<scope>import</scope>
</dependency>

<!-- JUnit 5 dependencies, imported as a BOM -->
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${version.junit.jupiter}</version>
<scope>import</scope>
<type>pom</type>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
<scope>test</scope>
</dependency>

<!-- Workaround https://github.com/cbeust/testng/issues/1506#issuecomment-347178740 -->
<!-- JCommander 1.66 is missing in Maven Central, thus taking newer one first -->
<dependency>
Expand Down
107 changes: 107 additions & 0 deletions junit-jupiter/container/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
<version>1.4.2.Final-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>

<!-- Model Version -->
<modelVersion>4.0.0</modelVersion>


<!-- Artifact Configuration -->
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-jupiter-container</artifactId>
<name>Arquillian TestRunner JUnit Jupiter Container</name>
<description>JUnit Jupiter Container Implementation for the Arquillian Project</description>

<!-- Dependencies -->
<dependencies>

<!-- org.jboss.arquillian -->
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-jupiter-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.test</groupId>
<artifactId>arquillian-test-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.test</groupId>
<artifactId>arquillian-test-spi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-spi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-impl-base</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.test</groupId>
<artifactId>arquillian-test-impl-base</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-impl-base</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-container-test-impl-base</artifactId>
<version>${project.version}</version>
</dependency>

<!-- External Projects -->
<dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-impl-base</artifactId>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
90 changes: 90 additions & 0 deletions junit-jupiter/core/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!-- Parent -->
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
<version>1.4.2.Final-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>
<!-- Artifact Configuration -->
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-jupiter-core</artifactId>
<name>Arquillian TestRunner JUnit Jupiter Core</name>
<description>JUnit Jupiter Implementation for the Arquillian Project</description>

<!-- Dependencies -->
<dependencies>

<!-- org.jboss.arquillian -->
<dependency>
<groupId>org.jboss.arquillian.test</groupId>
<artifactId>arquillian-test-spi</artifactId>
<version>${project.version}</version>
</dependency>


<!-- External Projects -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<scope>provided</scope>
</dependency>

<!-- Test -->
<dependency>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-impl-base</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.test</groupId>
<artifactId>arquillian-test-impl-base</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.test</groupId>
<artifactId>arquillian-test-impl-base</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-impl-base</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>

</project>
25 changes: 25 additions & 0 deletions junit-jupiter/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>arquillian-parent</artifactId>
<groupId>org.jboss.arquillian</groupId>
<version>1.4.2.Final-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<!-- Artifact Information -->
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-jupiter-parent</artifactId>
<packaging>pom</packaging>
<name>Arquillian TestRunner JUnit Jupiter Aggregator</name>
<description>Arquillian JUnit Jupiter Aggregator</description>

<modules>
<module>core</module>
<module>standalone</module>
<module>container</module>
</modules>

</project>
81 changes: 81 additions & 0 deletions junit-jupiter/standalone/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!-- Parent -->
<parent>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-build</artifactId>
<version>1.4.2.Final-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>

<modelVersion>4.0.0</modelVersion>

<!-- Artifact Configuration -->
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-jupiter-standalone</artifactId>
<name>Arquillian TestRunner JUnit Jupiter Standalone</name>
<description>JUnit Jupiter Standalone Implementation for the Arquillian Project</description>

<!-- Dependencies -->
<dependencies>

<!-- org.jboss.arquillian -->
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-jupiter-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.test</groupId>
<artifactId>arquillian-test-spi</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.core</groupId>
<artifactId>arquillian-core-impl-base</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.test</groupId>
<artifactId>arquillian-test-impl-base</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.config</groupId>
<artifactId>arquillian-config-impl-base</artifactId>
<version>${project.version}</version>
</dependency>

<!-- External Projects -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
</dependency>

</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>test-jar</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
3 changes: 2 additions & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,12 @@
<module>container</module>

<module>junit</module>
<module>junit-jupiter</module>
<module>testng</module>

<module>testenrichers</module>
<module>protocols</module>

<module>bom</module>
</modules>

Expand Down

0 comments on commit 4b98704

Please sign in to comment.