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

Merge branch '3.3.x' into 3.4.x

Browse Source 
Closes gh-45194
This commit is contained in:
Phillip Webb
2025-04-14 18:57:26 -07:00
parent b80bdbb182 9b1b7e608c
commit 0dca16c7eb
5 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/build.gradle
View File

@@ -9,6 +9,7 @@ dependencies {
implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-integration"))
implementation("org.springframework.integration:spring-integration-file")
implementation("org.springframework.integration:spring-integration-jmx")
testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test"))
testImplementation("org.awaitility:awaitility")

1
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/main/resources/application.properties
View File

@@ -2,3 +2,4 @@ logging.level.org.springframework.integration.file=DEBUG
service.greeting=Hello
service.input-dir=input
service.output-dir=output
spring.jmx.enabled=true

10
spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-integration/src/test/java/smoketest/integration/consumer/SampleIntegrationApplicationTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,18 +25,22 @@ import java.time.Duration;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.junit.jupiter.api.io.TempDir;
import smoketest.integration.SampleIntegrationApplication;
import smoketest.integration.ServiceProperties;
import smoketest.integration.producer.ProducerApplication;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.test.system.CapturedOutput;
import org.springframework.boot.test.system.OutputCaptureExtension;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
import org.springframework.core.io.support.ResourcePatternUtils;
import org.springframework.util.StreamUtils;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.containsString;
/**
@@ -45,12 +49,14 @@ import static org.hamcrest.Matchers.containsString;
* @author Dave Syer
* @author Andy Wilkinson
*/
@ExtendWith(OutputCaptureExtension.class)
class SampleIntegrationApplicationTests {
private ConfigurableApplicationContext context;
@AfterEach
void stop() {
void stopAndCheck(CapturedOutput output) {
assertThat(output).doesNotContain("WARN");
if (this.context != null) {
this.context.close();
}