Merge pull request #17272 from izeye

* pr/17272:
  Use "JUnit" instead of "Junit"

Closes gh-17272
pull/17277/head
Stephane Nicoll 5 years ago
commit b64d8df656

@ -6934,7 +6934,7 @@ useful libraries.
[TIP] [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 tests. If you have migrated your tests to JUnit 5, you should exclude JUnit 4 support, as
shown in the following example: shown in the following example:

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

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

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

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

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

Loading…
Cancel
Save