You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/05/26 06:01:13 UTC
[isis] branch master updated: ISIS-1954: adds JUnit 5 support
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new d18ed11 ISIS-1954: adds JUnit 5 support
d18ed11 is described below
commit d18ed11148a93e9322b4d070d6be9c11fd437f07
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat May 26 08:01:07 2018 +0200
ISIS-1954: adds JUnit 5 support
Task-Url: https://issues.apache.org/jira/browse/ISIS-1954
---
core/integtestsupport/pom.xml | 20 ++++++--
core/pom.xml | 56 ++++++++++++++++------
core/specsupport/pom.xml | 21 ++++++--
core/unittestsupport-legacy/pom.xml | 1 +
core/unittestsupport/pom.xml | 18 +++++--
example/application/helloworld/.gitignore | 1 +
.../application/simpleapp/module-simple/.gitignore | 1 +
7 files changed, 93 insertions(+), 25 deletions(-)
diff --git a/core/integtestsupport/pom.xml b/core/integtestsupport/pom.xml
index 36e0b7c..e81a748 100644
--- a/core/integtestsupport/pom.xml
+++ b/core/integtestsupport/pom.xml
@@ -54,10 +54,22 @@
<artifactId>isis-core-specsupport</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
+ <!-- JUPITER -->
+ <dependency>
+ <!-- JUnit API for writing tests and extensions -->
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ </dependency>
+ <dependency>
+ <!-- implementation of the JUnit Jupiter test engine -->
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ </dependency>
+ <dependency>
+ <!-- support for unit tests that use JUnit 4 or JUnit 3 -->
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ </dependency>
<dependency>
<groupId>org.jmock</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index 3fcd4a3..42160ea 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -174,7 +174,8 @@
<htmlparser.version>2.1</htmlparser.version>
- <junit.version>4.12</junit.version>
+ <junit.version>5.2.0</junit.version>
+
<!-- 2.8.1 depends on cglib-nodep 3.1 whereas axonframework depends on 2.2.2 -->
<jmock.version>2.6.0</jmock.version>
<easymock.version>2.5.2</easymock.version>
@@ -2042,12 +2043,26 @@ ${license.additional-notes}
</dependency>
- <!-- Testing libraries (not scope=test because used by isis-core-integtest) -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
+ <!-- TESTING LIBRARIES (not scope=test because used by isis-core-integtest) -->
+
+ <dependency>
+ <!-- JUnit API for writing tests and extensions -->
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ <dependency>
+ <!-- implementation of the JUnit Jupiter test engine -->
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
+ <dependency>
+ <!-- support for unit tests that use JUnit 4 or JUnit 3 -->
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit.version}</version>
+ </dependency>
<dependency>
<groupId>org.jmock</groupId>
@@ -2134,7 +2149,7 @@ ${license.additional-notes}
</dependencyManagement>
<dependencies>
- <!-- compile dependencies -->
+ <!-- COMPILE DEPENDENCIES -->
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
@@ -2144,12 +2159,25 @@ ${license.additional-notes}
<artifactId>slf4j-api</artifactId>
</dependency>
- <!-- test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <!-- TEST DEPENDENCIES -->
+ <dependency>
+ <!-- JUnit API for writing tests and extensions -->
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- implementation of the JUnit Jupiter test engine -->
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <!-- support for unit tests that use JUnit 4 or JUnit 3 -->
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock-junit4</artifactId>
diff --git a/core/specsupport/pom.xml b/core/specsupport/pom.xml
index 1bf20da..9e3cc6f 100644
--- a/core/specsupport/pom.xml
+++ b/core/specsupport/pom.xml
@@ -41,10 +41,23 @@
<artifactId>isis-core-wrapper</artifactId>
</dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
+ <!-- JUPITER -->
+ <dependency>
+ <!-- JUnit API for writing tests and extensions -->
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ </dependency>
+ <dependency>
+ <!-- implementation of the JUnit Jupiter test engine -->
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ </dependency>
+ <dependency>
+ <!-- support for unit tests that use JUnit 4 or JUnit 3 -->
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ </dependency>
+
<dependency>
<groupId>org.jmock</groupId>
<artifactId>jmock</artifactId>
diff --git a/core/unittestsupport-legacy/pom.xml b/core/unittestsupport-legacy/pom.xml
index 5c5ab3e..5a2f572 100644
--- a/core/unittestsupport-legacy/pom.xml
+++ b/core/unittestsupport-legacy/pom.xml
@@ -55,6 +55,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>4.12</version>
</dependency>
<dependency>
diff --git a/core/unittestsupport/pom.xml b/core/unittestsupport/pom.xml
index de70610..cf05cb5 100644
--- a/core/unittestsupport/pom.xml
+++ b/core/unittestsupport/pom.xml
@@ -48,10 +48,22 @@
<scope>test</scope>
<optional>true</optional>
</dependency>
-
+
+ <!-- JUPITER -->
+ <dependency>
+ <!-- JUnit API for writing tests and extensions -->
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-api</artifactId>
+ </dependency>
+ <dependency>
+ <!-- implementation of the JUnit Jupiter test engine -->
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ </dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
+ <!-- support for unit tests that use JUnit 4 or JUnit 3 -->
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
</dependency>
<dependency>
diff --git a/example/application/helloworld/.gitignore b/example/application/helloworld/.gitignore
index 83e3db4..2b5e580 100644
--- a/example/application/helloworld/.gitignore
+++ b/example/application/helloworld/.gitignore
@@ -40,3 +40,4 @@ pom.xml.versionsBackup
rebel.xml
translations.pot
/.factorypath
+/.apt_generated_tests/
diff --git a/example/application/simpleapp/module-simple/.gitignore b/example/application/simpleapp/module-simple/.gitignore
index 726d3a0..85cb54f 100644
--- a/example/application/simpleapp/module-simple/.gitignore
+++ b/example/application/simpleapp/module-simple/.gitignore
@@ -5,3 +5,4 @@ gradle/wrapper
!gradle-wrapper.jar
/.apt_generated/
/.factorypath
+/.apt_generated_tests/
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.