diff --git a/pom.xml b/pom.xml index f23a192fab4..9802b893525 100644 --- a/pom.xml +++ b/pom.xml @@ -58,10 +58,9 @@ spring-boot-starter-test test - - junit - junit + org.junit.vintage + junit-vintage-engine diff --git a/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java b/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java index 425172b30bf..217d552f49e 100644 --- a/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java +++ b/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java @@ -22,13 +22,13 @@ import org.springframework.samples.petclinic.vet.VetRepository; @SpringBootTest -public class PetclinicIntegrationTests { +class PetclinicIntegrationTests { @Autowired private VetRepository vets; @Test - public void testFindAll() throws Exception { + void testFindAll() throws Exception { vets.findAll(); vets.findAll(); // served from cache } diff --git a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java index 30397742e6e..4be38f71411 100644 --- a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java +++ b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java @@ -32,7 +32,7 @@ * @author Michael Isvy Simple test to make sure that Bean Validation is working (useful * when upgrading to a new version of Hibernate Validator/ Bean Validation) */ -public class ValidatorTests { +class ValidatorTests { private Validator createValidator() { LocalValidatorFactoryBean localValidatorFactoryBean = new LocalValidatorFactoryBean(); @@ -41,7 +41,7 @@ private Validator createValidator() { } @Test - public void shouldNotValidateWhenFirstNameEmpty() { + void shouldNotValidateWhenFirstNameEmpty() { LocaleContextHolder.setLocale(Locale.ENGLISH); Person person = new Person(); diff --git a/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java b/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java index 899da14716d..1956e2a2469 100644 --- a/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java +++ b/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java @@ -49,7 +49,7 @@ * @author Colin But */ @WebMvcTest(OwnerController.class) -public class OwnerControllerTests { +class OwnerControllerTests { private static final int TEST_OWNER_ID = 1; @@ -65,7 +65,7 @@ public class OwnerControllerTests { private Owner george; @BeforeEach - public void setup() { + void setup() { george = new Owner(); george.setId(TEST_OWNER_ID); george.setFirstName("George"); @@ -88,7 +88,7 @@ public void setup() { } @Test - public void testInitCreationForm() throws Exception { + void testInitCreationForm() throws Exception { mockMvc.perform(get("/owners/new")) .andExpect(status().isOk()) .andExpect(model().attributeExists("owner")) @@ -96,7 +96,7 @@ public void testInitCreationForm() throws Exception { } @Test - public void testProcessCreationFormSuccess() throws Exception { + void testProcessCreationFormSuccess() throws Exception { mockMvc.perform(post("/owners/new") .param("firstName", "Joe") .param("lastName", "Bloggs") @@ -108,7 +108,7 @@ public void testProcessCreationFormSuccess() throws Exception { } @Test - public void testProcessCreationFormHasErrors() throws Exception { + void testProcessCreationFormHasErrors() throws Exception { mockMvc.perform(post("/owners/new") .param("firstName", "Joe") .param("lastName", "Bloggs") @@ -122,7 +122,7 @@ public void testProcessCreationFormHasErrors() throws Exception { } @Test - public void testInitFindForm() throws Exception { + void testInitFindForm() throws Exception { mockMvc.perform(get("/owners/find")) .andExpect(status().isOk()) .andExpect(model().attributeExists("owner")) @@ -130,7 +130,7 @@ public void testInitFindForm() throws Exception { } @Test - public void testProcessFindFormSuccess() throws Exception { + void testProcessFindFormSuccess() throws Exception { given(this.owners.findByLastName("")).willReturn(Lists.newArrayList(george, new Owner())); mockMvc.perform(get("/owners")) .andExpect(status().isOk()) @@ -138,7 +138,7 @@ public void testProcessFindFormSuccess() throws Exception { } @Test - public void testProcessFindFormByLastName() throws Exception { + void testProcessFindFormByLastName() throws Exception { given(this.owners.findByLastName(george.getLastName())).willReturn(Lists.newArrayList(george)); mockMvc.perform(get("/owners") .param("lastName", "Franklin") @@ -148,7 +148,7 @@ public void testProcessFindFormByLastName() throws Exception { } @Test - public void testProcessFindFormNoOwnersFound() throws Exception { + void testProcessFindFormNoOwnersFound() throws Exception { mockMvc.perform(get("/owners") .param("lastName", "Unknown Surname") ) @@ -159,7 +159,7 @@ public void testProcessFindFormNoOwnersFound() throws Exception { } @Test - public void testInitUpdateOwnerForm() throws Exception { + void testInitUpdateOwnerForm() throws Exception { mockMvc.perform(get("/owners/{ownerId}/edit", TEST_OWNER_ID)) .andExpect(status().isOk()) .andExpect(model().attributeExists("owner")) @@ -172,7 +172,7 @@ public void testInitUpdateOwnerForm() throws Exception { } @Test - public void testProcessUpdateOwnerFormSuccess() throws Exception { + void testProcessUpdateOwnerFormSuccess() throws Exception { mockMvc.perform(post("/owners/{ownerId}/edit", TEST_OWNER_ID) .param("firstName", "Joe") .param("lastName", "Bloggs") @@ -185,7 +185,7 @@ public void testProcessUpdateOwnerFormSuccess() throws Exception { } @Test - public void testProcessUpdateOwnerFormHasErrors() throws Exception { + void testProcessUpdateOwnerFormHasErrors() throws Exception { mockMvc.perform(post("/owners/{ownerId}/edit", TEST_OWNER_ID) .param("firstName", "Joe") .param("lastName", "Bloggs") @@ -199,7 +199,7 @@ public void testProcessUpdateOwnerFormHasErrors() throws Exception { } @Test - public void testShowOwner() throws Exception { + void testShowOwner() throws Exception { mockMvc.perform(get("/owners/{ownerId}", TEST_OWNER_ID)) .andExpect(status().isOk()) .andExpect(model().attribute("owner", hasProperty("lastName", is("Franklin")))) diff --git a/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java b/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java index 4c0d695388a..f7c8fe72659 100755 --- a/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java +++ b/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java @@ -42,7 +42,7 @@ includeFilters = @ComponentScan.Filter( value = PetTypeFormatter.class, type = FilterType.ASSIGNABLE_TYPE)) -public class PetControllerTests { +class PetControllerTests { private static final int TEST_OWNER_ID = 1; private static final int TEST_PET_ID = 1; @@ -58,7 +58,7 @@ public class PetControllerTests { private OwnerRepository owners; @BeforeEach - public void setup() { + void setup() { PetType cat = new PetType(); cat.setId(3); cat.setName("hamster"); @@ -69,7 +69,7 @@ public void setup() { } @Test - public void testInitCreationForm() throws Exception { + void testInitCreationForm() throws Exception { mockMvc.perform(get("/owners/{ownerId}/pets/new", TEST_OWNER_ID)) .andExpect(status().isOk()) .andExpect(view().name("pets/createOrUpdatePetForm")) @@ -77,7 +77,7 @@ public void testInitCreationForm() throws Exception { } @Test - public void testProcessCreationFormSuccess() throws Exception { + void testProcessCreationFormSuccess() throws Exception { mockMvc.perform(post("/owners/{ownerId}/pets/new", TEST_OWNER_ID) .param("name", "Betty") .param("type", "hamster") @@ -88,7 +88,7 @@ public void testProcessCreationFormSuccess() throws Exception { } @Test - public void testProcessCreationFormHasErrors() throws Exception { + void testProcessCreationFormHasErrors() throws Exception { mockMvc.perform(post("/owners/{ownerId}/pets/new", TEST_OWNER_ID) .param("name", "Betty") .param("birthDate", "2015-02-12") @@ -102,7 +102,7 @@ public void testProcessCreationFormHasErrors() throws Exception { } @Test - public void testInitUpdateForm() throws Exception { + void testInitUpdateForm() throws Exception { mockMvc.perform(get("/owners/{ownerId}/pets/{petId}/edit", TEST_OWNER_ID, TEST_PET_ID)) .andExpect(status().isOk()) .andExpect(model().attributeExists("pet")) @@ -110,7 +110,7 @@ public void testInitUpdateForm() throws Exception { } @Test - public void testProcessUpdateFormSuccess() throws Exception { + void testProcessUpdateFormSuccess() throws Exception { mockMvc.perform(post("/owners/{ownerId}/pets/{petId}/edit", TEST_OWNER_ID, TEST_PET_ID) .param("name", "Betty") .param("type", "hamster") @@ -121,7 +121,7 @@ public void testProcessUpdateFormSuccess() throws Exception { } @Test - public void testProcessUpdateFormHasErrors() throws Exception { + void testProcessUpdateFormHasErrors() throws Exception { mockMvc.perform(post("/owners/{ownerId}/pets/{petId}/edit", TEST_OWNER_ID, TEST_PET_ID) .param("name", "Betty") .param("birthDate", "2015/02/12") diff --git a/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java b/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java index af98b5cfda8..e27fce21e17 100644 --- a/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java +++ b/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java @@ -38,7 +38,7 @@ * @author Colin But */ @ExtendWith(MockitoExtension.class) -public class PetTypeFormatterTests { +class PetTypeFormatterTests { @Mock private PetRepository pets; @@ -46,12 +46,12 @@ public class PetTypeFormatterTests { private PetTypeFormatter petTypeFormatter; @BeforeEach - public void setup() { + void setup() { this.petTypeFormatter = new PetTypeFormatter(pets); } @Test - public void testPrint() { + void testPrint() { PetType petType = new PetType(); petType.setName("Hamster"); String petTypeName = this.petTypeFormatter.print(petType, Locale.ENGLISH); @@ -59,14 +59,14 @@ public void testPrint() { } @Test - public void shouldParse() throws ParseException { + void shouldParse() throws ParseException { given(this.pets.findPetTypes()).willReturn(makePetTypes()); PetType petType = petTypeFormatter.parse("Bird", Locale.ENGLISH); assertThat(petType.getName()).isEqualTo("Bird"); } @Test - public void shouldThrowParseException() throws ParseException { + void shouldThrowParseException() throws ParseException { given(this.pets.findPetTypes()).willReturn(makePetTypes()); Assertions.assertThrows(ParseException.class, () -> { petTypeFormatter.parse("Fish", Locale.ENGLISH); diff --git a/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java b/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java index 93f30b9aa6a..f61d34c9c48 100644 --- a/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java +++ b/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java @@ -37,7 +37,7 @@ * @author Colin But */ @WebMvcTest(VisitController.class) -public class VisitControllerTests { +class VisitControllerTests { private static final int TEST_PET_ID = 1; @@ -51,19 +51,19 @@ public class VisitControllerTests { private PetRepository pets; @BeforeEach - public void init() { + void init() { given(this.pets.findById(TEST_PET_ID)).willReturn(new Pet()); } @Test - public void testInitNewVisitForm() throws Exception { + void testInitNewVisitForm() throws Exception { mockMvc.perform(get("/owners/*/pets/{petId}/visits/new", TEST_PET_ID)) .andExpect(status().isOk()) .andExpect(view().name("pets/createOrUpdateVisitForm")); } @Test - public void testProcessNewVisitFormSuccess() throws Exception { + void testProcessNewVisitFormSuccess() throws Exception { mockMvc.perform(post("/owners/*/pets/{petId}/visits/new", TEST_PET_ID) .param("name", "George") .param("description", "Visit Description") @@ -73,7 +73,7 @@ public void testProcessNewVisitFormSuccess() throws Exception { } @Test - public void testProcessNewVisitFormHasErrors() throws Exception { + void testProcessNewVisitFormHasErrors() throws Exception { mockMvc.perform(post("/owners/*/pets/{petId}/visits/new", TEST_PET_ID) .param("name", "George") ) diff --git a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java index 562025de926..f11f9837371 100644 --- a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java +++ b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java @@ -22,7 +22,6 @@ import java.util.Collection; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.context.annotation.ComponentScan; @@ -58,9 +57,8 @@ * @author Michael Isvy * @author Dave Syer */ - @DataJpaTest(includeFilters = @ComponentScan.Filter(Service.class)) -public class ClinicServiceTests { +class ClinicServiceTests { @Autowired protected OwnerRepository owners; @@ -75,7 +73,7 @@ public class ClinicServiceTests { protected VetRepository vets; @Test - public void shouldFindOwnersByLastName() { + void shouldFindOwnersByLastName() { Collection owners = this.owners.findByLastName("Davis"); assertThat(owners).hasSize(2); @@ -84,7 +82,7 @@ public void shouldFindOwnersByLastName() { } @Test - public void shouldFindSingleOwnerWithPet() { + void shouldFindSingleOwnerWithPet() { Owner owner = this.owners.findById(1); assertThat(owner.getLastName()).startsWith("Franklin"); assertThat(owner.getPets()).hasSize(1); @@ -94,7 +92,7 @@ public void shouldFindSingleOwnerWithPet() { @Test @Transactional - public void shouldInsertOwner() { + void shouldInsertOwner() { Collection owners = this.owners.findByLastName("Schultz"); int found = owners.size(); @@ -113,7 +111,7 @@ public void shouldInsertOwner() { @Test @Transactional - public void shouldUpdateOwner() { + void shouldUpdateOwner() { Owner owner = this.owners.findById(1); String oldLastName = owner.getLastName(); String newLastName = oldLastName + "X"; @@ -127,7 +125,7 @@ public void shouldUpdateOwner() { } @Test - public void shouldFindPetWithCorrectId() { + void shouldFindPetWithCorrectId() { Pet pet7 = this.pets.findById(7); assertThat(pet7.getName()).startsWith("Samantha"); assertThat(pet7.getOwner().getFirstName()).isEqualTo("Jean"); @@ -135,7 +133,7 @@ public void shouldFindPetWithCorrectId() { } @Test - public void shouldFindAllPetTypes() { + void shouldFindAllPetTypes() { Collection petTypes = this.pets.findPetTypes(); PetType petType1 = EntityUtils.getById(petTypes, PetType.class, 1); @@ -146,7 +144,7 @@ public void shouldFindAllPetTypes() { @Test @Transactional - public void shouldInsertPetIntoDatabaseAndGenerateId() { + void shouldInsertPetIntoDatabaseAndGenerateId() { Owner owner6 = this.owners.findById(6); int found = owner6.getPets().size(); @@ -169,7 +167,7 @@ public void shouldInsertPetIntoDatabaseAndGenerateId() { @Test @Transactional - public void shouldUpdatePetName() throws Exception { + void shouldUpdatePetName() throws Exception { Pet pet7 = this.pets.findById(7); String oldName = pet7.getName(); @@ -182,7 +180,7 @@ public void shouldUpdatePetName() throws Exception { } @Test - public void shouldFindVets() { + void shouldFindVets() { Collection vets = this.vets.findAll(); Vet vet = EntityUtils.getById(vets, Vet.class, 3); @@ -194,7 +192,7 @@ public void shouldFindVets() { @Test @Transactional - public void shouldAddNewVisitForPet() { + void shouldAddNewVisitForPet() { Pet pet7 = this.pets.findById(7); int found = pet7.getVisits().size(); Visit visit = new Visit(); @@ -209,7 +207,7 @@ public void shouldAddNewVisitForPet() { } @Test - public void shouldFindVisitsByPetId() throws Exception { + void shouldFindVisitsByPetId() throws Exception { Collection visits = this.visits.findByPetId(7); assertThat(visits).hasSize(2); Visit[] visitArr = visits.toArray(new Visit[visits.size()]); diff --git a/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java b/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java index b38a7840d6c..f15689ce29a 100644 --- a/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java +++ b/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java @@ -36,13 +36,13 @@ // Waiting https://github.com/spring-projects/spring-boot/issues/5574 @Disabled @WebMvcTest(controllers = CrashController.class) -public class CrashControllerTests { +class CrashControllerTests { @Autowired private MockMvc mockMvc; @Test - public void testTriggerException() throws Exception { + void testTriggerException() throws Exception { mockMvc.perform(get("/oups")).andExpect(view().name("exception")) .andExpect(model().attributeExists("exception")) .andExpect(forwardedUrl("exception")).andExpect(status().isOk()); diff --git a/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java b/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java index c3681f88ffd..5b6d387e73f 100644 --- a/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java +++ b/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java @@ -38,7 +38,7 @@ * Test class for the {@link VetController} */ @WebMvcTest(VetController.class) -public class VetControllerTests { +class VetControllerTests { @Autowired private MockMvc mockMvc; @@ -47,7 +47,7 @@ public class VetControllerTests { private VetRepository vets; @BeforeEach - public void setup() { + void setup() { Vet james = new Vet(); james.setFirstName("James"); james.setLastName("Carter"); @@ -64,7 +64,7 @@ public void setup() { } @Test - public void testShowVetListHtml() throws Exception { + void testShowVetListHtml() throws Exception { mockMvc.perform(get("/vets.html")) .andExpect(status().isOk()) .andExpect(model().attributeExists("vets")) @@ -72,7 +72,7 @@ public void testShowVetListHtml() throws Exception { } @Test - public void testShowResourcesVetList() throws Exception { + void testShowResourcesVetList() throws Exception { ResultActions actions = mockMvc.perform(get("/vets") .accept(MediaType.APPLICATION_JSON)).andExpect(status().isOk()); actions.andExpect(content().contentType(MediaType.APPLICATION_JSON)) diff --git a/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java b/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java index 0e32c531f21..82163eb1407 100644 --- a/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java +++ b/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java @@ -22,12 +22,11 @@ /** * @author Dave Syer - * */ -public class VetTests { +class VetTests { @Test - public void testSerialization() { + void testSerialization() { Vet vet = new Vet(); vet.setFirstName("Zaphod"); vet.setLastName("Beeblebrox");