diff --git a/pom.xml b/pom.xml index cab560cac..16f3c3070 100644 --- a/pom.xml +++ b/pom.xml @@ -23,8 +23,8 @@ spring-cloud-stream-binder-kafka-docs spring-cloud-stream-binder-kafka-0.9-test spring-cloud-stream-binder-kafka-0.10.0-test + spring-cloud-stream-binder-kafka-0.10.1-test spring-cloud-stream-binder-kafka-core - spring-cloud-stream-binder-kafka-test-support diff --git a/spring-cloud-stream-binder-kafka-0.10.0-test/pom.xml b/spring-cloud-stream-binder-kafka-0.10.0-test/pom.xml index 6a90c95c6..0205a8f48 100644 --- a/spring-cloud-stream-binder-kafka-0.10.0-test/pom.xml +++ b/spring-cloud-stream-binder-kafka-0.10.0-test/pom.xml @@ -16,7 +16,7 @@ ${basedir}/../.. 0.10.0.1 @@ -73,6 +73,13 @@ test-jar test + + org.springframework.cloud + spring-cloud-stream-binder-kafka-0.10.1-test + ${project.version} + test-jar + test + org.springframework.cloud spring-cloud-stream-binder-test diff --git a/spring-cloud-stream-binder-kafka-0.10.0-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka_0_10_0_BinderTests.java b/spring-cloud-stream-binder-kafka-0.10.0-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka_0_10_0_BinderTests.java index 34ad2c233..25fb65279 100644 --- a/spring-cloud-stream-binder-kafka-0.10.0-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka_0_10_0_BinderTests.java +++ b/spring-cloud-stream-binder-kafka-0.10.0-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka_0_10_0_BinderTests.java @@ -23,6 +23,6 @@ package org.springframework.cloud.stream.binder.kafka; * * @author Soby Chacko */ -public class Kafka_0_10_0_BinderTests extends Kafka10BinderTests { +public class Kafka_0_10_0_BinderTests extends Kafka_0_10_1_BinderTests { } diff --git a/spring-cloud-stream-binder-kafka-0.10.1-test/pom.xml b/spring-cloud-stream-binder-kafka-0.10.1-test/pom.xml new file mode 100644 index 000000000..987265e7d --- /dev/null +++ b/spring-cloud-stream-binder-kafka-0.10.1-test/pom.xml @@ -0,0 +1,121 @@ + + + 4.0.0 + + org.springframework.cloud + spring-cloud-stream-binder-kafka-parent + 1.3.0.BUILD-SNAPSHOT + + spring-cloud-stream-binder-kafka-0.10.1-test + Spring Cloud Stream Kafka Binder 0.10.1 Tests + http://projects.spring.io/spring-cloud + + Pivotal Software, Inc. + http://www.spring.io + + + ${basedir}/../.. + 0.10.1.1 + 1.1.2.RELEASE + 2.1.0.RELEASE + + + + + org.springframework.cloud + spring-cloud-stream-binder-kafka-core + ${project.version} + + + org.springframework.cloud + spring-cloud-stream-binder-kafka + ${project.version} + test + + + org.springframework.kafka + spring-kafka + test + + + org.apache.kafka + kafka_2.11 + test + + + org.slf4j + slf4j-log4j12 + + + + + org.apache.kafka + kafka-clients + test + + + org.springframework.kafka + spring-kafka-test + test + + + org.springframework.integration + spring-integration-kafka + + + org.springframework.cloud + spring-cloud-stream-binder-kafka + ${project.version} + test-jar + test + + + org.springframework.cloud + spring-cloud-stream-binder-test + test + + + org.springframework.cloud + spring-cloud-stream-schema + ${spring-cloud-stream.version} + test + + + io.confluent + kafka-avro-serializer + 3.1.2 + test + + + io.confluent + kafka-schema-registry + 3.1.2 + test + + + + + + confluent + http://packages.confluent.io/maven/ + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.0.2 + + + + test-jar + + + + + + + + diff --git a/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka10TestBinder.java b/spring-cloud-stream-binder-kafka-0.10.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka10TestBinder.java similarity index 97% rename from spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka10TestBinder.java rename to spring-cloud-stream-binder-kafka-0.10.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka10TestBinder.java index 0f4212570..7a8c250c2 100644 --- a/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka10TestBinder.java +++ b/spring-cloud-stream-binder-kafka-0.10.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka10TestBinder.java @@ -43,7 +43,7 @@ public class Kafka10TestBinder extends AbstractKafkaTestBinder { KafkaMessageChannelBinder binder = new KafkaMessageChannelBinder(binderConfiguration, provisioningProvider); - binder.setCodec(getCodec()); + binder.setCodec(AbstractKafkaTestBinder.getCodec()); ProducerListener producerListener = new LoggingProducerListener(); binder.setProducerListener(producerListener); GenericApplicationContext context = new GenericApplicationContext(); diff --git a/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka10BinderTests.java b/spring-cloud-stream-binder-kafka-0.10.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka_0_10_1_BinderTests.java similarity index 97% rename from spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka10BinderTests.java rename to spring-cloud-stream-binder-kafka-0.10.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka_0_10_1_BinderTests.java index f45c8b7a4..9746ca3cc 100644 --- a/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka10BinderTests.java +++ b/spring-cloud-stream-binder-kafka-0.10.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka_0_10_1_BinderTests.java @@ -58,8 +58,6 @@ import org.springframework.messaging.MessageChannel; import org.springframework.messaging.SubscribableChannel; import org.springframework.messaging.support.MessageBuilder; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.fail; import static org.junit.Assert.assertTrue; /** @@ -70,7 +68,7 @@ import static org.junit.Assert.assertTrue; * @author Mark Fisher * @author Ilayaperumal Gopinathan */ -public class Kafka10BinderTests extends KafkaBinderTests { +public class Kafka_0_10_1_BinderTests extends KafkaBinderTests { private final String CLASS_UNDER_TEST_NAME = KafkaMessageChannelBinder.class.getSimpleName(); @@ -201,7 +199,7 @@ public class Kafka10BinderTests extends KafkaBinderTests { break; } else if (System.currentTimeMillis() > endTime) { - fail("Kafka Schema Registry Server failed to start"); + Assertions.fail("Kafka Schema Registry Server failed to start"); } } User1 firstOutboundFoo = new User1(); @@ -230,7 +228,7 @@ public class Kafka10BinderTests extends KafkaBinderTests { binderBindUnbindLatency(); moduleOutputChannel.send(message); Message inbound = receive(moduleInputChannel); - assertThat(inbound).isNotNull(); + Assertions.assertThat(inbound).isNotNull(); assertTrue(message.getPayload() instanceof User1); User1 receivedUser = (User1) message.getPayload(); Assertions.assertThat(receivedUser.getName()).isEqualTo(userName1); diff --git a/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/User1.java b/spring-cloud-stream-binder-kafka-0.10.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/User1.java similarity index 100% rename from spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/User1.java rename to spring-cloud-stream-binder-kafka-0.10.1-test/src/test/java/org/springframework/cloud/stream/binder/kafka/User1.java diff --git a/spring-cloud-stream-binder-kafka-0.9-test/pom.xml b/spring-cloud-stream-binder-kafka-0.9-test/pom.xml index 6311704c4..0995694dc 100644 --- a/spring-cloud-stream-binder-kafka-0.9-test/pom.xml +++ b/spring-cloud-stream-binder-kafka-0.9-test/pom.xml @@ -6,7 +6,7 @@ spring-cloud-stream-binder-kafka-parent 1.3.0.BUILD-SNAPSHOT - spring-cloud-stream-binder-kafka-0.9 + spring-cloud-stream-binder-kafka-0.9-test Spring Cloud Stream Kafka Binder 0.9 Tests http://projects.spring.io/spring-cloud diff --git a/spring-cloud-stream-binder-kafka-test-support/pom.xml b/spring-cloud-stream-binder-kafka-test-support/pom.xml deleted file mode 100644 index a65ee3681..000000000 --- a/spring-cloud-stream-binder-kafka-test-support/pom.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - 4.0.0 - - org.springframework.cloud - spring-cloud-stream-binder-kafka-parent - 1.3.0.BUILD-SNAPSHOT - - spring-cloud-stream-binder-kafka-test-support - Kafka related test classes - - - - junit - junit - compile - - - org.springframework.kafka - spring-kafka-test - ${spring-kafka.version} - compile - - - diff --git a/spring-cloud-stream-binder-kafka/pom.xml b/spring-cloud-stream-binder-kafka/pom.xml index 2b7d6e360..6e21b9562 100644 --- a/spring-cloud-stream-binder-kafka/pom.xml +++ b/spring-cloud-stream-binder-kafka/pom.xml @@ -83,31 +83,12 @@ org.springframework.cloud - spring-cloud-stream-schema - ${spring-cloud-stream.version} - test - - - io.confluent - kafka-avro-serializer - 3.1.2 - test - - - io.confluent - kafka-schema-registry - 3.1.2 + spring-cloud-stream-binder-kafka-test-support + 1.3.0.BUILD-SNAPSHOT test - - - confluent - http://packages.confluent.io/maven/ - - -