Browse Source

Use "JUnit" instead of "Junit"

See gh-17272
pull/17277/head
Johnny Lim 7 years ago committed by Stephane Nicoll
parent
commit
f283aa18eb
  1. 2
      spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
  2. 4
      spring-boot-samples/spring-boot-sample-junit-jupiter/src/main/java/sample/SampleJUnitJupiterApplication.java
  3. 2
      spring-boot-samples/spring-boot-sample-junit-jupiter/src/test/java/sample/SampleJUnitJupiterApplicationTests.java
  4. 4
      spring-boot-samples/spring-boot-sample-junit-vintage/src/main/java/sample/SampleJUnitVintageApplication.java
  5. 2
      spring-boot-samples/spring-boot-sample-junit-vintage/src/test/java/sample/SampleJUnitVintageApplicationTests.java
  6. 2
      src/checkstyle/checkstyle-suppressions.xml

2
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@ -6934,7 +6934,7 @@ useful libraries. @@ -6934,7 +6934,7 @@ useful libraries.
[TIP]
====
The starter also brings the vintage engine so that you can run both JUnit 4 and Junit 5
The starter also brings the vintage engine so that you can run both JUnit 4 and JUnit 5
tests. If you have migrated your tests to JUnit 5, you should exclude JUnit 4 support, as
shown in the following example:

4
spring-boot-samples/spring-boot-sample-junit-jupiter/src/main/java/sample/SampleJunitJupiterApplication.java → spring-boot-samples/spring-boot-sample-junit-jupiter/src/main/java/sample/SampleJUnitJupiterApplication.java

@ -20,10 +20,10 @@ import org.springframework.boot.SpringApplication; @@ -20,10 +20,10 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class SampleJunitJupiterApplication {
public class SampleJUnitJupiterApplication {
public static void main(String[] args) {
SpringApplication.run(SampleJunitJupiterApplication.class, args);
SpringApplication.run(SampleJUnitJupiterApplication.class, args);
}
}

2
spring-boot-samples/spring-boot-sample-junit-jupiter/src/test/java/sample/SampleJunitJupiterApplicationTests.java → spring-boot-samples/spring-boot-sample-junit-jupiter/src/test/java/sample/SampleJUnitJupiterApplicationTests.java

@ -26,7 +26,7 @@ import org.springframework.boot.test.web.client.TestRestTemplate; @@ -26,7 +26,7 @@ import org.springframework.boot.test.web.client.TestRestTemplate;
import static org.assertj.core.api.Assertions.assertThat;
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
class SampleJunitJupiterApplicationTests {
class SampleJUnitJupiterApplicationTests {
@Autowired
private TestRestTemplate restTemplate;

4
spring-boot-samples/spring-boot-sample-junit-vintage/src/main/java/sample/SampleJunitVintageApplication.java → spring-boot-samples/spring-boot-sample-junit-vintage/src/main/java/sample/SampleJUnitVintageApplication.java

@ -20,10 +20,10 @@ import org.springframework.boot.SpringApplication; @@ -20,10 +20,10 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class SampleJunitVintageApplication {
public class SampleJUnitVintageApplication {
public static void main(String[] args) {
SpringApplication.run(SampleJunitVintageApplication.class, args);
SpringApplication.run(SampleJUnitVintageApplication.class, args);
}
}

2
spring-boot-samples/spring-boot-sample-junit-vintage/src/test/java/sample/SampleJunitVintageApplicationTests.java → spring-boot-samples/spring-boot-sample-junit-vintage/src/test/java/sample/SampleJUnitVintageApplicationTests.java

@ -29,7 +29,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers. @@ -29,7 +29,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@RunWith(SpringRunner.class)
@WebMvcTest
public class SampleJunitVintageApplicationTests {
public class SampleJUnitVintageApplicationTests {
@Autowired
private MockMvc mockMvc;

2
src/checkstyle/checkstyle-suppressions.xml

@ -44,5 +44,5 @@ @@ -44,5 +44,5 @@
<suppress files="JavaLoggingSystemTests" checks="SpringJUnit5" />
<suppress files="Log4J2LoggingSystemTests" checks="SpringJUnit5" />
<suppress files="RestClientTestWithComponentIntegrationTests" checks="SpringJUnit5" />
<suppress files="SampleJunitVintageApplicationTests" checks="SpringJUnit5" />
<suppress files="SampleJUnitVintageApplicationTests" checks="SpringJUnit5" />
</suppressions>

Loading…
Cancel
Save