Polish "Combine Pulsar smoke tests"

See gh-37196

Author: philwebb

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar/src/main/java/smoketest/pulsar/ImperativeAppConfig.java

@@ -31,7 +31,7 @@
 @Profile("smoketest.pulsar.imperative")
 class ImperativeAppConfig {
 
-	private static final Log LOG = LogFactory.getLog(ImperativeAppConfig.class);
+	private static final Log logger = LogFactory.getLog(ImperativeAppConfig.class);
 
 	private static final String TOPIC = "pulsar-smoke-test-topic";
 
@@ -45,14 +45,14 @@ ApplicationRunner sendMessagesToPulsarTopic(PulsarTemplate<SampleMessage> templa
 		return (args) -> {
 			for (int i = 0; i < 10; i++) {
 				template.send(TOPIC, new SampleMessage(i, "message:" + i));
-				LOG.info("++++++PRODUCE IMPERATIVE:(" + i + ")------");
+				logger.info("++++++PRODUCE IMPERATIVE:(" + i + ")------");
 			}
 		};
 	}
 
 	@PulsarListener(topics = TOPIC)
 	void consumeMessagesFromPulsarTopic(SampleMessage msg) {
-		LOG.info("++++++CONSUME IMPERATIVE:(" + msg.id() + ")------");
+		logger.info("++++++CONSUME IMPERATIVE:(" + msg.id() + ")------");
 	}
 
 }

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar/src/main/java/smoketest/pulsar/ReactiveAppConfig.java

@@ -34,7 +34,7 @@
 @Profile("smoketest.pulsar.reactive")
 class ReactiveAppConfig {
 
-	private static final Log LOG = LogFactory.getLog(ReactiveAppConfig.class);
+	private static final Log logger = LogFactory.getLog(ReactiveAppConfig.class);
 
 	private static final String TOPIC = "pulsar-reactive-smoke-test-topic";
 
@@ -49,14 +49,14 @@ ApplicationRunner sendMessagesToPulsarTopic(ReactivePulsarTemplate<SampleMessage
 			.map((i) -> new SampleMessage(i, "message:" + i))
 			.map(MessageSpec::of)
 			.as((msgs) -> template.send(TOPIC, msgs))
-			.doOnNext((sendResult) -> LOG
+			.doOnNext((sendResult) -> logger
 				.info("++++++PRODUCE REACTIVE:(" + sendResult.getMessageSpec().getValue().id() + ")------"))
 			.subscribe();
 	}
 
 	@ReactivePulsarListener(topics = TOPIC)
 	Mono<Void> consumeMessagesFromPulsarTopic(SampleMessage msg) {
-		LOG.info("++++++CONSUME REACTIVE:(" + msg.id() + ")------");
+		logger.info("++++++CONSUME REACTIVE:(" + msg.id() + ")------");
 		return Mono.empty();
 	}
 

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-pulsar/src/test/java/smoketest/pulsar/SamplePulsarApplicationTests.java

@@ -44,48 +44,54 @@
 class SamplePulsarApplicationTests {
 
 	@Container
-	static final PulsarContainer PULSAR_CONTAINER = new PulsarContainer(DockerImageNames.pulsar())
-		.withStartupAttempts(2)
+	static final PulsarContainer container = new PulsarContainer(DockerImageNames.pulsar()).withStartupAttempts(2)
 		.withStartupTimeout(Duration.ofMinutes(3));
 
 	@DynamicPropertySource
 	static void pulsarProperties(DynamicPropertyRegistry registry) {
-		registry.add("spring.pulsar.client.service-url", PULSAR_CONTAINER::getPulsarBrokerUrl);
-		registry.add("spring.pulsar.admin.service-url", PULSAR_CONTAINER::getHttpServiceUrl);
+		registry.add("spring.pulsar.client.service-url", container::getPulsarBrokerUrl);
+		registry.add("spring.pulsar.admin.service-url", container::getHttpServiceUrl);
 	}
 
-	@Nested
-	@SpringBootTest
-	@ActiveProfiles("smoketest.pulsar.imperative")
-	class ImperativeApp {
+	abstract class PulsarApplication {
+
+		private final String type;
+
+		PulsarApplication(String type) {
+			this.type = type;
+		}
 
 		@Test
 		void appProducesAndConsumesMessages(CapturedOutput output) {
 			List<String> expectedOutput = new ArrayList<>();
 			IntStream.range(0, 10).forEachOrdered((i) -> {
-				expectedOutput.add("++++++PRODUCE IMPERATIVE:(" + i + ")------");
-				expectedOutput.add("++++++CONSUME IMPERATIVE:(" + i + ")------");
+				expectedOutput.add("++++++PRODUCE %s:(%s)------".formatted(this.type, i));
+				expectedOutput.add("++++++CONSUME %s:(%s)------".formatted(this.type, i));
 			});
 			Awaitility.waitAtMost(Duration.ofSeconds(30))
 				.untilAsserted(() -> assertThat(output).contains(expectedOutput));
 		}
 
 	}
 
+	@Nested
+	@SpringBootTest
+	@ActiveProfiles("smoketest.pulsar.imperative")
+	class ImperativePulsarApplication extends PulsarApplication {
+
+		ImperativePulsarApplication() {
+			super("IMPERATIVE");
+		}
+
+	}
+
 	@Nested
 	@SpringBootTest
 	@ActiveProfiles("smoketest.pulsar.reactive")
-	class ReactiveApp {
+	class ReactivePulsarApplication extends PulsarApplication {
 
-		@Test
-		void appProducesAndConsumesMessagesReactively(CapturedOutput output) {
-			List<String> expectedOutput = new ArrayList<>();
-			IntStream.range(0, 10).forEachOrdered((i) -> {
-				expectedOutput.add("++++++PRODUCE REACTIVE:(" + i + ")------");
-				expectedOutput.add("++++++CONSUME REACTIVE:(" + i + ")------");
-			});
-			Awaitility.waitAtMost(Duration.ofSeconds(30))
-				.untilAsserted(() -> assertThat(output).contains(expectedOutput));
+		ReactivePulsarApplication() {
+			super("REACTIVE");
 		}
 
 	}