This is an automated email from the ASF dual-hosted git repository.
capistrant pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 85b35972959 Update easymock, mockito and equalsverifier to latest
(#19145)
85b35972959 is described below
commit 85b359729598805b5cee2bcfae6c2b95c8af2bc2
Author: Lucas Capistrant <[email protected]>
AuthorDate: Mon Mar 16 14:03:02 2026 -0500
Update easymock, mockito and equalsverifier to latest (#19145)
* update some testing scope dependencies
* work on getting tests inline with new extensions
* Fix a few more equalsverifier tests for new version
* fixup using import for an equalsverifier dep
---
.../druid/emitter/influxdb/InfluxdbEmitterConfigTest.java | 4 ++++
.../task/batch/parallel/distribution/StringSketchTest.java | 6 ++++++
.../druid/msq/indexing/MSQPartitionAssignmentTest.java | 13 ++++++++++---
pom.xml | 14 ++++++++++----
.../segment/filter/ArrayContainsElementFilterTests.java | 8 +++-----
.../org/apache/druid/segment/filter/RangeFilterTests.java | 2 ++
6 files changed, 35 insertions(+), 12 deletions(-)
diff --git
a/extensions-contrib/influxdb-emitter/src/test/java/org/apache/druid/emitter/influxdb/InfluxdbEmitterConfigTest.java
b/extensions-contrib/influxdb-emitter/src/test/java/org/apache/druid/emitter/influxdb/InfluxdbEmitterConfigTest.java
index d6312115a0e..0b0163e01e4 100644
---
a/extensions-contrib/influxdb-emitter/src/test/java/org/apache/druid/emitter/influxdb/InfluxdbEmitterConfigTest.java
+++
b/extensions-contrib/influxdb-emitter/src/test/java/org/apache/druid/emitter/influxdb/InfluxdbEmitterConfigTest.java
@@ -279,6 +279,10 @@ public class InfluxdbEmitterConfigTest
"hostname", "port", "protocol", "trustStoreType", "databaseName",
"maxQueueSize", "flushPeriod", "flushDelay", "influxdbUserName",
"influxdbPassword", "dimensionWhitelist"
+ ).withPrefabValues(
+ com.google.common.collect.ImmutableSet.class,
+ com.google.common.collect.ImmutableSet.of("a"),
+ com.google.common.collect.ImmutableSet.of("b")
).usingGetClass().verify();
}
diff --git
a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/distribution/StringSketchTest.java
b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/distribution/StringSketchTest.java
index 6f76d329655..c37b805c70b 100644
---
a/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/distribution/StringSketchTest.java
+++
b/indexing-service/src/test/java/org/apache/druid/indexing/common/task/batch/parallel/distribution/StringSketchTest.java
@@ -74,9 +74,15 @@ public class StringSketchTest
@Test
public void abidesEqualsContract()
{
+ ItemsSketch<StringTuple> red =
ItemsSketch.getInstance(StringTuple.class, StringSketch.SKETCH_K,
StringSketch.STRING_TUPLE_COMPARATOR);
+ red.update(StringTuple.create("a"));
+ ItemsSketch<StringTuple> blue =
ItemsSketch.getInstance(StringTuple.class, StringSketch.SKETCH_K,
StringSketch.STRING_TUPLE_COMPARATOR);
+ blue.update(StringTuple.create("b"));
+
EqualsVerifier.forClass(StringSketch.class)
.usingGetClass()
.withNonnullFields("delegate")
+ .withPrefabValues(ItemsSketch.class, red, blue)
.verify();
}
}
diff --git
a/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQPartitionAssignmentTest.java
b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQPartitionAssignmentTest.java
index e6aebd5c9e3..5cf9e517da9 100644
---
a/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQPartitionAssignmentTest.java
+++
b/multi-stage-query/src/test/java/org/apache/druid/msq/indexing/MSQPartitionAssignmentTest.java
@@ -23,13 +23,14 @@ import com.google.common.collect.ImmutableMap;
import nl.jqno.equalsverifier.EqualsVerifier;
import org.apache.druid.frame.key.ClusterByPartitions;
import org.apache.druid.segment.realtime.appenderator.SegmentIdWithShardSpec;
+import org.apache.druid.timeline.partition.NumberedShardSpec;
+import org.joda.time.Interval;
+import org.joda.time.chrono.ISOChronology;
import org.junit.Test;
import java.util.Collections;
import java.util.Map;
-import static org.easymock.EasyMock.mock;
-
public class MSQPartitionAssignmentTest
{
@@ -42,7 +43,13 @@ public class MSQPartitionAssignmentTest
@Test(expected = IllegalArgumentException.class)
public void testInvalidPartition()
{
- Map<Integer, SegmentIdWithShardSpec> allocations = ImmutableMap.of(-1,
mock(SegmentIdWithShardSpec.class));
+ SegmentIdWithShardSpec segmentId = new SegmentIdWithShardSpec(
+ "ds",
+ new Interval(0, 1, ISOChronology.getInstanceUTC()),
+ "v1",
+ new NumberedShardSpec(0, 1)
+ );
+ Map<Integer, SegmentIdWithShardSpec> allocations = ImmutableMap.of(-1,
segmentId);
new MSQPartitionAssignment(ClusterByPartitions.oneUniversalPartition(),
allocations);
}
diff --git a/pom.xml b/pom.xml
index 38edd13ff42..ea3ecc47db7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,7 +84,7 @@
<scala.library.version>2.13.14</scala.library.version>
<avatica.version>1.27.0</avatica.version>
<avro.version>1.11.5</avro.version>
- <bytebuddy.version>1.18.3</bytebuddy.version>
+ <bytebuddy.version>1.18.5</bytebuddy.version>
<!--
The base calcite parser was copied into the project; when updating
Calcite run dev/upgrade-calcite-parser to adopt upstream changes
-->
@@ -118,7 +118,7 @@
<jna-platform.version>5.18.1</jna-platform.version>
<hadoop.compile.version>3.3.6</hadoop.compile.version>
<graaljs.version>22.3.5</graaljs.version>
- <mockito.version>5.14.2</mockito.version>
+ <mockito.version>5.23.0</mockito.version>
<!-- AWS SDK v1 is still used as a transitive dependency by Hadoop and
Ranger extensions.
It should be removed once those extensions are upgraded or
dropped (see #19109). -->
<aws.sdk.v1.version>1.12.793</aws.sdk.v1.version>
@@ -1227,7 +1227,7 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>5.2.0</version>
+ <version>5.6.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -1449,9 +1449,15 @@
<dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
- <version>3.15.8</version>
+ <version>4.4.1</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.objenesis</groupId>
+ <artifactId>objenesis</artifactId>
+ <version>3.5</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>com.github.stefanbirkner</groupId>
<artifactId>system-rules</artifactId>
diff --git
a/processing/src/test/java/org/apache/druid/segment/filter/ArrayContainsElementFilterTests.java
b/processing/src/test/java/org/apache/druid/segment/filter/ArrayContainsElementFilterTests.java
index 4c459deed52..811fc646886 100644
---
a/processing/src/test/java/org/apache/druid/segment/filter/ArrayContainsElementFilterTests.java
+++
b/processing/src/test/java/org/apache/druid/segment/filter/ArrayContainsElementFilterTests.java
@@ -25,6 +25,7 @@ import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Mode;
import org.apache.druid.error.DruidException;
import org.apache.druid.guice.BuiltInTypesModule;
import org.apache.druid.jackson.DefaultObjectMapper;
@@ -1086,11 +1087,7 @@ public class ArrayContainsElementFilterTests
.withNonnullFields(
"column",
"elementMatchValueType",
- "elementMatchValueEval",
- "elementMatchValue",
- "predicateFactory",
- "optimizedFilterIncludeUnknown",
- "optimizedFilterNoIncludeUnknown"
+ "elementMatchValueEval"
)
.withPrefabValues(ColumnType.class, ColumnType.STRING,
ColumnType.DOUBLE)
.withIgnoredFields(
@@ -1099,6 +1096,7 @@ public class ArrayContainsElementFilterTests
"optimizedFilterNoIncludeUnknown",
"elementMatchValue"
)
+ .set(Mode.skipMockito())
.verify();
}
}
diff --git
a/processing/src/test/java/org/apache/druid/segment/filter/RangeFilterTests.java
b/processing/src/test/java/org/apache/druid/segment/filter/RangeFilterTests.java
index a02d3ce6e00..da3f8b31aa9 100644
---
a/processing/src/test/java/org/apache/druid/segment/filter/RangeFilterTests.java
+++
b/processing/src/test/java/org/apache/druid/segment/filter/RangeFilterTests.java
@@ -29,6 +29,7 @@ import com.google.common.collect.Range;
import com.google.common.collect.RangeSet;
import com.google.common.collect.TreeRangeSet;
import nl.jqno.equalsverifier.EqualsVerifier;
+import nl.jqno.equalsverifier.Mode;
import org.apache.druid.data.input.InputRow;
import org.apache.druid.error.DruidException;
import org.apache.druid.jackson.DefaultObjectMapper;
@@ -2061,6 +2062,7 @@ public class RangeFilterTests
)
.withPrefabValues(ColumnType.class, ColumnType.STRING,
ColumnType.DOUBLE)
.usingGetClass()
+ .set(Mode.skipMockito())
.verify();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
