From e13e1b1b1bb45cc93678a47ded1795778398ea36 Mon Sep 17 00:00:00 2001
From: Marius Bogoevici <mbogoevici@pivotal.io>
Date: Wed, 21 Sep 2016 20:32:36 -0400
Subject: [PATCH] Fix Kafka tests

As ConsumerProperties are initialized with different defaults
tests must configure them with the same logic as ChannelBindingServiceProperties.
---
 .../stream/binder/kafka/Kafka10BinderTests.java   | 12 ------------
 .../stream/binder/kafka/Kafka09BinderTests.java   | 12 ------------
 .../stream/binder/kafka/KafkaBinderTests.java     | 15 +++++++++++++--
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/spring-cloud-stream-binder-kafka-0.10-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka10BinderTests.java b/spring-cloud-stream-binder-kafka-0.10-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka10BinderTests.java
index e6b6f8299..0e6b31770 100644
--- a/spring-cloud-stream-binder-kafka-0.10-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka10BinderTests.java
+++ b/spring-cloud-stream-binder-kafka-0.10-test/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka10BinderTests.java
@@ -32,8 +32,6 @@ import org.junit.Before;
 import org.junit.ClassRule;
 
 import org.springframework.cloud.stream.binder.Binder;
-import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
-import org.springframework.cloud.stream.binder.ExtendedProducerProperties;
 import org.springframework.cloud.stream.binder.Spy;
 import org.springframework.cloud.stream.binder.kafka.admin.Kafka10AdminUtilsOperation;
 import org.springframework.cloud.stream.binder.kafka.config.KafkaBinderConfigurationProperties;
@@ -120,16 +118,6 @@ public class Kafka10BinderTests extends KafkaBinderTests {
 		return adminUtilsOperation.partitionSize(topic, zkUtils);
 	}
 
-	@Override
-	protected ExtendedConsumerProperties<KafkaConsumerProperties> createConsumerProperties() {
-		return new ExtendedConsumerProperties<>(new KafkaConsumerProperties());
-	}
-
-	@Override
-	protected ExtendedProducerProperties<KafkaProducerProperties> createProducerProperties() {
-		return new ExtendedProducerProperties<>(new KafkaProducerProperties());
-	}
-
 	@Override
 	public String getKafkaOffsetHeaderKey() {
 		return KafkaHeaders.OFFSET;
diff --git a/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka09BinderTests.java b/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka09BinderTests.java
index 25ff24e09..3252f98ba 100644
--- a/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka09BinderTests.java
+++ b/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/Kafka09BinderTests.java
@@ -32,8 +32,6 @@ import org.junit.Before;
 import org.junit.ClassRule;
 
 import org.springframework.cloud.stream.binder.Binder;
-import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
-import org.springframework.cloud.stream.binder.ExtendedProducerProperties;
 import org.springframework.cloud.stream.binder.Spy;
 import org.springframework.cloud.stream.binder.kafka.admin.Kafka09AdminUtilsOperation;
 import org.springframework.cloud.stream.binder.kafka.config.KafkaBinderConfigurationProperties;
@@ -119,16 +117,6 @@ public class Kafka09BinderTests extends KafkaBinderTests {
 		return adminUtilsOperation.partitionSize(topic, zkUtils);
 	}
 
-	@Override
-	protected ExtendedConsumerProperties<KafkaConsumerProperties> createConsumerProperties() {
-		return new ExtendedConsumerProperties<>(new KafkaConsumerProperties());
-	}
-
-	@Override
-	protected ExtendedProducerProperties<KafkaProducerProperties> createProducerProperties() {
-		return new ExtendedProducerProperties<>(new KafkaProducerProperties());
-	}
-
 	@Override
 	public String getKafkaOffsetHeaderKey() {
 		return KafkaHeaders.OFFSET;
diff --git a/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderTests.java b/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderTests.java
index b1e69e14f..f761b41ce 100644
--- a/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderTests.java
+++ b/spring-cloud-stream-binder-kafka/src/test/java/org/springframework/cloud/stream/binder/kafka/KafkaBinderTests.java
@@ -70,9 +70,20 @@ import static org.assertj.core.api.Assertions.fail;
 public abstract class KafkaBinderTests extends PartitionCapableBinderTests<AbstractKafkaTestBinder, ExtendedConsumerProperties<KafkaConsumerProperties>,
 						ExtendedProducerProperties<KafkaProducerProperties>> {
 
-	protected abstract ExtendedConsumerProperties<KafkaConsumerProperties> createConsumerProperties();
+	@Override
+	protected ExtendedConsumerProperties<KafkaConsumerProperties> createConsumerProperties() {
+		final ExtendedConsumerProperties<KafkaConsumerProperties> kafkaConsumerProperties =
+				new ExtendedConsumerProperties<>(new KafkaConsumerProperties());
+		// set the default values that would normally be propagated by Spring Cloud Stream
+		kafkaConsumerProperties.setInstanceCount(1);
+		kafkaConsumerProperties.setInstanceIndex(0);
+		return kafkaConsumerProperties;
+	}
 
-	protected abstract ExtendedProducerProperties<KafkaProducerProperties> createProducerProperties();
+	@Override
+	protected ExtendedProducerProperties<KafkaProducerProperties> createProducerProperties() {
+		return new ExtendedProducerProperties<>(new KafkaProducerProperties());
+	}
 
 	public abstract String getKafkaOffsetHeaderKey();