This is an automated email from the ASF dual-hosted git repository. xvrl pushed a commit to branch kafka-3.1 in repository https://gitbox.apache.org/repos/asf/druid.git
commit 18ea96133bfc2a493d476ce86fa4e4c5b5c3c638 Author: Xavier Léauté <[email protected]> AuthorDate: Fri Jan 28 09:27:06 2022 -0800 remove need for powermock in KafkaLookupExtractorFactoryTest --- extensions-core/kafka-extraction-namespace/pom.xml | 15 ----- .../lookup/KafkaLookupExtractorFactoryTest.java | 69 ++++------------------ .../cache/MockNamespaceExtractionCacheManager.java | 40 +++++++++++++ 3 files changed, 51 insertions(+), 73 deletions(-) diff --git a/extensions-core/kafka-extraction-namespace/pom.xml b/extensions-core/kafka-extraction-namespace/pom.xml index 7205b04..fbbce98 100644 --- a/extensions-core/kafka-extraction-namespace/pom.xml +++ b/extensions-core/kafka-extraction-namespace/pom.xml @@ -159,21 +159,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-easymock</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.scala-lang</groupId> <artifactId>scala-library</artifactId> <version>2.13.3</version> diff --git a/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java index 8b0a7f1..75dba4d 100644 --- a/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java +++ b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/query/lookup/KafkaLookupExtractorFactoryTest.java @@ -28,7 +28,7 @@ import com.google.common.collect.Sets; import com.google.common.primitives.Bytes; import org.apache.druid.jackson.DefaultObjectMapper; import org.apache.druid.java.util.common.IAE; -import org.apache.druid.server.lookup.namespace.cache.CacheHandler; +import org.apache.druid.server.lookup.namespace.cache.MockNamespaceExtractionCacheManager; import org.apache.druid.server.lookup.namespace.cache.NamespaceExtractionCacheManager; import org.apache.kafka.clients.consumer.Consumer; import org.apache.kafka.clients.consumer.MockConsumer; @@ -37,33 +37,13 @@ import org.easymock.EasyMock; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.api.easymock.PowerMock; -import org.powermock.core.classloader.annotations.PowerMockIgnore; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicLong; -@RunWith(PowerMockRunner.class) -@PrepareForTest({ - NamespaceExtractionCacheManager.class, - CacheHandler.class -}) -@PowerMockIgnore({ - "javax.management.*", - "javax.net.ssl.*", - "org.apache.logging.*", - "org.slf4j.*", - "com.sun.*", - "javax.script.*", - "jdk.*" -}) public class KafkaLookupExtractorFactoryTest { private static final String TOPIC = "some_topic"; @@ -71,9 +51,7 @@ public class KafkaLookupExtractorFactoryTest "some.property", "some.value" ); private final ObjectMapper mapper = new DefaultObjectMapper(); - private final NamespaceExtractionCacheManager cacheManager = PowerMock.createStrictMock( - NamespaceExtractionCacheManager.class); - private final CacheHandler cacheHandler = PowerMock.createStrictMock(CacheHandler.class); + private final NamespaceExtractionCacheManager cacheManager = MockNamespaceExtractionCacheManager.createMockNamespaceExtractionCacheManager(); @Before public void setUp() @@ -268,14 +246,7 @@ public class KafkaLookupExtractorFactoryTest public void testStartStop() { Consumer<String, String> kafkaConsumer = new MockConsumer<>(OffsetResetStrategy.EARLIEST); - EasyMock.expect(cacheManager.createCache()) - .andReturn(cacheHandler) - .once(); - EasyMock.expect(cacheHandler.getCache()).andReturn(new ConcurrentHashMap<>()).once(); - cacheHandler.close(); - EasyMock.expectLastCall(); - - PowerMock.replay(cacheManager, cacheHandler); + EasyMock.replay(cacheManager); final KafkaLookupExtractorFactory factory = new KafkaLookupExtractorFactory( cacheManager, @@ -295,20 +266,14 @@ public class KafkaLookupExtractorFactoryTest Assert.assertTrue(factory.start()); Assert.assertTrue(factory.close()); Assert.assertTrue(factory.getFuture().isDone()); - PowerMock.verify(cacheManager, cacheHandler); + EasyMock.verify(cacheManager); } @Test public void testStartFailsFromTimeout() { - EasyMock.expect(cacheManager.createCache()) - .andReturn(cacheHandler) - .once(); - EasyMock.expect(cacheHandler.getCache()).andReturn(new ConcurrentHashMap<>()).once(); - cacheHandler.close(); - EasyMock.expectLastCall(); - PowerMock.replay(cacheManager, cacheHandler); + EasyMock.replay(cacheManager); final KafkaLookupExtractorFactory factory = new KafkaLookupExtractorFactory( cacheManager, TOPIC, @@ -333,20 +298,14 @@ public class KafkaLookupExtractorFactoryTest Assert.assertFalse(factory.start()); Assert.assertTrue(factory.getFuture().isDone()); Assert.assertTrue(factory.getFuture().isCancelled()); - PowerMock.verify(cacheManager, cacheHandler); + EasyMock.verify(cacheManager); } @Test public void testStartStopStart() { Consumer<String, String> kafkaConsumer = new MockConsumer<>(OffsetResetStrategy.EARLIEST); - EasyMock.expect(cacheManager.createCache()) - .andReturn(cacheHandler) - .once(); - EasyMock.expect(cacheHandler.getCache()).andReturn(new ConcurrentHashMap<>()).once(); - cacheHandler.close(); - EasyMock.expectLastCall().once(); - PowerMock.replay(cacheManager, cacheHandler); + EasyMock.replay(cacheManager); final KafkaLookupExtractorFactory factory = new KafkaLookupExtractorFactory( cacheManager, TOPIC, @@ -362,20 +321,14 @@ public class KafkaLookupExtractorFactoryTest Assert.assertTrue(factory.start()); Assert.assertTrue(factory.close()); Assert.assertFalse(factory.start()); - PowerMock.verify(cacheManager, cacheHandler); + EasyMock.verify(cacheManager); } @Test public void testStartStartStopStop() { Consumer<String, String> kafkaConsumer = new MockConsumer<>(OffsetResetStrategy.EARLIEST); - EasyMock.expect(cacheManager.createCache()) - .andReturn(cacheHandler) - .once(); - EasyMock.expect(cacheHandler.getCache()).andReturn(new ConcurrentHashMap<>()).once(); - cacheHandler.close(); - EasyMock.expectLastCall().once(); - PowerMock.replay(cacheManager, cacheHandler); + EasyMock.replay(cacheManager); final KafkaLookupExtractorFactory factory = new KafkaLookupExtractorFactory( cacheManager, TOPIC, @@ -394,7 +347,7 @@ public class KafkaLookupExtractorFactoryTest Assert.assertTrue(factory.start()); Assert.assertTrue(factory.close()); Assert.assertTrue(factory.close()); - PowerMock.verify(cacheManager, cacheHandler); + EasyMock.verify(cacheManager); } @Test @@ -458,7 +411,7 @@ public class KafkaLookupExtractorFactoryTest @Test public void testSerDe() throws Exception { - final NamespaceExtractionCacheManager cacheManager = PowerMock.createStrictMock(NamespaceExtractionCacheManager.class); + final NamespaceExtractionCacheManager cacheManager = EasyMock.createStrictMock(NamespaceExtractionCacheManager.class); final String kafkaTopic = "some_topic"; final Map<String, String> kafkaProperties = ImmutableMap.of("some_key", "some_value"); final long connectTimeout = 999; diff --git a/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/server/lookup/namespace/cache/MockNamespaceExtractionCacheManager.java b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/server/lookup/namespace/cache/MockNamespaceExtractionCacheManager.java new file mode 100644 index 0000000..a41a801 --- /dev/null +++ b/extensions-core/kafka-extraction-namespace/src/test/java/org/apache/druid/server/lookup/namespace/cache/MockNamespaceExtractionCacheManager.java @@ -0,0 +1,40 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.druid.server.lookup.namespace.cache; + +import org.easymock.EasyMock; + +import java.util.concurrent.ConcurrentHashMap; + +public class MockNamespaceExtractionCacheManager +{ + public static NamespaceExtractionCacheManager createMockNamespaceExtractionCacheManager() { + final NamespaceExtractionCacheManager cacheManager = EasyMock.createStrictMock(NamespaceExtractionCacheManager.class); + final CacheHandler cacheHandler = new CacheHandler(cacheManager, new ConcurrentHashMap<>(), "cache1"); + + EasyMock.expect(cacheManager.createCache()) + .andReturn(cacheHandler) + .once(); + + cacheManager.disposeCache(cacheHandler); + EasyMock.expectLastCall().once(); + return cacheManager; + } +} --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
