You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2019/08/23 07:30:56 UTC
[camel] 04/06: Avoid using mockito when possible. Removed removed
options as they were deprecated
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch CAMEL-13870
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 68aa8dbf2ed1f8952aba97efe9702ff6a642f218
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Aug 23 08:15:05 2019 +0200
Avoid using mockito when possible. Removed removed options as they were deprecated
---
.../camel/component/kafka/KafkaComponentTest.java | 45 ++++++----------------
1 file changed, 11 insertions(+), 34 deletions(-)
diff --git a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java
index ece1a3d..35f2184 100644
--- a/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java
+++ b/components/camel-kafka/src/test/java/org/apache/camel/component/kafka/KafkaComponentTest.java
@@ -20,38 +20,28 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import org.apache.camel.CamelContext;
-import org.apache.camel.TypeConverter;
import org.apache.camel.support.jsse.KeyStoreParameters;
import org.apache.camel.support.jsse.SSLContextParameters;
import org.apache.camel.support.jsse.TrustManagersParameters;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.kafka.clients.CommonClientConfigs;
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.common.config.SaslConfigs;
import org.apache.kafka.common.config.SslConfigs;
import org.junit.Test;
-import org.mockito.Mockito;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.mockito.AdditionalAnswers.returnsFirstArg;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.when;
+public class KafkaComponentTest extends CamelTestSupport {
-public class KafkaComponentTest {
-
- private CamelContext context = Mockito.mock(CamelContext.class);
- private TypeConverter tc = Mockito.mock(TypeConverter.class);
+ @Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
@Test
public void testPropertiesSet() throws Exception {
- when(context.resolvePropertyPlaceholders(anyString())).then(returnsFirstArg());
- when(context.getTypeConverter()).thenReturn(tc);
- when(tc.convertTo(boolean.class, Boolean.FALSE)).thenReturn(false);
-
String uri = "kafka:mytopic?brokers=broker1:12345,broker2:12566&partitioner=com.class.Party";
- KafkaEndpoint endpoint = (KafkaEndpoint) new KafkaComponent(context).createEndpoint(uri);
+ KafkaEndpoint endpoint = context.getEndpoint(uri, KafkaEndpoint.class);
assertEquals("broker1:12345,broker2:12566", endpoint.getConfiguration().getBrokers());
assertEquals("mytopic", endpoint.getConfiguration().getTopic());
assertEquals("com.class.Party", endpoint.getConfiguration().getPartitioner());
@@ -59,16 +49,12 @@ public class KafkaComponentTest {
@Test
public void testBrokersOnComponent() throws Exception {
- when(context.resolvePropertyPlaceholders(anyString())).then(returnsFirstArg());
- when(context.getTypeConverter()).thenReturn(tc);
- when(tc.convertTo(boolean.class, Boolean.FALSE)).thenReturn(false);
-
- KafkaComponent kafka = new KafkaComponent(context);
+ KafkaComponent kafka = context.getComponent("kafka", KafkaComponent.class);
kafka.setBrokers("broker1:12345,broker2:12566");
String uri = "kafka:mytopic?partitioner=com.class.Party";
- KafkaEndpoint endpoint = (KafkaEndpoint) kafka.createEndpoint(uri);
+ KafkaEndpoint endpoint = context.getEndpoint(uri, KafkaEndpoint.class);
assertEquals("broker1:12345,broker2:12566", endpoint.getConfiguration().getBrokers());
assertEquals("broker1:12345,broker2:12566", endpoint.getComponent().getBrokers());
assertEquals("mytopic", endpoint.getConfiguration().getTopic());
@@ -77,17 +63,12 @@ public class KafkaComponentTest {
@Test
public void testAllProducerConfigProperty() throws Exception {
- when(context.resolvePropertyPlaceholders(anyString())).then(returnsFirstArg());
- when(context.getTypeConverter()).thenReturn(tc);
- when(tc.convertTo(boolean.class, Boolean.FALSE)).thenReturn(false);
-
Map<String, Object> params = new HashMap<>();
setProducerProperty(params);
String uri = "kafka:mytopic?brokers=dev1:12345,dev2:12566";
- String remaining = "mytopic";
- KafkaEndpoint endpoint = new KafkaComponent(context).createEndpoint(uri, remaining, params);
+ KafkaEndpoint endpoint = (KafkaEndpoint) context.getComponent("kafka").createEndpoint(uri, params);
assertEquals("mytopic", endpoint.getConfiguration().getTopic());
assertEquals("1", endpoint.getConfiguration().getRequestRequiredAcks());
@@ -141,9 +122,8 @@ public class KafkaComponentTest {
Map<String, Object> params = new HashMap<>();
String uri = "kafka:mytopic?brokers=dev1:12345,dev2:12566";
- String remaining = "mytopic";
- KafkaEndpoint endpoint = new KafkaComponent(context).createEndpoint(uri, remaining, params);
+ KafkaEndpoint endpoint = (KafkaEndpoint) context.getComponent("kafka").createEndpoint(uri, params);
assertEquals(endpoint.getConfiguration().createProducerProperties().keySet(), getProducerKeys().keySet());
}
@@ -202,10 +182,7 @@ public class KafkaComponentTest {
params.put("receiveBufferBytes", 23);
params.put("requestTimeoutMs", 100);
params.put("sendBufferBytes", 765);
- params.put("timeoutMs", 2045);
- params.put("blockOnBufferFull", false);
params.put("maxInFlightRequest", 1);
- params.put("metadataFetchTimeoutMs", 9043);
params.put("metadataMaxAgeMs", 1029);
params.put("reconnectBackoffMs", 234);
params.put("reconnectBackoffMaxMs", 234);