migrate to junit5 (hyperledger#5573)

Signed-off-by: Sally MacFarlane <macfarla.github@gmail.com>
kaleido-io · Jun 9, 2023 · 479530d · 479530d
1 parent 4600921
commit 479530d
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 22 deletions.
diff --git a/errorprone-checks/build.gradle b/errorprone-checks/build.gradle
@@ -35,7 +35,6 @@ dependencies {
   implementation 'info.picocli:picocli'
 
   testImplementation 'com.google.errorprone:error_prone_test_helpers'
-  testImplementation 'junit:junit'
   testImplementation 'org.assertj:assertj-core'
   testImplementation 'org.junit.jupiter:junit-jupiter'
 

diff --git a/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/BannedMethodTest.java b/errorprone-checks/src/test/java/org/hyperledger/errorpronechecks/BannedMethodTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class BannedMethodTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper = CompilationTestHelper.newInstance(BannedMethod.class, getClass());
   }

diff --git a/...s/src/test/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java b/...s/src/test/java/org/hyperledger/errorpronechecks/DoNotCreateSecureRandomDirectlyTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DoNotCreateSecureRandomDirectlyTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper =
         CompilationTestHelper.newInstance(DoNotCreateSecureRandomDirectly.class, getClass());

diff --git a/.../src/test/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java b/.../src/test/java/org/hyperledger/errorpronechecks/DoNotInvokeMessageDigestDirectlyTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DoNotInvokeMessageDigestDirectlyTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper =
         CompilationTestHelper.newInstance(DoNotInvokeMessageDigestDirectly.class, getClass());

diff --git a/...e-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsTest.java b/...e-checks/src/test/java/org/hyperledger/errorpronechecks/DoNotReturnNullOptionalsTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class DoNotReturnNullOptionalsTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper =
         CompilationTestHelper.newInstance(DoNotReturnNullOptionals.class, getClass());

diff --git a/...a/org/hyperledger/errorpronechecks/ExperimentalCliOptionMustBeCorrectlyDisplayedTest.java b/...a/org/hyperledger/errorpronechecks/ExperimentalCliOptionMustBeCorrectlyDisplayedTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ExperimentalCliOptionMustBeCorrectlyDisplayedTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper =
         CompilationTestHelper.newInstance(

diff --git a/.../src/test/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalTest.java b/.../src/test/java/org/hyperledger/errorpronechecks/MethodInputParametersMustBeFinalTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class MethodInputParametersMustBeFinalTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper =
         CompilationTestHelper.newInstance(MethodInputParametersMustBeFinal.class, getClass());

diff --git a/...-checks/src/test/java/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggersTest.java b/...-checks/src/test/java/org/hyperledger/errorpronechecks/PrivateStaticFinalLoggersTest.java
@@ -15,14 +15,14 @@
 package org.hyperledger.errorpronechecks;
 
 import com.google.errorprone.CompilationTestHelper;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class PrivateStaticFinalLoggersTest {
 
   private CompilationTestHelper compilationHelper;
 
-  @Before
+  @BeforeEach
   public void setup() {
     compilationHelper =
         CompilationTestHelper.newInstance(PrivateStaticFinalLoggers.class, getClass());