Patrick.Sy/spring-petclinic
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2026-01-24 12:21:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Also remove VisitRepository

Browse source 
Rely on Hibernate to do lazy loading on visits.
This commit is contained in:
Dave Syer 2022-01-05 08:55:24 +00:00 • committed by Dave Syer
parent a5da14ae2f
commit 58fe6298f8
8 changed files with 43 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java
View file

@ -47,7 +47,6 @@ import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
import org.springframework.samples.petclinic.visit.Visit;
import org.springframework.samples.petclinic.visit.VisitRepository;
import org.springframework.test.web.servlet.MockMvc;
/**
@ -66,9 +65,6 @@ class OwnerControllerTests {
@MockBean
private OwnerRepository owners;
@MockBean
private VisitRepository visits;
private Owner george() {
Owner george = new Owner();
george.setId(TEST_OWNER_ID);
@ -91,15 +87,17 @@ class OwnerControllerTests {
@BeforeEach
void setup() {
Owner george = george();
given(this.owners.findByLastName(eq("Franklin"), any(Pageable.class)))
.willReturn(new PageImpl<Owner>(Lists.newArrayList(george())));
.willReturn(new PageImpl<Owner>(Lists.newArrayList(george)));
given(this.owners.findAll(any(Pageable.class))).willReturn(new PageImpl<Owner>(Lists.newArrayList(george())));
given(this.owners.findAll(any(Pageable.class))).willReturn(new PageImpl<Owner>(Lists.newArrayList(george)));
given(this.owners.findById(TEST_OWNER_ID)).willReturn(george());
given(this.owners.findById(TEST_OWNER_ID)).willReturn(george);
Visit visit = new Visit();
visit.setDate(LocalDate.now());
given(this.visits.findByPetId(george().getPet("Max").getId())).willReturn(Collections.singletonList(visit));
visit.setPetId(george.getPet("Max").getId());
george.getPet("Max").getVisits().add(visit);
}

16
src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java
View file

@ -16,19 +16,20 @@
package org.springframework.samples.petclinic.owner;
import static org.mockito.BDDMockito.given;
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.model;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.samples.petclinic.visit.VisitRepository;
import org.springframework.test.web.servlet.MockMvc;
import static org.mockito.BDDMockito.given;
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.*;
/**
* Test class for {@link VisitController}
*
@ -44,9 +45,6 @@ class VisitControllerTests {
@Autowired
private MockMvc mockMvc;
@MockBean
private VisitRepository visits;
@MockBean
private OwnerRepository owners;

11
src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
View file

@ -36,7 +36,6 @@ import org.springframework.samples.petclinic.owner.PetType;
import org.springframework.samples.petclinic.vet.Vet;
import org.springframework.samples.petclinic.vet.VetRepository;
import org.springframework.samples.petclinic.visit.Visit;
import org.springframework.samples.petclinic.visit.VisitRepository;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -76,9 +75,6 @@ class ClinicServiceTests {
@Autowired
protected OwnerRepository owners;
@Autowired
protected VisitRepository visits;
@Autowired
protected VetRepository vets;
@ -205,17 +201,18 @@ class ClinicServiceTests {
Visit visit = new Visit();
pet7.addVisit(visit);
visit.setDescription("test");
this.visits.save(visit);
this.owners.save(owner6);
owner6 = this.owners.findById(6);
assertThat(pet7.getVisits().size()).isEqualTo(found + 1);
assertThat(visit.getId()).isNotNull();
assertThat(pet7.getVisits()).allMatch(value -> value.getId() != null);
}
@Test
void shouldFindVisitsByPetId() throws Exception {
Collection<Visit> visits = this.visits.findByPetId(7);
Owner owner6 = this.owners.findById(6);
Pet pet7 = owner6.getPet(7);
Collection<Visit> visits = pet7.getVisits();
assertThat(visits).hasSize(2);
Visit[] visitArr = visits.toArray(new Visit[visits.size()]);
assertThat(visitArr[0].getDate()).isNotNull();