From 2e14ba99e3f7609b0db1578f1f14de5b9a917226 Mon Sep 17 00:00:00 2001 From: UltimaPhoenix Date: Wed, 13 Jun 2018 17:21:49 +0200 Subject: [PATCH] Fix unit test Remove unnecessary semicolon Replace deprecated method with the new one Test refactoring --- .../annotations/KafkaStreamsStateStore.java | 2 +- ...rPojoInputAndPrimitiveTypeOutputTests.java | 4 ++-- ...BinderAutoConfigurationPropertiesTest.java | 24 ++++++++++--------- ...afkaBinderConfigurationPropertiesTest.java | 15 ++++++------ .../bootstrap/KafkaBinderBootstrapTest.java | 3 ++- 5 files changed, 26 insertions(+), 22 deletions(-) diff --git a/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/annotations/KafkaStreamsStateStore.java b/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/annotations/KafkaStreamsStateStore.java index 96b06569b..b8997370d 100644 --- a/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/annotations/KafkaStreamsStateStore.java +++ b/spring-cloud-stream-binder-kafka-streams/src/main/java/org/springframework/cloud/stream/binder/kafka/streams/annotations/KafkaStreamsStateStore.java @@ -22,7 +22,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsStateStoreProperties;; +import org.springframework.cloud.stream.binder.kafka.streams.properties.KafkaStreamsStateStoreProperties; /** diff --git a/spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderPojoInputAndPrimitiveTypeOutputTests.java b/spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderPojoInputAndPrimitiveTypeOutputTests.java index 73f4a5eb4..1e8235021 100644 --- a/spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderPojoInputAndPrimitiveTypeOutputTests.java +++ b/spring-cloud-stream-binder-kafka-streams/src/test/java/org/springframework/cloud/stream/binder/kafka/streams/KafkaStreamsBinderPojoInputAndPrimitiveTypeOutputTests.java @@ -106,10 +106,10 @@ public class KafkaStreamsBinderPojoInputAndPrimitiveTypeOutputTests { template.sendDefault("{\"id\":\"123\"}"); ConsumerRecord cr = KafkaTestUtils.getSingleRecord(consumer, "counts-id"); - assertThat(cr.key().equals(123)); + assertThat(cr.key()).isEqualTo(123); ObjectMapper om = new ObjectMapper(); Long aLong = om.readValue(cr.value(), Long.class); - assertThat(aLong.equals(1L)); + assertThat(aLong).isEqualTo(1L); } @EnableBinding(KafkaStreamsProcessor.class) diff --git a/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderAutoConfigurationPropertiesTest.java b/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderAutoConfigurationPropertiesTest.java index 68b862f98..2fa2a9c9f 100644 --- a/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderAutoConfigurationPropertiesTest.java +++ b/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderAutoConfigurationPropertiesTest.java @@ -41,7 +41,9 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.ReflectionUtils; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; /** @@ -74,11 +76,11 @@ public class KafkaBinderAutoConfigurationPropertiesTest { Map producerConfigs = (Map) ReflectionUtils.getField(producerFactoryConfigField, producerFactory); assertTrue(producerConfigs.get("batch.size").equals(10)); - assertTrue(producerConfigs.get("key.serializer").equals(LongSerializer.class)); - assertTrue(producerConfigs.get("key.deserializer") == null); - assertTrue(producerConfigs.get("value.serializer").equals(LongSerializer.class)); - assertTrue(producerConfigs.get("value.deserializer") == null); - assertTrue(producerConfigs.get("compression.type").equals("snappy")); + assertEquals(producerConfigs.get("key.serializer"), LongSerializer.class); + assertNull(producerConfigs.get("key.deserializer")); + assertEquals(producerConfigs.get("value.serializer"), LongSerializer.class); + assertNull(producerConfigs.get("value.deserializer")); + assertEquals("snappy", producerConfigs.get("compression.type")); List bootstrapServers = new ArrayList<>(); bootstrapServers.add("10.98.09.199:9092"); bootstrapServers.add("10.98.09.196:9092"); @@ -95,12 +97,12 @@ public class KafkaBinderAutoConfigurationPropertiesTest { ReflectionUtils.makeAccessible(consumerFactoryConfigField); Map consumerConfigs = (Map) ReflectionUtils.getField(consumerFactoryConfigField, consumerFactory); - assertTrue(consumerConfigs.get("key.deserializer").equals(LongDeserializer.class)); - assertTrue(consumerConfigs.get("key.serializer") == null); - assertTrue(consumerConfigs.get("value.deserializer").equals(LongDeserializer.class)); - assertTrue(consumerConfigs.get("value.serialized") == null); - assertTrue(consumerConfigs.get("group.id").equals("groupIdFromBootConfig")); - assertTrue(consumerConfigs.get("auto.offset.reset").equals("earliest")); + assertEquals(consumerConfigs.get("key.deserializer"), LongDeserializer.class); + assertNull(consumerConfigs.get("key.serializer")); + assertEquals(consumerConfigs.get("value.deserializer"), LongDeserializer.class); + assertNull(consumerConfigs.get("value.serialized")); + assertEquals("groupIdFromBootConfig", consumerConfigs.get("group.id")); + assertEquals("earliest", consumerConfigs.get("auto.offset.reset")); assertTrue((((List) consumerConfigs.get("bootstrap.servers")).containsAll(bootstrapServers))); } diff --git a/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderConfigurationPropertiesTest.java b/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderConfigurationPropertiesTest.java index b0c57421e..b9548e55a 100644 --- a/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderConfigurationPropertiesTest.java +++ b/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderConfigurationPropertiesTest.java @@ -41,6 +41,7 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.ReflectionUtils; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -75,11 +76,11 @@ public class KafkaBinderConfigurationPropertiesTest { ReflectionUtils.makeAccessible(producerFactoryConfigField); Map producerConfigs = (Map) ReflectionUtils.getField(producerFactoryConfigField, producerFactory); - assertTrue(producerConfigs.get("batch.size").equals("12345")); - assertTrue(producerConfigs.get("linger.ms").equals("100")); - assertTrue(producerConfigs.get("key.serializer").equals(ByteArraySerializer.class)); - assertTrue(producerConfigs.get("value.serializer").equals(ByteArraySerializer.class)); - assertTrue(producerConfigs.get("compression.type").equals("gzip")); + assertEquals("12345", producerConfigs.get("batch.size"));; + assertEquals("100", producerConfigs.get("linger.ms")); + assertEquals(producerConfigs.get("key.serializer"), ByteArraySerializer.class); + assertEquals(producerConfigs.get("value.serializer"), ByteArraySerializer.class); + assertEquals("gzip", producerConfigs.get("compression.type")); List bootstrapServers = new ArrayList<>(); bootstrapServers.add("10.98.09.199:9082"); assertTrue((((String) producerConfigs.get("bootstrap.servers")).contains("10.98.09.199:9082"))); @@ -95,8 +96,8 @@ public class KafkaBinderConfigurationPropertiesTest { ReflectionUtils.makeAccessible(consumerFactoryConfigField); Map consumerConfigs = (Map) ReflectionUtils.getField(consumerFactoryConfigField, consumerFactory); - assertTrue(consumerConfigs.get("key.deserializer").equals(ByteArrayDeserializer.class)); - assertTrue(consumerConfigs.get("value.deserializer").equals(ByteArrayDeserializer.class)); + assertEquals(consumerConfigs.get("key.deserializer"), ByteArrayDeserializer.class); + assertEquals(consumerConfigs.get("value.deserializer"), ByteArrayDeserializer.class); assertTrue((((String) consumerConfigs.get("bootstrap.servers")).contains("10.98.09.199:9082"))); } diff --git a/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/bootstrap/KafkaBinderBootstrapTest.java b/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/bootstrap/KafkaBinderBootstrapTest.java index f9d7e13c2..fbc29be4e 100644 --- a/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/bootstrap/KafkaBinderBootstrapTest.java +++ b/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/bootstrap/KafkaBinderBootstrapTest.java @@ -19,6 +19,7 @@ package org.springframework.cloud.stream.binder.kafka.bootstrap; import org.junit.ClassRule; import org.junit.Test; +import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.context.ConfigurableApplicationContext; @@ -35,7 +36,7 @@ public class KafkaBinderBootstrapTest { @Test public void testKafkaBinderConfiguration() throws Exception { ConfigurableApplicationContext applicationContext = new SpringApplicationBuilder(SimpleApplication.class) - .web(false) + .web(WebApplicationType.NONE) .run("--spring.cloud.stream.kafka.binder.brokers=" + embeddedKafka.getBrokersAsString(), "--spring.cloud.stream.kafka.binder.zkNodes=" + embeddedKafka.getZookeeperConnectionString()); applicationContext.close();