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

Validate our own tests work with JUnit5 and the vintage engine

Browse Source 
Closes gh-14737

Co-authored-by: Stephane Nicoll <snicoll@pivotal.io>
This commit is contained in:
Madhura Bhave
2018-12-05 13:56:29 -08:00
committed by Stephane Nicoll
parent d9f339a1b6
commit 1db1c8b03c
821 changed files with 2279 additions and 2787 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
spring-boot-samples/spring-boot-sample-aop/src/test/java/sample/aop/SampleAopApplicationTests.java
View File

@@ -16,12 +16,12 @@
package sample.aop;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.springframework.boot.test.rule.OutputCapture;
import org.springframework.boot.test.extension.OutputCapture;
import static org.assertj.core.api.Assertions.assertThat;
@@ -31,19 +31,19 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Dave Syer
* @author Phillip Webb
*/
public class SampleAopApplicationTests {
class SampleAopApplicationTests {
@Rule
public final OutputCapture output = new OutputCapture();
@RegisterExtension
OutputCapture output = new OutputCapture();
private String profiles;
@Before
@BeforeEach
public void init() {
this.profiles = System.getProperty("spring.profiles.active");
}
@After
@AfterEach
public void after() {
if (this.profiles != null) {
System.setProperty("spring.profiles.active", this.profiles);
@@ -54,15 +54,15 @@ public class SampleAopApplicationTests {
}
@Test
public void testDefaultSettings() throws Exception {
void testDefaultSettings() throws Exception {
SampleAopApplication.main(new String[0]);
assertThat(this.output.toString()).contains("Hello Phil");
assertThat(this.output).contains("Hello Phil");
}
@Test
public void testCommandLineOverrides() throws Exception {
void testCommandLineOverrides() throws Exception {
SampleAopApplication.main(new String[] { "--name=Gordon" });
assertThat(this.output.toString()).contains("Hello Gordon");
assertThat(this.output).contains("Hello Gordon");
}
}