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

Upgrade tests to Junit5

Browse Source 
See gh-14737
This commit is contained in:
Madhura Bhave
2018-12-05 13:56:29 -08:00
parent 4c96c76f11
commit 59d2b0a3fb
804 changed files with 1976 additions and 2238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SampleSimpleApplicationTests.java
View File

@@ -16,12 +16,12 @@
package sample.simple;
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;
@@ -33,17 +33,17 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
public class SampleSimpleApplicationTests {
@Rule
public OutputCapture outputCapture = 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);
@@ -56,14 +56,14 @@ public class SampleSimpleApplicationTests {
@Test
public void testDefaultSettings() throws Exception {
SampleSimpleApplication.main(new String[0]);
String output = this.outputCapture.toString();
String output = this.output.toString();
assertThat(output).contains("Hello Phil");
}
@Test
public void testCommandLineOverrides() throws Exception {
SampleSimpleApplication.main(new String[] { "--name=Gordon", "--duration=1m" });
String output = this.outputCapture.toString();
String output = this.output.toString();
assertThat(output).contains("Hello Gordon for 60 seconds");
}

6
spring-boot-samples/spring-boot-sample-simple/src/test/java/sample/simple/SpringTestSampleSimpleApplicationTests.java
View File

@@ -16,13 +16,11 @@
package sample.simple;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContext;
import org.springframework.test.context.junit4.SpringRunner;
import static org.assertj.core.api.Assertions.assertThat;
@@ -31,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat;
*
* @author Dave Syer
*/
@RunWith(SpringRunner.class)
@SpringBootTest
public class SpringTestSampleSimpleApplicationTests {