test: migrate extensions-core and processing tests to JUnit 5

extensions-core/druid-aws-rds-extensions/pom.xml

@@ -78,8 +78,13 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

extensions-core/druid-aws-rds-extensions/src/test/java/org/apache/druid/aws/rds/AWSRDSTokenPasswordProviderTest.java

@@ -23,8 +23,8 @@
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.druid.metadata.PasswordProvider;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 import software.amazon.awssdk.auth.credentials.AwsCredentials;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 
@@ -68,9 +68,9 @@ public AwsCredentials resolveCredentials()
     );
 
     AWSRDSTokenPasswordProvider awsPwdProvider = (AWSRDSTokenPasswordProvider) pp;
-    Assert.assertEquals("testuser", awsPwdProvider.getUser());
-    Assert.assertEquals("testhost", awsPwdProvider.getHost());
-    Assert.assertEquals(5273, awsPwdProvider.getPort());
-    Assert.assertEquals("testregion", awsPwdProvider.getRegion());
+    Assertions.assertEquals("testuser", awsPwdProvider.getUser());
+    Assertions.assertEquals("testhost", awsPwdProvider.getHost());
+    Assertions.assertEquals(5273, awsPwdProvider.getPort());
+    Assertions.assertEquals("testregion", awsPwdProvider.getRegion());
   }
 }

extensions-core/druid-bloom-filter/pom.xml

@@ -124,24 +124,20 @@
       <artifactId>junit-jupiter-engine</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-migrationsupport</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-params</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.junit.vintage</groupId>
-      <artifactId>junit-vintage-engine</artifactId>
+      <groupId>org.reflections</groupId>
+      <artifactId>reflections</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- Required because the processing and SQL test JARs expose Hamcrest types in shared fixture APIs. -->
     <dependency>
-      <groupId>org.reflections</groupId>
-      <artifactId>reflections</artifactId>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

extensions-core/druid-bloom-filter/src/test/java/org/apache/druid/query/aggregation/bloom/BloomFilterAggregatorFactoryTest.java

@@ -29,8 +29,8 @@
 import org.apache.druid.query.timeseries.TimeseriesQueryQueryToolChest;
 import org.apache.druid.segment.column.ColumnType;
 import org.apache.druid.segment.column.RowSignature;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 public class BloomFilterAggregatorFactoryTest
 {
@@ -55,7 +55,7 @@ public void testResultArraySignature()
               )
               .build();
 
-    Assert.assertEquals(
+    Assertions.assertEquals(
         RowSignature.builder()
                     .addTimeColumn()
                     .add("count", ColumnType.LONG)
@@ -78,16 +78,16 @@ public void testWithNameBloomFilterAggFactory()
         DefaultDimensionSpec.of("col"),
         1024
     );
-    Assert.assertEquals(factory, factory.withName("bloom"));
-    Assert.assertEquals("newTest", factory.withName("newTest").getName());
+    Assertions.assertEquals(factory, factory.withName("bloom"));
+    Assertions.assertEquals("newTest", factory.withName("newTest").getName());
   }
 
 
   @Test
   public void testWithNameBloomFilterMergeAggFactory()
   {
     BloomFilterMergeAggregatorFactory factory = new BloomFilterMergeAggregatorFactory("bloomMerge", "bloom", 1024);
-    Assert.assertEquals(factory, factory.withName("bloomMerge"));
-    Assert.assertEquals("newTest", factory.withName("newTest").getName());
+    Assertions.assertEquals(factory, factory.withName("bloomMerge"));
+    Assertions.assertEquals("newTest", factory.withName("newTest").getName());
   }
 }

extensions-core/druid-bloom-filter/src/test/java/org/apache/druid/query/aggregation/bloom/BloomFilterAggregatorTest.java

@@ -44,8 +44,8 @@
 import org.apache.druid.segment.FloatColumnSelector;
 import org.apache.druid.segment.LongColumnSelector;
 import org.apache.druid.testing.InitializedNullHandlingTest;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 import javax.annotation.Nullable;
 import java.io.IOException;
@@ -250,7 +250,7 @@ public void testAggregateValues() throws IOException
         (ByteBuffer) valueAggregatorFactory.finalizeComputation(agg.get())
     );
     String serialized = filterToString(bloomKFilter);
-    Assert.assertEquals(serializedFilter1, serialized);
+    Assertions.assertEquals(serializedFilter1, serialized);
   }
 
   @Test
@@ -267,7 +267,7 @@ public void testAggregateLongValues() throws IOException
         (ByteBuffer) valueAggregatorFactory.finalizeComputation(agg.get())
     );
     String serialized = filterToString(bloomKFilter);
-    Assert.assertEquals(serializedLongFilter, serialized);
+    Assertions.assertEquals(serializedLongFilter, serialized);
   }
 
   @Test
@@ -284,7 +284,7 @@ public void testAggregateFloatValues() throws IOException
         (ByteBuffer) valueAggregatorFactory.finalizeComputation(agg.get())
     );
     String serialized = filterToString(bloomKFilter);
-    Assert.assertEquals(serializedFloatFilter, serialized);
+    Assertions.assertEquals(serializedFloatFilter, serialized);
   }
 
   @Test
@@ -301,7 +301,7 @@ public void testAggregateDoubleValues() throws IOException
         (ByteBuffer) valueAggregatorFactory.finalizeComputation(agg.get())
     );
     String serialized = filterToString(bloomKFilter);
-    Assert.assertEquals(serializedDoubleFilter, serialized);
+    Assertions.assertEquals(serializedDoubleFilter, serialized);
   }
 
   @Test
@@ -324,7 +324,7 @@ public void testBufferAggregateStringValues() throws IOException
         (ByteBuffer) valueAggregatorFactory.finalizeComputation(agg.get(buf, pos))
     );
     String serialized = filterToString(bloomKFilter);
-    Assert.assertEquals(serializedFilter2, serialized);
+    Assertions.assertEquals(serializedFilter2, serialized);
   }
 
   @Test
@@ -346,7 +346,7 @@ public void testBufferAggregateLongValues() throws IOException
         (ByteBuffer) valueAggregatorFactory.finalizeComputation(agg.get(buf, pos))
     );
     String serialized = filterToString(bloomKFilter);
-    Assert.assertEquals(serializedLongFilter, serialized);
+    Assertions.assertEquals(serializedLongFilter, serialized);
   }
 
   @Test
@@ -368,7 +368,7 @@ public void testBufferAggregateFloatValues() throws IOException
         (ByteBuffer) valueAggregatorFactory.finalizeComputation(agg.get(buf, pos))
     );
     String serialized = filterToString(bloomKFilter);
-    Assert.assertEquals(serializedFloatFilter, serialized);
+    Assertions.assertEquals(serializedFloatFilter, serialized);
   }
 
   @Test
@@ -390,7 +390,7 @@ public void testBufferAggregateDoubleValues() throws IOException
         (ByteBuffer) valueAggregatorFactory.finalizeComputation(agg.get(buf, pos))
     );
     String serialized = filterToString(bloomKFilter);
-    Assert.assertEquals(serializedDoubleFilter, serialized);
+    Assertions.assertEquals(serializedDoubleFilter, serialized);
   }
 
   @Test
@@ -419,7 +419,7 @@ public void testCombineValues() throws IOException
     );
 
     String serialized = filterToString(combined);
-    Assert.assertEquals(serializedCombinedFilter, serialized);
+    Assertions.assertEquals(serializedCombinedFilter, serialized);
   }
 
   @Test
@@ -445,7 +445,7 @@ public void testMergeValues() throws IOException
         (ByteBuffer) valueAggregatorFactory.getCombiningFactory().finalizeComputation(mergeAggregator.get())
     );
     String serialized = filterToString(merged);
-    Assert.assertEquals(serializedCombinedFilter, serialized);
+    Assertions.assertEquals(serializedCombinedFilter, serialized);
   }
 
   @Test
@@ -471,7 +471,7 @@ public void testMergeValuesWithBuffersForGroupByV1() throws IOException
         (ByteBuffer) valueAggregatorFactory.getCombiningFactory().finalizeComputation(mergeAggregator.get())
     );
     String serialized = filterToString(merged);
-    Assert.assertEquals(serializedCombinedFilter, serialized);
+    Assertions.assertEquals(serializedCombinedFilter, serialized);
   }
 
   @Test
@@ -503,7 +503,7 @@ public void testBuferMergeValues() throws IOException
     );
     String serialized = filterToString(merged);
 
-    Assert.assertEquals(serializedCombinedFilter, serialized);
+    Assertions.assertEquals(serializedCombinedFilter, serialized);
   }
 
   @Test
@@ -516,7 +516,7 @@ public void testSerde() throws Exception
     );
     ObjectMapper objectMapper = new DefaultObjectMapper();
     new BloomFilterExtensionModule().getJacksonModules().forEach(objectMapper::registerModule);
-    Assert.assertEquals(
+    Assertions.assertEquals(
         factory,
         objectMapper.readValue(objectMapper.writeValueAsString(factory), AggregatorFactory.class)
     );
@@ -527,7 +527,7 @@ public void testSerde() throws Exception
                             + "\"field\":\"b\","
                             + "\"maxNumEntries\":15"
                             + "}";
-    Assert.assertEquals(
+    Assertions.assertEquals(
         factory,
         objectMapper.readValue(fieldNamesOnly, AggregatorFactory.class)
     );
@@ -538,7 +538,7 @@ public void testSerde() throws Exception
         MAX_NUM_VALUES
     );
 
-    Assert.assertEquals(
+    Assertions.assertEquals(
         factory2,
         objectMapper.readValue(objectMapper.writeValueAsString(factory2), AggregatorFactory.class)
     );
@@ -548,7 +548,7 @@ public void testSerde() throws Exception
         new RegexFilteredDimensionSpec(new DefaultDimensionSpec("a", "a"), ".*"),
         MAX_NUM_VALUES
     );
-    Assert.assertEquals(
+    Assertions.assertEquals(
         factory3,
         objectMapper.readValue(objectMapper.writeValueAsString(factory3), AggregatorFactory.class)
     );