DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-24 00:05:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Arreglos de los tests

Browse source
This commit is contained in:
Thiloparn 2021-03-28 18:07:35 +02:00
parent 3ccf48acfc
commit f0a8d27d63
6 changed files with 28 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/org/springframework/cheapy/web/NuOfferController.java
View file

@ -30,8 +30,7 @@ public class NuOfferController {
public NuOfferController(final NuOfferService nuOfferService, final ClientService clientService) { public NuOfferController(final NuOfferService nuOfferService, final ClientService clientService) {
this.nuOfferService = nuOfferService; this.nuOfferService = nuOfferService;
this.clientService = clientService; this.clientService = clientService;
}
@GetMapping("/offers/nu/new") @GetMapping("/offers/nu/new")
public String initCreationForm(Map<String, Object> model) { public String initCreationForm(Map<String, Object> model) {
@ -68,7 +67,7 @@ public class NuOfferController {
} else { } else {
modelMap.addAttribute("message", "You don't have access to this number offer"); modelMap.addAttribute("message", "You don't have access to this number offer");
} }
return "redirect:/nuOffers/"+ nuOffer.getId(); return "redirect:/offers/nu/"+ nuOffer.getId();
} }

4
src/main/java/org/springframework/cheapy/web/TimeOfferController.java
View file

@ -29,7 +29,7 @@ public class TimeOfferController {
public TimeOfferController(final TimeOfferService timeOfferService, ClientService clientService) { public TimeOfferController(final TimeOfferService timeOfferService, ClientService clientService) {
this.timeOfferService = timeOfferService; this.timeOfferService = timeOfferService;
this.clientService = clientService; this.clientService = clientService;
}
@GetMapping("/offers/time/new") @GetMapping("/offers/time/new")
public String initCreationForm(Map<String, Object> model) { public String initCreationForm(Map<String, Object> model) {
@ -67,7 +67,7 @@ public class TimeOfferController {
} else { } else {
modelMap.addAttribute("message", "You don't have access to this time offer"); modelMap.addAttribute("message", "You don't have access to this time offer");
} }
return "redirect:/timeOffers/" + timeOffer.getId(); return "redirect:/offers/time/" + timeOffer.getId();
} }

15
src/test/java/org/springframework/cheapy/web/FoodOfferControllerTests.java
View file

@ -53,8 +53,9 @@ class FoodOfferControllerTest {
User user1 = new User(); User user1 = new User();
user1.setUsername("user1"); user1.setUsername("user1");
user1.setPassword("user1"); user1.setPassword("user1");
Client client1 = new Client(); Client client1 = new Client();;
client1.setId(TEST_CLIENT_ID); client1.setId(TEST_CLIENT_ID);
client1.setName("client1");
client1.setEmail("client1"); client1.setEmail("client1");
client1.setAddress("client1"); client1.setAddress("client1");
client1.setInit("01:00"); client1.setInit("01:00");
@ -63,7 +64,7 @@ class FoodOfferControllerTest {
client1.setDescription("client1"); client1.setDescription("client1");
client1.setCode("client1"); client1.setCode("client1");
client1.setFood("client1"); client1.setFood("client1");
client1.setUsername(user1); client1.setUsuar(user1);
BDDMockito.given(this.clientService.getCurrentClient()).willReturn(client1); BDDMockito.given(this.clientService.getCurrentClient()).willReturn(client1);
FoodOffer fo1test = new FoodOffer(); FoodOffer fo1test = new FoodOffer();
@ -71,8 +72,7 @@ class FoodOfferControllerTest {
fo1test.setStart(LocalDateTime.of(2021, 12, 23, 12, 30)); fo1test.setStart(LocalDateTime.of(2021, 12, 23, 12, 30));
fo1test.setEnd(LocalDateTime.of(2022, 12, 23, 12, 30)); fo1test.setEnd(LocalDateTime.of(2022, 12, 23, 12, 30));
fo1test.setFood("fo1test"); fo1test.setFood("fo1test");
fo1test.setDiscount("fo1test"); fo1test.setDiscount(1);
fo1test.setUnits(1);
fo1test.setClient(client1); fo1test.setClient(client1);
this.fo1 = fo1test; this.fo1 = fo1test;
BDDMockito.given(this.foodOfferService.findFoodOfferById(TEST_FOODOFFER_ID)).willReturn(this.fo1); BDDMockito.given(this.foodOfferService.findFoodOfferById(TEST_FOODOFFER_ID)).willReturn(this.fo1);
@ -96,8 +96,7 @@ class FoodOfferControllerTest {
.param("start", "23/12/2021 12:30") .param("start", "23/12/2021 12:30")
.param("end", "23/12/2022 12:30") .param("end", "23/12/2022 12:30")
.param("food", "food") .param("food", "food")
.param("discount", "10%") .param("discount", "10"))
.param("units", "1"))
.andExpect(status().is3xxRedirection()); .andExpect(status().is3xxRedirection());
} }
@ -109,14 +108,12 @@ class FoodOfferControllerTest {
.param("start", "lsqdufhlqhf") .param("start", "lsqdufhlqhf")
.param("end", "") .param("end", "")
.param("food", "") .param("food", "")
.param("discount", "") .param("discount", ""))
.param("units", "qsdfy"))
.andExpect(model().attributeHasErrors("foodOffer")) .andExpect(model().attributeHasErrors("foodOffer"))
.andExpect(model().attributeHasFieldErrors("foodOffer", "start")) .andExpect(model().attributeHasFieldErrors("foodOffer", "start"))
.andExpect(model().attributeHasFieldErrors("foodOffer", "end")) .andExpect(model().attributeHasFieldErrors("foodOffer", "end"))
.andExpect(model().attributeHasFieldErrors("foodOffer", "food")) .andExpect(model().attributeHasFieldErrors("foodOffer", "food"))
.andExpect(model().attributeHasFieldErrors("foodOffer", "discount")) .andExpect(model().attributeHasFieldErrors("foodOffer", "discount"))
.andExpect(model().attributeHasFieldErrors("foodOffer", "units"))
.andExpect(view().name("offers/food/createOrUpdateFoodOfferForm")); .andExpect(view().name("offers/food/createOrUpdateFoodOfferForm"));
} }

11
src/test/java/org/springframework/cheapy/web/NuOfferControllerTests.java
View file

@ -54,6 +54,7 @@ class NuOfferControllerTest {
user1.setPassword("user1"); user1.setPassword("user1");
Client client1 = new Client(); Client client1 = new Client();
client1.setId(TEST_CLIENT_ID); client1.setId(TEST_CLIENT_ID);
client1.setName("client1");
client1.setEmail("client1"); client1.setEmail("client1");
client1.setAddress("client1"); client1.setAddress("client1");
client1.setInit("01:00"); client1.setInit("01:00");
@ -62,7 +63,7 @@ class NuOfferControllerTest {
client1.setDescription("client1"); client1.setDescription("client1");
client1.setCode("client1"); client1.setCode("client1");
client1.setFood("client1"); client1.setFood("client1");
client1.setUsername(user1); client1.setUsuar(user1);
BDDMockito.given(this.clientService.getCurrentClient()).willReturn(client1); BDDMockito.given(this.clientService.getCurrentClient()).willReturn(client1);
NuOffer nu1test = new NuOffer(); NuOffer nu1test = new NuOffer();
@ -70,11 +71,11 @@ class NuOfferControllerTest {
nu1test.setStart(LocalDateTime.of(2021, 12, 23, 12, 30)); nu1test.setStart(LocalDateTime.of(2021, 12, 23, 12, 30));
nu1test.setEnd(LocalDateTime.of(2022, 12, 23, 12, 30)); nu1test.setEnd(LocalDateTime.of(2022, 12, 23, 12, 30));
nu1test.setGold(5); nu1test.setGold(5);
nu1test.setDiscountGold("15%"); nu1test.setDiscountGold(15);
nu1test.setSilver(10); nu1test.setSilver(10);
nu1test.setDiscountGold("10%"); nu1test.setDiscountSilver(10);
nu1test.setGold(15); nu1test.setBronze(15);
nu1test.setDiscountGold("5%"); nu1test.setDiscountBronze(5);
nu1test.setClient(client1); nu1test.setClient(client1);
this.nu1 = nu1test; this.nu1 = nu1test;
BDDMockito.given(this.nuOfferService.findNuOfferById(TEST_NUOFFER_ID)).willReturn(this.nu1); BDDMockito.given(this.nuOfferService.findNuOfferById(TEST_NUOFFER_ID)).willReturn(this.nu1);

17
src/test/java/org/springframework/cheapy/web/SpeedOfferControllerTests.java
View file

@ -55,6 +55,7 @@ class SpeedOfferControllerTest {
user1.setPassword("user1"); user1.setPassword("user1");
Client client1 = new Client(); Client client1 = new Client();
client1.setId(TEST_CLIENT_ID); client1.setId(TEST_CLIENT_ID);
client1.setName("client1");
client1.setEmail("client1"); client1.setEmail("client1");
client1.setAddress("client1"); client1.setAddress("client1");
client1.setInit("01:00"); client1.setInit("01:00");
@ -63,7 +64,7 @@ class SpeedOfferControllerTest {
client1.setDescription("client1"); client1.setDescription("client1");
client1.setCode("client1"); client1.setCode("client1");
client1.setFood("client1"); client1.setFood("client1");
client1.setUsername(user1); client1.setUsuar(user1);
BDDMockito.given(this.clientService.getCurrentClient()).willReturn(client1); BDDMockito.given(this.clientService.getCurrentClient()).willReturn(client1);
SpeedOffer sp1test = new SpeedOffer(); SpeedOffer sp1test = new SpeedOffer();
@ -71,11 +72,11 @@ class SpeedOfferControllerTest {
sp1test.setStart(LocalDateTime.of(2021, 12, 23, 12, 30)); sp1test.setStart(LocalDateTime.of(2021, 12, 23, 12, 30));
sp1test.setEnd(LocalDateTime.of(2022, 12, 23, 12, 30)); sp1test.setEnd(LocalDateTime.of(2022, 12, 23, 12, 30));
sp1test.setGold(5); sp1test.setGold(5);
sp1test.setDiscountGold("15%"); sp1test.setDiscountGold(15);
sp1test.setSilver(10); sp1test.setSilver(10);
sp1test.setDiscountGold("10%"); sp1test.setDiscountSilver(10);
sp1test.setGold(15); sp1test.setBronze(15);
sp1test.setDiscountGold("5%"); sp1test.setDiscountBronze(5);
sp1test.setClient(client1); sp1test.setClient(client1);
this.sp1 = sp1test; this.sp1 = sp1test;
BDDMockito.given(this.speedOfferService.findSpeedOfferById(TEST_SPEEDOFFER_ID)).willReturn(this.sp1); BDDMockito.given(this.speedOfferService.findSpeedOfferById(TEST_SPEEDOFFER_ID)).willReturn(this.sp1);
@ -99,11 +100,11 @@ class SpeedOfferControllerTest {
.param("start", "23/12/2021 12:30") .param("start", "23/12/2021 12:30")
.param("end", "23/12/2022 12:30") .param("end", "23/12/2022 12:30")
.param("gold", "5") .param("gold", "5")
.param("discountGold", "15%") .param("discountGold", "15")
.param("silver", "10") .param("silver", "10")
.param("discountSilver", "10%") .param("discountSilver", "10")
.param("bronze", "15") .param("bronze", "15")
.param("discountBronze", "5%")) .param("discountBronze", "5"))
.andExpect(status().is3xxRedirection()); .andExpect(status().is3xxRedirection());
} }

5
src/test/java/org/springframework/cheapy/web/TimeOfferControllerTests.java
View file

@ -55,6 +55,7 @@ class TimeOfferControllerTest {
user1.setPassword("user1"); user1.setPassword("user1");
Client client1 = new Client(); Client client1 = new Client();
client1.setId(TEST_CLIENT_ID); client1.setId(TEST_CLIENT_ID);
client1.setName("client1");
client1.setEmail("client1"); client1.setEmail("client1");
client1.setAddress("client1"); client1.setAddress("client1");
client1.setInit("01:00"); client1.setInit("01:00");
@ -63,7 +64,7 @@ class TimeOfferControllerTest {
client1.setDescription("client1"); client1.setDescription("client1");
client1.setCode("client1"); client1.setCode("client1");
client1.setFood("client1"); client1.setFood("client1");
client1.setUsername(user1); client1.setUsuar(user1);
BDDMockito.given(this.clientService.getCurrentClient()).willReturn(client1); BDDMockito.given(this.clientService.getCurrentClient()).willReturn(client1);
TimeOffer time1test = new TimeOffer(); TimeOffer time1test = new TimeOffer();
@ -72,7 +73,7 @@ class TimeOfferControllerTest {
time1test.setEnd(LocalDateTime.of(2022, 12, 23, 12, 30)); time1test.setEnd(LocalDateTime.of(2022, 12, 23, 12, 30));
time1test.setInit(LocalTime.of(12, 00)); time1test.setInit(LocalTime.of(12, 00));
time1test.setFinish(LocalTime.of(13, 00)); time1test.setFinish(LocalTime.of(13, 00));
time1test.setDiscount("10"); time1test.setDiscount(10);
time1test.setClient(client1); time1test.setClient(client1);
this.time1 = time1test; this.time1 = time1test;
BDDMockito.given(this.timeOfferService.findTimeOfferById(TEST_TIMEOFFER_ID)).willReturn(this.time1); BDDMockito.given(this.timeOfferService.findTimeOfferById(TEST_TIMEOFFER_ID)).willReturn(this.time1);