test: replace deprecated JUnit assertThat calls

codestyle/druid-forbidden-apis.txt

@@ -96,3 +96,6 @@ javax.annotation.concurrent.GuardedBy
 com.amazonaws.annotation.GuardedBy
 
 org.powermock.** @ Use Mockito instead of Powermock for compatibility with newer Java versions
+
+org.junit.Assert#assertThat(java.lang.Object,org.hamcrest.Matcher) @ Use org.hamcrest.MatcherAssert#assertThat instead
+org.junit.Assert#assertThat(java.lang.String,java.lang.Object,org.hamcrest.Matcher) @ Use org.hamcrest.MatcherAssert#assertThat instead

extensions-contrib/compressed-bigdecimal/src/test/java/org/apache/druid/compressedbigdecimal/aggregator/CompressedBigDecimalAggregatorGroupByTestBase.java

@@ -28,6 +28,7 @@
 import org.apache.druid.query.aggregation.AggregationTestHelper;
 import org.apache.druid.query.groupby.GroupByQueryConfig;
 import org.apache.druid.query.groupby.ResultRow;
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.collection.IsCollectionWithSize;
 import org.hamcrest.collection.IsMapContaining;
 import org.hamcrest.collection.IsMapWithSize;
@@ -107,32 +108,32 @@ public void testIngestAndGroupByAllQuery() throws IOException, Exception
     );
 
     List<ResultRow> results = seq.toList();
-    Assert.assertThat(results, IsCollectionWithSize.hasSize(1));
+    MatcherAssert.assertThat(results, IsCollectionWithSize.hasSize(1));
     ResultRow row = results.get(0);
     MapBasedRow mapBasedRow = row.toMapBasedRow(cbdGroupByQueryConfig.getQuery());
     Map<String, Object> event = mapBasedRow.getEvent();
     Assert.assertEquals(
         new DateTime("2017-01-01T00:00:00Z", DateTimeZone.forTimeZone(TimeZone.getTimeZone("UTC"))),
         mapBasedRow.getTimestamp()
     );
-    Assert.assertThat(event, IsMapWithSize.aMapWithSize(3));
-    Assert.assertThat(
+    MatcherAssert.assertThat(event, IsMapWithSize.aMapWithSize(3));
+    MatcherAssert.assertThat(
         event,
         IsMapContaining.hasEntry(
             "cbdRevenueFromString",
             new ArrayCompressedBigDecimal(new BigDecimal(cbdGroupByQueryConfig.getStringRevenue()))
         )
     );
     // long conversion of 5000000000.000000005 results in null/0 value
-    Assert.assertThat(
+    MatcherAssert.assertThat(
         event,
         IsMapContaining.hasEntry(
             "cbdRevenueFromLong",
             new ArrayCompressedBigDecimal(new BigDecimal(cbdGroupByQueryConfig.getLongRevenue()))
         )
     );
     // double input changes 5000000000.000000005 to 5000000000.5 to fit in double mantissa space
-    Assert.assertThat(
+    MatcherAssert.assertThat(
         event,
         IsMapContaining.hasEntry(
             "cbdRevenueFromDouble",

extensions-contrib/compressed-bigdecimal/src/test/java/org/apache/druid/compressedbigdecimal/aggregator/CompressedBigDecimalAggregatorTimeseriesTestBase.java

@@ -53,10 +53,10 @@
 import java.util.Map;
 import java.util.TimeZone;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.collection.IsMapContaining.hasEntry;
 import static org.hamcrest.collection.IsMapWithSize.aMapWithSize;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
 
 public abstract class CompressedBigDecimalAggregatorTimeseriesTestBase extends InitializedNullHandlingTest
 {

extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/MovingAverageIterableTest.java

@@ -35,6 +35,7 @@
 import org.apache.druid.query.movingaverage.averagers.LongMeanAveragerFactory;
 import org.apache.druid.testing.InitializedNullHandlingTest;
 import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
 import org.joda.time.DateTime;
 import org.joda.time.chrono.ISOChronology;
 import org.junit.Assert;
@@ -144,7 +145,7 @@ public void testNext()
     r = iter.next();
     Assert.assertEquals(JAN_3, r.getTimestamp());
     Assert.assertEquals("US", r.getRaw(COUNTRY));
-    Assert.assertThat(r.getRaw(AGE), CoreMatchers.not(CoreMatchers.equalTo(r2.getRaw(AGE))));
+    MatcherAssert.assertThat(r.getRaw(AGE), CoreMatchers.not(CoreMatchers.equalTo(r2.getRaw(AGE))));
 
     Assert.assertTrue(iter.hasNext());
     r = iter.next();

extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/MovingAverageQueryTest.java

@@ -78,6 +78,7 @@
 import org.apache.druid.testing.InitializedNullHandlingTest;
 import org.apache.druid.timeline.TimelineLookup;
 import org.apache.druid.utils.JvmUtils;
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.core.IsInstanceOf;
 import org.joda.time.Interval;
 import org.junit.Assert;
@@ -303,11 +304,11 @@ private List<MapBasedRow> consistentTypeCasting(List<MapBasedRow> result)
   public void testQuery() throws IOException
   {
     Query<?> query = jsonMapper.readValue(getQueryString(), Query.class);
-    Assert.assertThat(query, IsInstanceOf.instanceOf(getExpectedQueryType()));
+    MatcherAssert.assertThat(query, IsInstanceOf.instanceOf(getExpectedQueryType()));
 
     List<MapBasedRow> expectedResults = jsonMapper.readValue(getExpectedResultString(), getExpectedResultType());
     Assert.assertNotNull(expectedResults);
-    Assert.assertThat(expectedResults, IsInstanceOf.instanceOf(List.class));
+    MatcherAssert.assertThat(expectedResults, IsInstanceOf.instanceOf(List.class));
 
     DruidHttpClientConfig httpClientConfig = new DruidHttpClientConfig()
     {

extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/DoubleMaxAveragerFactoryTest.java

@@ -20,7 +20,7 @@
 package org.apache.druid.query.movingaverage.averagers;
 
 import org.hamcrest.CoreMatchers;
-import org.junit.Assert;
+import org.hamcrest.MatcherAssert;
 import org.junit.Test;
 
 public class DoubleMaxAveragerFactoryTest
@@ -29,6 +29,6 @@ public class DoubleMaxAveragerFactoryTest
   public void testCreateAverager()
   {
     AveragerFactory<?, ?> fac = new DoubleMaxAveragerFactory("test", 5, 1, "field");
-    Assert.assertThat(fac.createAverager(), CoreMatchers.instanceOf(DoubleMaxAverager.class));
+    MatcherAssert.assertThat(fac.createAverager(), CoreMatchers.instanceOf(DoubleMaxAverager.class));
   }
 }

extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/DoubleMeanAveragerFactoryTest.java

@@ -19,8 +19,8 @@
 
 package org.apache.druid.query.movingaverage.averagers;
 
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.core.IsInstanceOf;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class DoubleMeanAveragerFactoryTest
@@ -29,6 +29,6 @@ public class DoubleMeanAveragerFactoryTest
   public void testCreateAverager()
   {
     AveragerFactory<?, ?> fac = new DoubleMeanAveragerFactory("test", 5, 1, "field");
-    Assert.assertThat(fac.createAverager(), IsInstanceOf.instanceOf(DoubleMeanAverager.class));
+    MatcherAssert.assertThat(fac.createAverager(), IsInstanceOf.instanceOf(DoubleMeanAverager.class));
   }
 }

extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/DoubleMeanNoNullAveragerFactoryTest.java

@@ -19,8 +19,8 @@
 
 package org.apache.druid.query.movingaverage.averagers;
 
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.core.IsInstanceOf;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class DoubleMeanNoNullAveragerFactoryTest
@@ -29,6 +29,6 @@ public class DoubleMeanNoNullAveragerFactoryTest
   public void testCreateAverager()
   {
     AveragerFactory<?, ?> fac = new DoubleMeanNoNullAveragerFactory("test", 5, 1, "field");
-    Assert.assertThat(fac.createAverager(), IsInstanceOf.instanceOf(DoubleMeanNoNullAverager.class));
+    MatcherAssert.assertThat(fac.createAverager(), IsInstanceOf.instanceOf(DoubleMeanNoNullAverager.class));
   }
 }

extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/DoubleMinAveragerFactoryTest.java

@@ -19,8 +19,8 @@
 
 package org.apache.druid.query.movingaverage.averagers;
 
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.core.IsInstanceOf;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class DoubleMinAveragerFactoryTest
@@ -29,6 +29,6 @@ public class DoubleMinAveragerFactoryTest
   public void testCreateAverager()
   {
     AveragerFactory<?, ?> fac = new DoubleMinAveragerFactory("test", 5, 1, "field");
-    Assert.assertThat(fac.createAverager(), IsInstanceOf.instanceOf(DoubleMinAverager.class));
+    MatcherAssert.assertThat(fac.createAverager(), IsInstanceOf.instanceOf(DoubleMinAverager.class));
   }
 }

extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/DoubleSumAveragerFactoryTest.java

@@ -19,8 +19,8 @@
 
 package org.apache.druid.query.movingaverage.averagers;
 
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.core.IsInstanceOf;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class DoubleSumAveragerFactoryTest
@@ -30,7 +30,7 @@ public class DoubleSumAveragerFactoryTest
   public void testCreateAverager()
   {
     AveragerFactory<?, ?> fac = new DoubleSumAveragerFactory("test", 5, 1, "field");
-    Assert.assertThat(fac.createAverager(), IsInstanceOf.instanceOf(DoubleSumAverager.class));
+    MatcherAssert.assertThat(fac.createAverager(), IsInstanceOf.instanceOf(DoubleSumAverager.class));
   }
 
 }

extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/LongMaxAveragerFactoryTest.java

@@ -19,8 +19,8 @@
 
 package org.apache.druid.query.movingaverage.averagers;
 
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.core.IsInstanceOf;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class LongMaxAveragerFactoryTest
@@ -29,6 +29,6 @@ public class LongMaxAveragerFactoryTest
   public void testCreateAverager()
   {
     AveragerFactory<?, ?> fac = new LongMaxAveragerFactory("test", 5, 1, "field");
-    Assert.assertThat(fac.createAverager(), IsInstanceOf.instanceOf(LongMaxAverager.class));
+    MatcherAssert.assertThat(fac.createAverager(), IsInstanceOf.instanceOf(LongMaxAverager.class));
   }
 }

extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/LongMeanAveragerFactoryTest.java

@@ -19,8 +19,8 @@
 
 package org.apache.druid.query.movingaverage.averagers;
 
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.core.IsInstanceOf;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class LongMeanAveragerFactoryTest
@@ -29,6 +29,6 @@ public class LongMeanAveragerFactoryTest
   public void testCreateAverager()
   {
     AveragerFactory<?, ?> fac = new LongMeanAveragerFactory("test", 5, 1, "field");
-    Assert.assertThat(fac.createAverager(), IsInstanceOf.instanceOf(LongMeanAverager.class));
+    MatcherAssert.assertThat(fac.createAverager(), IsInstanceOf.instanceOf(LongMeanAverager.class));
   }
 }

extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/LongMeanNoNullAveragerFactoryTest.java

@@ -19,8 +19,8 @@
 
 package org.apache.druid.query.movingaverage.averagers;
 
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.core.IsInstanceOf;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class LongMeanNoNullAveragerFactoryTest
@@ -29,6 +29,6 @@ public class LongMeanNoNullAveragerFactoryTest
   public void testCreateAverager()
   {
     AveragerFactory<?, ?> fac = new LongMeanNoNullAveragerFactory("test", 5, 1, "field");
-    Assert.assertThat(fac.createAverager(), IsInstanceOf.instanceOf(LongMeanNoNullAverager.class));
+    MatcherAssert.assertThat(fac.createAverager(), IsInstanceOf.instanceOf(LongMeanNoNullAverager.class));
   }
 }

extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/LongMinAveragerFactoryTest.java

@@ -19,8 +19,8 @@
 
 package org.apache.druid.query.movingaverage.averagers;
 
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.core.IsInstanceOf;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class LongMinAveragerFactoryTest
@@ -29,6 +29,6 @@ public class LongMinAveragerFactoryTest
   public void testCreateAverager()
   {
     AveragerFactory<?, ?> fac = new LongMinAveragerFactory("test", 5, 1, "field");
-    Assert.assertThat(fac.createAverager(), IsInstanceOf.instanceOf(LongMinAverager.class));
+    MatcherAssert.assertThat(fac.createAverager(), IsInstanceOf.instanceOf(LongMinAverager.class));
   }
 }

extensions-contrib/moving-average-query/src/test/java/org/apache/druid/query/movingaverage/averagers/LongSumAveragerFactoryTest.java

@@ -19,8 +19,8 @@
 
 package org.apache.druid.query.movingaverage.averagers;
 
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.core.IsInstanceOf;
-import org.junit.Assert;
 import org.junit.Test;
 
 public class LongSumAveragerFactoryTest
@@ -30,7 +30,7 @@ public class LongSumAveragerFactoryTest
   public void testCreateAverager()
   {
     AveragerFactory<?, ?> fac = new LongSumAveragerFactory("test", 5, 1, "field");
-    Assert.assertThat(fac.createAverager(), IsInstanceOf.instanceOf(LongSumAverager.class));
+    MatcherAssert.assertThat(fac.createAverager(), IsInstanceOf.instanceOf(LongSumAverager.class));
   }
 
 }

extensions-core/datasketches/src/test/java/org/apache/druid/query/aggregation/datasketches/util/ToObjectVectorColumnProcessorFactoryTest.java

@@ -34,6 +34,7 @@
 import org.apache.druid.segment.vector.VectorCursor;
 import org.apache.druid.testing.InitializedNullHandlingTest;
 import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -168,7 +169,7 @@ public void testMultiString()
   public void testComplexSketch()
   {
     final Object sketch = Iterables.getOnlyElement(readColumn("quality_uniques", 1));
-    Assert.assertThat(sketch, CoreMatchers.instanceOf(HyperLogLogCollector.class));
+    MatcherAssert.assertThat(sketch, CoreMatchers.instanceOf(HyperLogLogCollector.class));
   }
 
   private CursorHolder makeCursorHolder()

extensions-core/histogram/src/test/java/org/apache/druid/query/aggregation/histogram/QuantilesTest.java

@@ -23,6 +23,7 @@
 import nl.jqno.equalsverifier.EqualsVerifier;
 import org.apache.druid.jackson.DefaultObjectMapper;
 import org.hamcrest.CoreMatchers;
+import org.hamcrest.MatcherAssert;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -46,7 +47,7 @@ public void testSerialization() throws Exception
     );
 
     Object theObject = mapper.readValue(theString, Object.class);
-    Assert.assertThat(theObject, CoreMatchers.instanceOf(LinkedHashMap.class));
+    MatcherAssert.assertThat(theObject, CoreMatchers.instanceOf(LinkedHashMap.class));
 
     LinkedHashMap theMap = (LinkedHashMap) theObject;
 

indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/ParallelIndexSupervisorTaskTest.java

@@ -136,7 +136,7 @@ public void sizesPartitionsEvenly()
       int maxPartitionSize = sortedPartitionSizes.get(sortedPartitionSizes.size() - 1);
       int partitionSizeRange = maxPartitionSize - minPartitionSize;
 
-      Assert.assertThat(
+      MatcherAssert.assertThat(
           "partition sizes = " + actualPartitionSizes,
           partitionSizeRange,
           Matchers.is(Matchers.both(Matchers.greaterThanOrEqualTo(0)).and(Matchers.lessThanOrEqualTo(1)))

indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/PartialHashSegmentGenerateTaskTest.java

@@ -35,6 +35,7 @@
 import org.apache.druid.server.security.Resource;
 import org.apache.druid.server.security.ResourceAction;
 import org.apache.druid.server.security.ResourceType;
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.joda.time.Interval;
 import org.junit.Assert;
@@ -92,7 +93,7 @@ public void serializesDeserializes()
   public void hasCorrectPrefixForAutomaticId()
   {
     String id = target.getId();
-    Assert.assertThat(id, Matchers.startsWith(PartialHashSegmentGenerateTask.TYPE));
+    MatcherAssert.assertThat(id, Matchers.startsWith(PartialHashSegmentGenerateTask.TYPE));
   }
 
   @Test

indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/RangePartitionMultiPhaseParallelIndexingTest.java

@@ -43,6 +43,7 @@
 import org.apache.druid.timeline.partition.DimensionRangeShardSpec;
 import org.apache.druid.timeline.partition.NumberedShardSpec;
 import org.apache.druid.timeline.partition.SingleDimensionShardSpec;
+import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.joda.time.Interval;
 import org.junit.Assert;
@@ -455,14 +456,14 @@
 
     for (StringTuple value : values) {
       if (start != null) {
-        Assert.assertThat(value.compareTo(start), Matchers.greaterThanOrEqualTo(0));
+        MatcherAssert.assertThat(value.compareTo(start), Matchers.greaterThanOrEqualTo(0));
       }
 
       if (end != null) {
         if (value == null) {
           Assert.assertNull("null values should be in first partition", start);
         } else {
-          Assert.assertThat(value.compareTo(end), Matchers.lessThan(0));
+          MatcherAssert.assertThat(value.compareTo(end), Matchers.lessThan(0));
         }
       }
     }