You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by xv...@apache.org on 2022/02/27 01:23:43 UTC
[druid] branch master updated: Reduce use of mocking and simplify some tests (#12283)
This is an automated email from the ASF dual-hosted git repository.
xvrl 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 4c61878 Reduce use of mocking and simplify some tests (#12283)
4c61878 is described below
commit 4c61878f9c16ca3ec9b55814dd974d71ef00fead
Author: Xavier Léauté <xv...@apache.org>
AuthorDate: Sat Feb 26 17:23:09 2022 -0800
Reduce use of mocking and simplify some tests (#12283)
* remove use of mocks for ServiceMetricEvent
* simplify KafkaEmitterTests by moving to Mockito
* speed up KafkaEmitterTest by adjusting reporting frequency in tests
* remove unnecessary easymock and JUnitParams dependencies
---
extensions-contrib/ambari-metrics-emitter/pom.xml | 5 ---
...ListBasedDruidToTimelineEventConverterTest.java | 24 +++---------
extensions-contrib/distinctcount/pom.xml | 5 ---
extensions-contrib/dropwizard-emitter/pom.xml | 5 ---
extensions-contrib/graphite-emitter/pom.xml | 5 ---
.../graphite/WhiteListBasedConverterTest.java | 30 +++++----------
extensions-contrib/influxdb-emitter/pom.xml | 10 -----
extensions-contrib/kafka-emitter/pom.xml | 9 +----
.../apache/druid/emitter/kafka/KafkaEmitter.java | 15 +++++---
.../druid/emitter/kafka/KafkaEmitterTest.java | 44 +++++++---------------
extensions-contrib/momentsketch/pom.xml | 7 +---
extensions-contrib/opentelemetry-emitter/pom.xml | 5 ---
extensions-contrib/prometheus-emitter/pom.xml | 5 ---
extensions-contrib/statsd-emitter/pom.xml | 5 ---
extensions-contrib/virtual-columns/pom.xml | 5 ---
extensions-core/druid-kerberos/pom.xml | 5 ---
extensions-core/druid-ranger-security/pom.xml | 5 ---
extensions-core/stats/pom.xml | 5 ---
extensions-core/testing-tools/pom.xml | 11 +++---
integration-tests/pom.xml | 5 ---
20 files changed, 47 insertions(+), 163 deletions(-)
diff --git a/extensions-contrib/ambari-metrics-emitter/pom.xml b/extensions-contrib/ambari-metrics-emitter/pom.xml
index 477bc70..081fd25 100644
--- a/extensions-contrib/ambari-metrics-emitter/pom.xml
+++ b/extensions-contrib/ambari-metrics-emitter/pom.xml
@@ -121,11 +121,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>pl.pragmatists</groupId>
<artifactId>JUnitParams</artifactId>
<scope>test</scope>
diff --git a/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverterTest.java b/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverterTest.java
index d5ec921..094f9f2 100644
--- a/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverterTest.java
+++ b/extensions-contrib/ambari-metrics-emitter/src/test/java/org/apache/druid/emitter/ambari/metrics/WhiteListBasedDruidToTimelineEventConverterTest.java
@@ -27,10 +27,8 @@ import org.apache.druid.jackson.DefaultObjectMapper;
import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.java.util.emitter.service.ServiceMetricEvent;
import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
-import org.easymock.EasyMock;
import org.joda.time.DateTime;
import org.junit.Assert;
-import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -38,7 +36,6 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.util.HashMap;
@RunWith(JUnitParamsRunner.class)
@@ -47,24 +44,11 @@ public class WhiteListBasedDruidToTimelineEventConverterTest
private final String prefix = "druid";
private final WhiteListBasedDruidToTimelineEventConverter defaultWhiteListBasedDruidToTimelineEventConverter =
new WhiteListBasedDruidToTimelineEventConverter(prefix, "druid", null, new DefaultObjectMapper());
- private ServiceMetricEvent event;
private final DateTime createdTime = DateTimes.nowUtc();
private final String hostname = "testHost:8080";
private final String serviceName = "historical";
private final String defaultNamespace = prefix + "." + serviceName;
- @Before
- public void setUp()
- {
- event = EasyMock.createMock(ServiceMetricEvent.class);
- EasyMock.expect(event.getHost()).andReturn(hostname).anyTimes();
- EasyMock.expect(event.getService()).andReturn(serviceName).anyTimes();
- EasyMock.expect(event.getCreatedTime()).andReturn(createdTime).anyTimes();
- EasyMock.expect(event.getUserDims()).andReturn(new HashMap<>()).anyTimes();
- EasyMock.expect(event.getValue()).andReturn(10).anyTimes();
- EasyMock.expect(event.getFeed()).andReturn("metrics").anyTimes();
- }
-
@Test
@Parameters(
{
@@ -90,8 +74,12 @@ public class WhiteListBasedDruidToTimelineEventConverterTest
)
public void testDefaultIsInWhiteList(String key, boolean expectedValue)
{
- EasyMock.expect(event.getMetric()).andReturn(key).anyTimes();
- EasyMock.replay(event);
+ ServiceMetricEvent event = ServiceMetricEvent
+ .builder()
+ .setFeed("metrics")
+ .build(createdTime, key, 10)
+ .build(serviceName, hostname);
+
boolean isIn = defaultWhiteListBasedDruidToTimelineEventConverter.druidEventToTimelineMetric(event) != null;
Assert.assertEquals(expectedValue, isIn);
}
diff --git a/extensions-contrib/distinctcount/pom.xml b/extensions-contrib/distinctcount/pom.xml
index 3f9cead..e622937 100644
--- a/extensions-contrib/distinctcount/pom.xml
+++ b/extensions-contrib/distinctcount/pom.xml
@@ -108,11 +108,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<scope>test</scope>
diff --git a/extensions-contrib/dropwizard-emitter/pom.xml b/extensions-contrib/dropwizard-emitter/pom.xml
index 1fce337..5609b1e 100644
--- a/extensions-contrib/dropwizard-emitter/pom.xml
+++ b/extensions-contrib/dropwizard-emitter/pom.xml
@@ -74,11 +74,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>pl.pragmatists</groupId>
- <artifactId>JUnitParams</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.druid</groupId>
<artifactId>druid-processing</artifactId>
<version>${project.parent.version}</version>
diff --git a/extensions-contrib/graphite-emitter/pom.xml b/extensions-contrib/graphite-emitter/pom.xml
index 5d9bfbe..361c84e 100644
--- a/extensions-contrib/graphite-emitter/pom.xml
+++ b/extensions-contrib/graphite-emitter/pom.xml
@@ -104,11 +104,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>pl.pragmatists</groupId>
<artifactId>JUnitParams</artifactId>
<scope>test</scope>
diff --git a/extensions-contrib/graphite-emitter/src/test/java/org/apache/druid/emitter/graphite/WhiteListBasedConverterTest.java b/extensions-contrib/graphite-emitter/src/test/java/org/apache/druid/emitter/graphite/WhiteListBasedConverterTest.java
index 9098acc..cce8b45 100644
--- a/extensions-contrib/graphite-emitter/src/test/java/org/apache/druid/emitter/graphite/WhiteListBasedConverterTest.java
+++ b/extensions-contrib/graphite-emitter/src/test/java/org/apache/druid/emitter/graphite/WhiteListBasedConverterTest.java
@@ -26,10 +26,8 @@ import org.apache.druid.annotations.UsedByJUnitParamsRunner;
import org.apache.druid.jackson.DefaultObjectMapper;
import org.apache.druid.java.util.common.DateTimes;
import org.apache.druid.java.util.emitter.service.ServiceMetricEvent;
-import org.easymock.EasyMock;
import org.joda.time.DateTime;
import org.junit.Assert;
-import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,7 +35,6 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.util.HashMap;
@RunWith(JUnitParamsRunner.class)
@@ -52,22 +49,10 @@ public class WhiteListBasedConverterTest
null,
new DefaultObjectMapper()
);
- private ServiceMetricEvent event;
- private DateTime createdTime = DateTimes.nowUtc();
- private String hostname = "testHost.yahoo.com:8080";
- private String serviceName = "historical";
- private String defaultNamespace = prefix + "." + serviceName + "." + GraphiteEmitter.sanitize(hostname);
-
- @Before
- public void setUp()
- {
- event = EasyMock.createMock(ServiceMetricEvent.class);
- EasyMock.expect(event.getHost()).andReturn(hostname).anyTimes();
- EasyMock.expect(event.getService()).andReturn(serviceName).anyTimes();
- EasyMock.expect(event.getCreatedTime()).andReturn(createdTime).anyTimes();
- EasyMock.expect(event.getUserDims()).andReturn(new HashMap<>()).anyTimes();
- EasyMock.expect(event.getValue()).andReturn(10).anyTimes();
- }
+ private final DateTime createdTime = DateTimes.nowUtc();
+ private final String hostname = "testHost.yahoo.com:8080";
+ private final String serviceName = "historical";
+ private final String defaultNamespace = prefix + "." + serviceName + "." + GraphiteEmitter.sanitize(hostname);
@Test
@Parameters(
@@ -94,8 +79,11 @@ public class WhiteListBasedConverterTest
)
public void testDefaultIsInWhiteList(String key, boolean expectedValue)
{
- EasyMock.expect(event.getMetric()).andReturn(key).anyTimes();
- EasyMock.replay(event);
+ ServiceMetricEvent event = ServiceMetricEvent
+ .builder()
+ .build(createdTime, key, 10)
+ .build(serviceName, hostname);
+
boolean isIn = defaultWhiteListBasedConverter.druidEventToGraphite(event) != null;
Assert.assertEquals(expectedValue, isIn);
}
diff --git a/extensions-contrib/influxdb-emitter/pom.xml b/extensions-contrib/influxdb-emitter/pom.xml
index c51e23a..b2ab4bd 100644
--- a/extensions-contrib/influxdb-emitter/pom.xml
+++ b/extensions-contrib/influxdb-emitter/pom.xml
@@ -82,16 +82,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>pl.pragmatists</groupId>
- <artifactId>JUnitParams</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<scope>test</scope>
diff --git a/extensions-contrib/kafka-emitter/pom.xml b/extensions-contrib/kafka-emitter/pom.xml
index 34442a7..8524b7b 100644
--- a/extensions-contrib/kafka-emitter/pom.xml
+++ b/extensions-contrib/kafka-emitter/pom.xml
@@ -88,13 +88,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>pl.pragmatists</groupId>
- <artifactId>JUnitParams</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/extensions-contrib/kafka-emitter/src/main/java/org/apache/druid/emitter/kafka/KafkaEmitter.java b/extensions-contrib/kafka-emitter/src/main/java/org/apache/druid/emitter/kafka/KafkaEmitter.java
index 09b8031..cdab2a7 100644
--- a/extensions-contrib/kafka-emitter/src/main/java/org/apache/druid/emitter/kafka/KafkaEmitter.java
+++ b/extensions-contrib/kafka-emitter/src/main/java/org/apache/druid/emitter/kafka/KafkaEmitter.java
@@ -50,6 +50,8 @@ public class KafkaEmitter implements Emitter
{
private static Logger log = new Logger(KafkaEmitter.class);
+ private static final int DEFAULT_SEND_INTERVAL_SECONDS = 10;
+ private static final int DEFAULT_SEND_LOST_INTERVAL_MINUTES = 5;
private static final int DEFAULT_RETRIES = 3;
private final AtomicLong metricLost;
private final AtomicLong alertLost;
@@ -64,6 +66,8 @@ public class KafkaEmitter implements Emitter
private final MemoryBoundLinkedBlockingQueue<String> requestQueue;
private final ScheduledExecutorService scheduler;
+ protected int sendInterval = DEFAULT_SEND_INTERVAL_SECONDS;
+
public KafkaEmitter(KafkaEmitterConfig config, ObjectMapper jsonMapper)
{
this.config = config;
@@ -116,16 +120,16 @@ public class KafkaEmitter implements Emitter
@Override
public void start()
{
- scheduler.schedule(this::sendMetricToKafka, 10, TimeUnit.SECONDS);
- scheduler.schedule(this::sendAlertToKafka, 10, TimeUnit.SECONDS);
+ scheduler.schedule(this::sendMetricToKafka, sendInterval, TimeUnit.SECONDS);
+ scheduler.schedule(this::sendAlertToKafka, sendInterval, TimeUnit.SECONDS);
if (config.getRequestTopic() != null) {
- scheduler.schedule(this::sendRequestToKafka, 10, TimeUnit.SECONDS);
+ scheduler.schedule(this::sendRequestToKafka, sendInterval, TimeUnit.SECONDS);
}
scheduler.scheduleWithFixedDelay(() -> {
log.info("Message lost counter: metricLost=[%d], alertLost=[%d], requestLost=[%d], invalidLost=[%d]",
metricLost.get(), alertLost.get(), requestLost.get(), invalidLost.get()
);
- }, 5, 5, TimeUnit.MINUTES);
+ }, DEFAULT_SEND_LOST_INTERVAL_MINUTES, DEFAULT_SEND_LOST_INTERVAL_MINUTES, TimeUnit.MINUTES);
log.info("Starting Kafka Emitter.");
}
@@ -144,8 +148,7 @@ public class KafkaEmitter implements Emitter
sendToKafka(config.getRequestTopic(), requestQueue, setProducerCallback(requestLost));
}
- @VisibleForTesting
- protected void sendToKafka(final String topic, MemoryBoundLinkedBlockingQueue<String> recordQueue, Callback callback)
+ private void sendToKafka(final String topic, MemoryBoundLinkedBlockingQueue<String> recordQueue, Callback callback)
{
ObjectContainer<String> objectToSend;
try {
diff --git a/extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterTest.java b/extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterTest.java
index 26d9701..422d18a 100644
--- a/extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterTest.java
+++ b/extensions-contrib/kafka-emitter/src/test/java/org/apache/druid/emitter/kafka/KafkaEmitterTest.java
@@ -30,10 +30,8 @@ import org.apache.druid.server.QueryStats;
import org.apache.druid.server.RequestLogLine;
import org.apache.druid.server.log.DefaultRequestLogEventBuilderFactory;
import org.apache.druid.server.log.RequestLogEvent;
-import org.apache.kafka.clients.producer.Callback;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.clients.producer.Producer;
-import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -42,6 +40,10 @@ import org.junit.runners.Parameterized;
import java.util.List;
import java.util.concurrent.CountDownLatch;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
@RunWith(Parameterized.class)
public class KafkaEmitterTest
{
@@ -57,8 +59,8 @@ public class KafkaEmitterTest
};
}
- // there is 10 seconds wait in kafka emitter before it starts sending events to broker, so set a timeout for 15 seconds
- @Test(timeout = 15_000)
+ // there is 1 seconds wait in kafka emitter before it starts sending events to broker, set a timeout for 5 seconds
+ @Test(timeout = 5_000)
public void testKafkaEmitter() throws InterruptedException
{
final List<ServiceMetricEvent> serviceMetricEvents = ImmutableList.of(
@@ -80,7 +82,7 @@ public class KafkaEmitterTest
final CountDownLatch countDownSentEvents = new CountDownLatch(
requestTopic == null ? totalEventsExcludingRequestLogEvents : totalEvents);
- final KafkaProducer<String, String> producer = EasyMock.createStrictMock(KafkaProducer.class);
+ final KafkaProducer<String, String> producer = mock(KafkaProducer.class);
final KafkaEmitter kafkaEmitter = new KafkaEmitter(
new KafkaEmitterConfig("", "metrics", "alerts", requestTopic, "test-cluster", null),
new ObjectMapper()
@@ -89,22 +91,17 @@ public class KafkaEmitterTest
@Override
protected Producer<String, String> setKafkaProducer()
{
+ // override send interval to 1 second
+ sendInterval = 1;
return producer;
}
-
- @Override
- protected void sendToKafka(final String topic, MemoryBoundLinkedBlockingQueue<String> recordQueue,
- Callback callback
- )
- {
- countDownSentEvents.countDown();
- super.sendToKafka(topic, recordQueue, callback);
- }
};
- EasyMock.expect(producer.send(EasyMock.anyObject(), EasyMock.anyObject())).andReturn(null)
- .times(requestTopic == null ? totalEventsExcludingRequestLogEvents : totalEvents);
- EasyMock.replay(producer);
+ when(producer.send(any(), any())).then((invocation) -> {
+ countDownSentEvents.countDown();
+ return null;
+ });
+
kafkaEmitter.start();
for (Event event : serviceMetricEvents) {
@@ -122,18 +119,5 @@ public class KafkaEmitterTest
Assert.assertEquals(0, kafkaEmitter.getAlertLostCount());
Assert.assertEquals(requestTopic == null ? requestLogEvents.size() : 0, kafkaEmitter.getRequestLostCount());
Assert.assertEquals(0, kafkaEmitter.getInvalidLostCount());
-
- while (true) {
- try {
- EasyMock.verify(producer);
- break;
- }
- catch (Throwable e) {
- // although the latch may have count down, producer.send may not have been called yet in KafkaEmitter
- // so wait for sometime before verifying the mock
- Thread.sleep(100);
- // just continue
- }
- }
}
}
diff --git a/extensions-contrib/momentsketch/pom.xml b/extensions-contrib/momentsketch/pom.xml
index d3702dc..ec0e7d2 100644
--- a/extensions-contrib/momentsketch/pom.xml
+++ b/extensions-contrib/momentsketch/pom.xml
@@ -88,11 +88,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<scope>test</scope>
@@ -120,4 +115,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/extensions-contrib/opentelemetry-emitter/pom.xml b/extensions-contrib/opentelemetry-emitter/pom.xml
index cd4f59d..eb44156 100644
--- a/extensions-contrib/opentelemetry-emitter/pom.xml
+++ b/extensions-contrib/opentelemetry-emitter/pom.xml
@@ -146,11 +146,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>pl.pragmatists</groupId>
- <artifactId>JUnitParams</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
diff --git a/extensions-contrib/prometheus-emitter/pom.xml b/extensions-contrib/prometheus-emitter/pom.xml
index ca008ec..dc207b8 100644
--- a/extensions-contrib/prometheus-emitter/pom.xml
+++ b/extensions-contrib/prometheus-emitter/pom.xml
@@ -101,11 +101,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>pl.pragmatists</groupId>
- <artifactId>JUnitParams</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.druid</groupId>
<artifactId>druid-server</artifactId>
<version>${project.parent.version}</version>
diff --git a/extensions-contrib/statsd-emitter/pom.xml b/extensions-contrib/statsd-emitter/pom.xml
index 635e9f7..326c459 100644
--- a/extensions-contrib/statsd-emitter/pom.xml
+++ b/extensions-contrib/statsd-emitter/pom.xml
@@ -89,11 +89,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>pl.pragmatists</groupId>
- <artifactId>JUnitParams</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.druid</groupId>
<artifactId>druid-server</artifactId>
<version>${project.parent.version}</version>
diff --git a/extensions-contrib/virtual-columns/pom.xml b/extensions-contrib/virtual-columns/pom.xml
index 6305eaa..3c96b8e 100644
--- a/extensions-contrib/virtual-columns/pom.xml
+++ b/extensions-contrib/virtual-columns/pom.xml
@@ -84,11 +84,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.druid</groupId>
<artifactId>druid-core</artifactId>
<version>${project.parent.version}</version>
diff --git a/extensions-core/druid-kerberos/pom.xml b/extensions-core/druid-kerberos/pom.xml
index 351f1f6..b16fea0 100644
--- a/extensions-core/druid-kerberos/pom.xml
+++ b/extensions-core/druid-kerberos/pom.xml
@@ -350,11 +350,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
diff --git a/extensions-core/druid-ranger-security/pom.xml b/extensions-core/druid-ranger-security/pom.xml
index 8022c1c..8b047f7 100644
--- a/extensions-core/druid-ranger-security/pom.xml
+++ b/extensions-core/druid-ranger-security/pom.xml
@@ -161,11 +161,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.apache.druid</groupId>
<artifactId>druid-server</artifactId>
<version>${project.parent.version}</version>
diff --git a/extensions-core/stats/pom.xml b/extensions-core/stats/pom.xml
index 708e2401..e3b857c 100644
--- a/extensions-core/stats/pom.xml
+++ b/extensions-core/stats/pom.xml
@@ -137,11 +137,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>pl.pragmatists</groupId>
- <artifactId>JUnitParams</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
diff --git a/extensions-core/testing-tools/pom.xml b/extensions-core/testing-tools/pom.xml
index 521ee71..1b0410c 100644
--- a/extensions-core/testing-tools/pom.xml
+++ b/extensions-core/testing-tools/pom.xml
@@ -132,11 +132,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>nl.jqno.equalsverifier</groupId>
<artifactId>equalsverifier</artifactId>
<scope>test</scope>
@@ -144,6 +139,12 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.druid</groupId>
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index 2e58be2..22346ef 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -421,11 +421,6 @@
<artifactId>testng</artifactId>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>com.github.os72</groupId>
<artifactId>protobuf-dynamic</artifactId>
<version>0.9.3</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org