Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17355 from garyrussell

Browse Source 
* gh-17355:
  Polish "Use @EmbeddedKafka for Integration Tests"
  Use @EmbeddedKafka for Integration Tests

Closes gh-17355
This commit is contained in:
Andy Wilkinson
2019-06-29 21:47:39 +01:00
parent 244c8f7325 9f521430fa
commit 6441cdc49d
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfigurationIntegrationTests.java
View File

@@ -21,9 +21,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.kafka.clients.admin.NewTopic;
import org.apache.kafka.clients.producer.Producer;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.util.TestPropertyValues;
@@ -33,10 +31,12 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.kafka.annotation.EnableKafkaStreams;
import org.springframework.kafka.annotation.KafkaListener;
import org.springframework.kafka.config.StreamsBuilderFactoryBean;
import org.springframework.kafka.config.TopicBuilder;
import org.springframework.kafka.core.DefaultKafkaProducerFactory;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.kafka.support.KafkaHeaders;
import org.springframework.kafka.test.EmbeddedKafkaBroker;
import org.springframework.kafka.test.condition.EmbeddedKafkaCondition;
import org.springframework.kafka.test.context.EmbeddedKafka;
import org.springframework.messaging.handler.annotation.Header;
import static org.assertj.core.api.Assertions.assertThat;
@@ -47,21 +47,15 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Gary Russell
* @author Stephane Nicoll
*/
@EmbeddedKafka(topics = KafkaAutoConfigurationIntegrationTests.TEST_TOPIC)
class KafkaAutoConfigurationIntegrationTests {
private static final String TEST_TOPIC = "testTopic";
static final String TEST_TOPIC = "testTopic";
private static final String ADMIN_CREATED_TOPIC = "adminCreatedTopic";
public static final EmbeddedKafkaBroker embeddedKafka = new EmbeddedKafkaBroker(1, true, TEST_TOPIC);
private AnnotationConfigApplicationContext context;
@BeforeAll
static void setUp() {
embeddedKafka.afterPropertiesSet();
}
@AfterEach
void close() {
if (this.context != null) {
@@ -69,11 +63,6 @@ class KafkaAutoConfigurationIntegrationTests {
}
}
@AfterAll
static void tearDown() {
embeddedKafka.destroy();
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@Test
void testEndToEnd() throws Exception {
@@ -113,7 +102,7 @@ class KafkaAutoConfigurationIntegrationTests {
}
private String getEmbeddedKafkaBrokersAsString() {
return embeddedKafka.getBrokersAsString();
return EmbeddedKafkaCondition.getBroker().getBrokersAsString();
}
@Configuration(proxyBeanMethods = false)
@@ -126,7 +115,7 @@ class KafkaAutoConfigurationIntegrationTests {
@Bean
public NewTopic adminCreated() {
return new NewTopic(ADMIN_CREATED_TOPIC, 10, (short) 1);
return TopicBuilder.name(ADMIN_CREATED_TOPIC).partitions(10).replicas(1).build();
}
}