KAFKA-12196: Migrate connect:api module to JUnit 5 (apache#9909)

Reviewers: Chia-Ping Tsai <[email protected]>, Ismael Juma <[email protected]>

Author: g1geordie

build.gradle

@@ -242,7 +242,7 @@ subprojects {
   }
 
   // Remove the relevant project name once it's converted to JUnit 5
-  def shouldUseJUnit5 = !(["api", "connect", "core", "generator", "runtime", "examples",
+  def shouldUseJUnit5 = !(["connect", "core", "generator", "runtime", "examples",
     "streams-scala", "streams"].contains(it.project.name) || it.project.name.startsWith("upgrade-system-tests-"))
 
   def testLoggingEvents = ["passed", "skipped", "failed"]
@@ -1850,9 +1850,7 @@ project(':connect:api') {
     compile libs.slf4jApi
     compile libs.jaxrsApi
 
-    testCompile libs.junitJupiterApi
-    testCompile libs.junitVintageEngine
-
+    testCompile libs.junitJupiter
     testRuntime libs.slf4jlog4j
     testCompile project(':clients').sourceSets.test.output
   }

connect/api/src/test/java/org/apache/kafka/connect/connector/ConnectorReconfigurationTest.java

@@ -19,14 +19,14 @@
 import org.apache.kafka.common.config.ConfigDef;
 import org.apache.kafka.connect.errors.ConnectException;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class ConnectorReconfigurationTest {
 

connect/api/src/test/java/org/apache/kafka/connect/connector/ConnectorTest.java

@@ -21,16 +21,16 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public abstract class ConnectorTest {
 
     protected ConnectorContext context;
     protected Connector connector;
     protected AssertableConnector assertableConnector;
 
-    @Before
+    @BeforeEach
     public void beforeEach() {
         connector = createConnector();
         context = createContext();

connect/api/src/test/java/org/apache/kafka/connect/data/ConnectSchemaTest.java

@@ -17,7 +17,7 @@
 package org.apache.kafka.connect.data;
 
 import org.apache.kafka.connect.errors.DataException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
@@ -28,10 +28,10 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class ConnectSchemaTest {
     private static final Schema MAP_INT_STRING_SCHEMA = SchemaBuilder.map(Schema.INT32_SCHEMA, Schema.STRING_SCHEMA).build();
@@ -69,8 +69,7 @@ public void testFieldsOnStructSchema() {
 
     @Test
     public void testFieldsOnlyValidForStructs() {
-        assertThrows(DataException.class,
-            () -> Schema.INT8_SCHEMA.fields());
+        assertThrows(DataException.class, Schema.INT8_SCHEMA::fields);
     }
 
     @Test

connect/api/src/test/java/org/apache/kafka/connect/data/DateTest.java

@@ -17,14 +17,14 @@
 package org.apache.kafka.connect.data;
 
 import org.apache.kafka.connect.errors.DataException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class DateTest {
     private static final GregorianCalendar EPOCH;

connect/api/src/test/java/org/apache/kafka/connect/data/DecimalTest.java

@@ -16,14 +16,14 @@
  */
 package org.apache.kafka.connect.data;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.util.Collections;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 public class DecimalTest {
     private static final int TEST_SCALE = 2;

connect/api/src/test/java/org/apache/kafka/connect/data/FieldTest.java

@@ -16,10 +16,10 @@
  */
 package org.apache.kafka.connect.data;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
 public class FieldTest {
 

connect/api/src/test/java/org/apache/kafka/connect/data/SchemaBuilderTest.java

@@ -17,7 +17,7 @@
 package org.apache.kafka.connect.data;
 
 import org.apache.kafka.connect.errors.SchemaBuilderException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.nio.ByteBuffer;
 import java.util.Arrays;
@@ -26,9 +26,9 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 public class SchemaBuilderTest {
     private static final String NAME = "name";