Merge pull request #131 from sullis/junit-4.13

JUnit 4.13
TNG · Nov 2, 2020 · dc1d381 · dc1d381
2 parents f7c9755 + f5f10fa
commit dc1d381
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,6 +11,8 @@ build-job: &build-job
 
         - run: ./gradlew --build-cache --scan build -Pjunit4Version=4.10  -PjunitJupiterVersion=5.5.0 -PskipSpotBugs
         - run: ./gradlew --build-cache --scan build -Pjunit4Version=4.11  -PjunitJupiterVersion=5.5.1 -PskipSpotBugs
+        - run: ./gradlew --build-cache --scan build -Pjunit4Version=4.12  -PjunitJupiterVersion=5.5.1 -PskipSpotBugs
+        - run: ./gradlew --build-cache --scan build -Pjunit4Version=4.13  -PjunitJupiterVersion=5.5.1 -PskipSpotBugs
         - run: ./gradlew --build-cache --scan build
         - run: COVERALLS_REPO_TOKEN=Npp4tyTSCz0wSMZTJ81vXdVe1uw6WtRrC ./gradlew --build-cache --scan jacocoRootReport coveralls
 

diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,8 @@ jdk:
 script:
   - ./gradlew --scan build -Pjunit4Version=4.10  -PjunitJupiterVersion=5.5.0 -PskipSpotBugs
   - ./gradlew --scan build -Pjunit4Version=4.11  -PjunitJupiterVersion=5.5.1 -PskipSpotBugs
+  - ./gradlew --scan build -Pjunit4Version=4.12  -PjunitJupiterVersion=5.5.1 -PskipSpotBugs
+  - ./gradlew --scan build -Pjunit4Version=4.13  -PjunitJupiterVersion=5.5.1 -PskipSpotBugs
   - ./gradlew --scan build
 
   - cd ${TRAVIS_BUILD_DIR}/junit4/

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,7 +15,7 @@ val skipSpotBugs by extra(hasProperty("skipSpotBugs"))
 println("Using skipSpotBugs = $skipSpotBugs for current build.")
 
 // set default junit versions if not set via command line
-val junit4Version by extra(findProperty("junit4Version")?.toString() ?: "4.12")
+val junit4Version by extra(findProperty("junit4Version")?.toString() ?: "4.13")
 println("Using JUnit4 version $junit4Version for current build.")
 val junitJupiterVersion by extra(findProperty("junitJupiterVersion")?.toString() ?: "5.5.2")
 println("Using JUnit Jupiter version $junitJupiterVersion for current build.")
@@ -473,7 +473,7 @@ subprojects {
 
                                     // JUnit4
                                     if (groupId.textContent == "junit" && artifactId.textContent == "junit") {
-                                        dep.getElementsByTagName("version").onlyElement().textContent = "[4.10,4.12]"
+                                        dep.getElementsByTagName("version").onlyElement().textContent = "[4.10,4.13]"
                                         dep.getElementsByTagName("scope").onlyElement().textContent = "provided"
                                     }
 

diff --git a/core/src/test/java/com/tngtech/junit/dataprovider/DataProvidersTest.java b/core/src/test/java/com/tngtech/junit/dataprovider/DataProvidersTest.java
@@ -19,6 +19,7 @@
 
 public class DataProvidersTest {
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 

diff --git a/core/src/test/java/com/tngtech/junit/dataprovider/PreconditionsTest.java b/core/src/test/java/com/tngtech/junit/dataprovider/PreconditionsTest.java
@@ -11,6 +11,7 @@
 
 public class PreconditionsTest {
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 

diff --git a/core/src/test/java/com/tngtech/junit/dataprovider/convert/AbstractObjectConverterTest.java b/core/src/test/java/com/tngtech/junit/dataprovider/convert/AbstractObjectConverterTest.java
@@ -10,6 +10,7 @@
 
 public class AbstractObjectConverterTest {
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "Mockito rule needs no further configuration")

diff --git a/core/src/test/java/com/tngtech/junit/dataprovider/convert/ConverterContextTest.java b/core/src/test/java/com/tngtech/junit/dataprovider/convert/ConverterContextTest.java
@@ -6,6 +6,7 @@
 
 public class ConverterContextTest {
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 

diff --git a/core/src/test/java/com/tngtech/junit/dataprovider/convert/DataConverterTest.java b/core/src/test/java/com/tngtech/junit/dataprovider/convert/DataConverterTest.java
@@ -24,6 +24,7 @@
 
 public class DataConverterTest {
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "Mockito rule needs no further configuration")

diff --git a/core/src/test/java/com/tngtech/junit/dataprovider/convert/SingleArgConverterTest.java b/core/src/test/java/com/tngtech/junit/dataprovider/convert/SingleArgConverterTest.java
@@ -12,6 +12,7 @@
 
 public class SingleArgConverterTest {
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "Mockito rule needs no further configuration")

diff --git a/core/src/test/java/com/tngtech/junit/dataprovider/convert/StringConverterTest.java b/core/src/test/java/com/tngtech/junit/dataprovider/convert/StringConverterTest.java
@@ -26,6 +26,7 @@
 
 public class StringConverterTest {
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "Mockito rule needs no further configuration")

diff --git a/core/src/test/java/com/tngtech/junit/dataprovider/placeholder/ReplacementDataTest.java b/core/src/test/java/com/tngtech/junit/dataprovider/placeholder/ReplacementDataTest.java
@@ -15,6 +15,7 @@
 
 public class ReplacementDataTest {
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 

diff --git a/...st/java/com/tngtech/junit/dataprovider/resolver/DataProviderMethodResolverHelperTest.java b/...st/java/com/tngtech/junit/dataprovider/resolver/DataProviderMethodResolverHelperTest.java
@@ -40,6 +40,7 @@ public List<Method> resolve(DataProviderResolverContext context) {
         }
     }
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD", justification = "Mockito rule needs no further configuration")
@@ -245,4 +246,4 @@ public List<Method> resolve(DataProviderResolverContext context) {
             return null;
         }
     }
-}
+}
diff --git a/...rc/test/java/com/tngtech/junit/dataprovider/resolver/DataProviderResolverContextTest.java b/...rc/test/java/com/tngtech/junit/dataprovider/resolver/DataProviderResolverContextTest.java
@@ -22,6 +22,7 @@
 @RunWith(MockitoJUnitRunner.class)
 public class DataProviderResolverContextTest {
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 

diff --git a/...t/java/com/tngtech/junit/dataprovider/resolver/DefaultDataProviderMethodResolverTest.java b/...t/java/com/tngtech/junit/dataprovider/resolver/DefaultDataProviderMethodResolverTest.java
@@ -30,6 +30,7 @@
 
 public class DefaultDataProviderMethodResolverTest {
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException expectedException = ExpectedException.none();
 

diff --git a/junit4/build.xml b/junit4/build.xml
@@ -14,7 +14,7 @@
 
     <!-- Libraries -->
     <fileset id="libs.fileset" dir="${libs.dir}">
-        <include name="**/junit-4.12.jar" />
+        <include name="**/junit-4.13.jar" />
         <include name="**/hamcrest-core-1.3.jar" />
         <include name="**/assertj-core-1.7.1.jar" />
     </fileset>

diff --git a/junit4/pom.xml b/junit4/pom.xml
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <version>4.13</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/junit4/src/test/java/com/tngtech/java/junit/dataprovider/common/PreconditionsTest.java b/junit4/src/test/java/com/tngtech/java/junit/dataprovider/common/PreconditionsTest.java
@@ -9,6 +9,7 @@
 
 public class PreconditionsTest {
 
+    @SuppressWarnings("deprecation")
     @Rule
     public ExpectedException expectedException = ExpectedException.none();