+ * Within the configuration object that is provided by the JCache API standard, there
+ * is only a very limited set of configuration options. The really relevant
+ * configuration options (like the size limit) must be set via a configuration
+ * mechanism that is provided by the selected JCache implementation.
+ */
+ private javax.cache.configuration.Configuration Exception message
+ Something happened...
+ Not Implemented Yet!
-
-
\ No newline at end of file
diff --git a/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/PetClinicIntegrationTest.java b/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/PetClinicIntegrationTest.java
new file mode 100644
index 000000000..f678d47bc
--- /dev/null
+++ b/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/PetClinicIntegrationTest.java
@@ -0,0 +1,19 @@
+package guru.springframework.sfgpetclinic;
+
+import guru.springframework.sfgpetclinic.services.VetService;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+public class PetClinicIntegrationTest {
+
+ @Autowired
+ private VetService vetService;
+
+ @Test
+ void testFindAll() {
+ vetService.findAll();
+ vetService.findAll(); // served from cache
+ }
+}
diff --git a/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/controllers/CrashControllerTest.java b/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/controllers/CrashControllerTest.java
new file mode 100644
index 000000000..6f0b67cde
--- /dev/null
+++ b/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/controllers/CrashControllerTest.java
@@ -0,0 +1,30 @@
+package guru.springframework.sfgpetclinic.controllers;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.util.NestedServletException;
+
+import static guru.springframework.sfgpetclinic.controllers.CrashController.URL_OUPS;
+import static org.junit.jupiter.api.Assertions.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+
+/**
+ * @author Gaetan Bloch
+ * Created on 30/03/2020
+ */
+class CrashControllerTest {
+ private MockMvc mockMvc;
+
+ @BeforeEach
+ void setUp() {
+ mockMvc = MockMvcBuilders.standaloneSetup(new CrashController()).build();
+ }
+
+ @Test
+ void triggerExceptionTest() {
+ assertThrows(NestedServletException.class, () -> mockMvc.perform(get(URL_OUPS)));
+ }
+}
\ No newline at end of file
diff --git a/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/controllers/OwnerControllerTest.java b/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/controllers/OwnerControllerTest.java
index 267bb8b7a..8c3e5767d 100644
--- a/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/controllers/OwnerControllerTest.java
+++ b/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/controllers/OwnerControllerTest.java
@@ -5,18 +5,20 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.ArgumentMatchers;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import static guru.springframework.sfgpetclinic.controllers.OwnerController.VIEWS_OWNER_CREATE_OR_UPDATE_FORM;
import static org.hamcrest.Matchers.*;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -25,6 +27,9 @@
@ExtendWith(MockitoExtension.class)
class OwnerControllerTest {
+ private static final String URL_OWNERS_NEW = "/owners/new";
+ private static final String URL_OWNERS_EDIT = "/owners/1/edit";
+
@Mock
OwnerService ownerService;
@@ -84,10 +89,11 @@ void processFindFormEmptyReturnMany() throws Exception {
Owner.builder().id(2l).build()));
mockMvc.perform(get("/owners")
- .param("lastName",""))
+ .param("lastName", ""))
.andExpect(status().isOk())
.andExpect(view().name("owners/ownersList"))
- .andExpect(model().attribute("selections", hasSize(2)));;
+ .andExpect(model().attribute("selections", hasSize(2)));
+ ;
}
@Test
@@ -103,47 +109,93 @@ void displayOwner() throws Exception {
@Test
void initCreationForm() throws Exception {
- mockMvc.perform(get("/owners/new"))
+ mockMvc.perform(get(URL_OWNERS_NEW))
.andExpect(status().isOk())
- .andExpect(view().name("owners/createOrUpdateOwnerForm"))
+ .andExpect(view().name(VIEWS_OWNER_CREATE_OR_UPDATE_FORM))
.andExpect(model().attributeExists("owner"));
verifyZeroInteractions(ownerService);
}
@Test
- void processCreationForm() throws Exception {
- when(ownerService.save(ArgumentMatchers.any())).thenReturn(Owner.builder().id(1l).build());
-
- mockMvc.perform(post("/owners/new"))
+ void processCreationFormTest() throws Exception {
+ // Given
+ when(ownerService.save(any())).thenReturn(Owner.builder().id(1L).build());
+
+ // When
+ mockMvc.perform(post(URL_OWNERS_NEW)
+ .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+ .param("firstName", "John")
+ .param("lastName", "Doe")
+ .param("address", "123 Paris street")
+ .param("city", "Paris")
+ .param("telephone", "0123123123"))
+
+ // Then
.andExpect(status().is3xxRedirection())
.andExpect(view().name("redirect:/owners/1"))
.andExpect(model().attributeExists("owner"));
- verify(ownerService).save(ArgumentMatchers.any());
+ verify(ownerService).save(any());
+ }
+
+ @Test
+ void processCreationFormValidationFailedTest() throws Exception {
+ // When
+ mockMvc.perform(post(URL_OWNERS_NEW).contentType(MediaType.APPLICATION_FORM_URLENCODED))
+
+ // Then
+ .andExpect(status().isOk())
+ .andExpect(view().name(VIEWS_OWNER_CREATE_OR_UPDATE_FORM))
+ .andExpect(model().attributeExists("owner"));
+
+ verifyZeroInteractions(ownerService);
}
@Test
void initUpdateOwnerForm() throws Exception {
when(ownerService.findById(anyLong())).thenReturn(Owner.builder().id(1l).build());
- mockMvc.perform(get("/owners/1/edit"))
+ mockMvc.perform(get(URL_OWNERS_EDIT))
.andExpect(status().isOk())
- .andExpect(view().name("owners/createOrUpdateOwnerForm"))
+ .andExpect(view().name(VIEWS_OWNER_CREATE_OR_UPDATE_FORM))
.andExpect(model().attributeExists("owner"));
verifyZeroInteractions(ownerService);
}
@Test
- void processUpdateOwnerForm() throws Exception {
- when(ownerService.save(ArgumentMatchers.any())).thenReturn(Owner.builder().id(1l).build());
-
- mockMvc.perform(post("/owners/1/edit"))
+ void processUpdateOwnerFormTest() throws Exception {
+ // Given
+ when(ownerService.save(any())).thenReturn(Owner.builder().id(1L).build());
+
+ // When
+ mockMvc.perform(post(URL_OWNERS_EDIT)
+ .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+ .param("firstName", "John")
+ .param("lastName", "Doe")
+ .param("address", "123 Paris street")
+ .param("city", "Paris")
+ .param("telephone", "0123123123"))
+
+ // Then
.andExpect(status().is3xxRedirection())
.andExpect(view().name("redirect:/owners/1"))
.andExpect(model().attributeExists("owner"));
- verify(ownerService).save(ArgumentMatchers.any());
+ verify(ownerService).save(any());
+ }
+
+ @Test
+ void processUpdateOwnerFormValidationFailedTest() throws Exception {
+ // When
+ mockMvc.perform(post(URL_OWNERS_EDIT).contentType(MediaType.APPLICATION_FORM_URLENCODED))
+
+ // Then
+ .andExpect(status().isOk())
+ .andExpect(view().name(VIEWS_OWNER_CREATE_OR_UPDATE_FORM))
+ .andExpect(model().attributeExists("owner"));
+
+ verifyZeroInteractions(ownerService);
}
}
\ No newline at end of file
diff --git a/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/controllers/PetControllerTest.java b/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/controllers/PetControllerTest.java
index d8076776b..38dc53470 100644
--- a/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/controllers/PetControllerTest.java
+++ b/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/controllers/PetControllerTest.java
@@ -1,5 +1,6 @@
package guru.springframework.sfgpetclinic.controllers;
+import guru.springframework.sfgpetclinic.formatters.PetTypeFormatter;
import guru.springframework.sfgpetclinic.model.Owner;
import guru.springframework.sfgpetclinic.model.Pet;
import guru.springframework.sfgpetclinic.model.PetType;
@@ -12,16 +13,18 @@
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.format.support.DefaultFormattingConversionService;
+import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import java.util.HashSet;
import java.util.Set;
+import static guru.springframework.sfgpetclinic.controllers.PetController.VIEWS_PETS_CREATE_OR_UPDATE_FORM;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
@@ -29,6 +32,9 @@
@ExtendWith(MockitoExtension.class)
class PetControllerTest {
+ private static final String URL_PETS_NEW = "/owners/1/pets/new";
+ private static final String URL_PETS_EDIT = "/owners/1/pets/2/edit";
+
@Mock
PetService petService;
@@ -54,8 +60,11 @@ void setUp() {
petTypes.add(PetType.builder().id(1L).name("Dog").build());
petTypes.add(PetType.builder().id(2L).name("Cat").build());
+ var conversionService = new DefaultFormattingConversionService();
+ conversionService.addFormatterForFieldType(PetType.class, new PetTypeFormatter(petTypeService));
mockMvc = MockMvcBuilders
.standaloneSetup(petController)
+ .setConversionService(conversionService)
.build();
}
@@ -64,50 +73,100 @@ void initCreationForm() throws Exception {
when(ownerService.findById(anyLong())).thenReturn(owner);
when(petTypeService.findAll()).thenReturn(petTypes);
- mockMvc.perform(get("/owners/1/pets/new"))
+ mockMvc.perform(get(URL_PETS_NEW))
.andExpect(status().isOk())
.andExpect(model().attributeExists("owner"))
.andExpect(model().attributeExists("pet"))
- .andExpect(view().name("pets/createOrUpdatePetForm"));
+ .andExpect(view().name(VIEWS_PETS_CREATE_OR_UPDATE_FORM));
}
@Test
- void processCreationForm() throws Exception {
+ void processCreationFormTest() throws Exception {
+ // Given
when(ownerService.findById(anyLong())).thenReturn(owner);
when(petTypeService.findAll()).thenReturn(petTypes);
- mockMvc.perform(post("/owners/1/pets/new"))
+ // When
+ mockMvc.perform(post(URL_PETS_NEW)
+ .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+ .param("name", "Milou")
+ .param("birthDate", "2020-01-01")
+ .param("petType", "Dog"))
+
+ // Then
.andExpect(status().is3xxRedirection())
- .andExpect(view().name("redirect:/owners/1"));
+ .andExpect(view().name("redirect:/owners/1"))
+ .andExpect(model().attributeExists("owner"))
+ .andExpect(model().attributeExists("pet"));
verify(petService).save(any());
}
+ @Test
+ void processCreationFormValidationFailedTest() throws Exception {
+ // Given
+ when(ownerService.findById(anyLong())).thenReturn(owner);
+
+ // When
+ mockMvc.perform(post(URL_PETS_NEW).contentType(MediaType.APPLICATION_FORM_URLENCODED))
+
+ // Then
+ .andExpect(status().isOk())
+ .andExpect(view().name(VIEWS_PETS_CREATE_OR_UPDATE_FORM))
+ .andExpect(model().attributeExists("owner"))
+ .andExpect(model().attributeExists("pet"));
+
+ verifyZeroInteractions(petService);
+ }
+
@Test
void initUpdateForm() throws Exception {
when(ownerService.findById(anyLong())).thenReturn(owner);
when(petTypeService.findAll()).thenReturn(petTypes);
when(petService.findById(anyLong())).thenReturn(Pet.builder().id(2L).build());
- mockMvc.perform(get("/owners/1/pets/2/edit"))
+ mockMvc.perform(get(URL_PETS_EDIT))
.andExpect(status().isOk())
.andExpect(model().attributeExists("owner"))
.andExpect(model().attributeExists("pet"))
- .andExpect(view().name("pets/createOrUpdatePetForm"));
+ .andExpect(view().name(VIEWS_PETS_CREATE_OR_UPDATE_FORM));
}
@Test
- void processUpdateForm() throws Exception {
+ void processUpdateFormTest() throws Exception {
+ // Given
when(ownerService.findById(anyLong())).thenReturn(owner);
when(petTypeService.findAll()).thenReturn(petTypes);
- mockMvc.perform(post("/owners/1/pets/2/edit"))
+ // When
+ mockMvc.perform(post(URL_PETS_EDIT)
+ .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+ .param("name", "Caline")
+ .param("birthDate", "2020-01-01")
+ .param("petType", "Cat"))
+
+ // Then
.andExpect(status().is3xxRedirection())
- .andExpect(view().name("redirect:/owners/1"));
+ .andExpect(view().name("redirect:/owners/1"))
+ .andExpect(model().attributeExists("pet"))
+ .andExpect(model().attributeExists("owner"));
verify(petService).save(any());
}
+ @Test
+ void processUpdateFormValidationFailedTest() throws Exception {
+ // When
+ mockMvc.perform(post(URL_PETS_EDIT).contentType(MediaType.APPLICATION_FORM_URLENCODED))
+
+ // Then
+ .andExpect(status().isOk())
+ .andExpect(view().name(VIEWS_PETS_CREATE_OR_UPDATE_FORM))
+ .andExpect(model().attributeExists("pet"));
+
+ verifyZeroInteractions(petService);
+ }
+
@Test
void populatePetTypes() {
//todo impl
diff --git a/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/controllers/VisitControllerTest.java b/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/controllers/VisitControllerTest.java
index 41542c328..ea011c83b 100644
--- a/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/controllers/VisitControllerTest.java
+++ b/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/controllers/VisitControllerTest.java
@@ -22,6 +22,7 @@
import java.util.HashSet;
import java.util.Map;
+import static guru.springframework.sfgpetclinic.controllers.VisitController.PETS_CREATE_OR_UPDATE_VISIT_FORM;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.when;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -31,7 +32,6 @@
@ExtendWith(MockitoExtension.class)
class VisitControllerTest {
- private static final String PETS_CREATE_OR_UPDATE_VISIT_FORM = "pets/createOrUpdateVisitForm";
private static final String REDIRECT_OWNERS_1 = "redirect:/owners/{ownerId}";
private static final String YET_ANOTHER_VISIT_DESCRIPTION = "yet another visit";
@@ -57,18 +57,18 @@ void setUp() {
when(petService.findById(anyLong()))
.thenReturn(
Pet.builder()
- .id(petId)
- .birthDate(LocalDate.of(2018,11,13))
- .name("Cutie")
- .visits(new HashSet<>())
- .owner(Owner.builder()
- .id(ownerId)
- .lastName("Doe")
- .firstName("Joe")
- .build())
- .petType(PetType.builder()
- .name("Dog").build())
- .build()
+ .id(petId)
+ .birthDate(LocalDate.of(2018, 11, 13))
+ .name("Cutie")
+ .visits(new HashSet<>())
+ .owner(Owner.builder()
+ .id(ownerId)
+ .lastName("Doe")
+ .firstName("Joe")
+ .build())
+ .petType(PetType.builder()
+ .name("Dog").build())
+ .build()
);
uriVariables.clear();
@@ -91,14 +91,29 @@ void initNewVisitForm() throws Exception {
@Test
- void processNewVisitForm() throws Exception {
+ void processNewVisitFormTest() throws Exception {
+ // When
mockMvc.perform(post(visitsUri)
- .contentType(MediaType.APPLICATION_FORM_URLENCODED)
- .param("date","2018-11-11")
- .param("description", YET_ANOTHER_VISIT_DESCRIPTION))
+ .contentType(MediaType.APPLICATION_FORM_URLENCODED)
+ .param("date", "2018-11-11")
+ .param("description", YET_ANOTHER_VISIT_DESCRIPTION))
+
+ // Then
.andExpect(status().is3xxRedirection())
.andExpect(view().name(REDIRECT_OWNERS_1))
.andExpect(model().attributeExists("visit"))
- ;
+ .andExpect(model().attributeExists("pet"));
+ }
+
+ @Test
+ void processNewVisitFormValidationFailedTest() throws Exception {
+ // When
+ mockMvc.perform(post(visitsUri).contentType(MediaType.APPLICATION_FORM_URLENCODED))
+
+ // Then
+ .andExpect(status().isOk())
+ .andExpect(view().name(PETS_CREATE_OR_UPDATE_VISIT_FORM))
+ .andExpect(model().attributeExists("visit"))
+ .andExpect(model().attributeExists("pet"));
}
}
\ No newline at end of file
diff --git a/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/formatters/PetTypeFormatterTest.java b/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/formatters/PetTypeFormatterTest.java
new file mode 100644
index 000000000..4af6ba444
--- /dev/null
+++ b/pet-clinic-web/src/test/java/guru/springframework/sfgpetclinic/formatters/PetTypeFormatterTest.java
@@ -0,0 +1,74 @@
+package guru.springframework.sfgpetclinic.formatters;
+
+import guru.springframework.sfgpetclinic.model.PetType;
+import guru.springframework.sfgpetclinic.services.PetTypeService;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.text.ParseException;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author Gaetan Bloch
+ * Created on 30/03/2020
+ */
+@ExtendWith(MockitoExtension.class)
+class PetTypeFormatterTest {
+
+ private static final String PET_TYPE_DOG = "Dog";
+ private static final String PET_TYPE_CAT = "Cat";
+ private static final String PET_TYPE_FISH = "Fish";
+
+ private PetTypeFormatter petTypeFormatter;
+
+ private Set