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

Changed original refactoring to use AssertJ instead of JUnit5

Browse source 
Signed-off-by: Elvys Soares <eas5@cin.ufpe.br>
This commit is contained in:
Elvys Soares 2021-05-11 10:46:22 -03:00
parent 7f9ba55331
commit bad53e3e85
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,11 +17,11 @@
package org.springframework.samples.petclinic.service; package org.springframework.samples.petclinic.service;
import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertAll;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Collection; import java.util.Collection;
import org.assertj.core.api.SoftAssertions;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
@ -66,6 +66,7 @@ import org.springframework.transaction.annotation.Transactional;
* @author Sam Brannen * @author Sam Brannen
* @author Michael Isvy * @author Michael Isvy
* @author Dave Syer * @author Dave Syer
* @author Elvys Soares
*/ */
@DataJpaTest(includeFilters = @ComponentScan.Filter(Service.class)) @DataJpaTest(includeFilters = @ComponentScan.Filter(Service.class))
class ClinicServiceTests { class ClinicServiceTests {
@ -94,10 +95,12 @@ class ClinicServiceTests {
@Test @Test
void shouldFindSingleOwnerWithPet() { void shouldFindSingleOwnerWithPet() {
Owner owner = this.owners.findById(1); Owner owner = this.owners.findById(1);
assertAll(() -> assertThat(owner.getLastName()).startsWith("Franklin"), SoftAssertions softly = new SoftAssertions();
() -> assertThat(owner.getPets()).hasSize(1), softly.assertThat(owner.getLastName()).startsWith("Franklin");
() -> assertThat(owner.getPets().get(0).getType()).isNotNull(), softly.assertThat(owner.getPets()).hasSize(1);
() -> assertThat(owner.getPets().get(0).getType().getName()).isEqualTo("cat")); softly.assertThat(owner.getPets().get(0).getType()).isNotNull();
softly.assertThat(owner.getPets().get(0).getType().getName()).isEqualTo("cat");
softly.assertAll();
} }
@Test @Test
@ -137,8 +140,10 @@ class ClinicServiceTests {
@Test @Test
void shouldFindPetWithCorrectId() { void shouldFindPetWithCorrectId() {
Pet pet7 = this.pets.findById(7); Pet pet7 = this.pets.findById(7);
assertAll(() -> assertThat(pet7.getName()).startsWith("Samantha"), SoftAssertions softly = new SoftAssertions();
() -> assertThat(pet7.getOwner().getFirstName()).isEqualTo("Jean")); softly.assertThat(pet7.getName()).startsWith("Samantha");
softly.assertThat(pet7.getOwner().getFirstName()).isEqualTo("Jean");
softly.assertAll();
} }
@Test @Test
@ -192,10 +197,12 @@ class ClinicServiceTests {
void shouldFindVets() { void shouldFindVets() {
Collection<Vet> vets = this.vets.findAll(); Collection<Vet> vets = this.vets.findAll();
Vet vet = EntityUtils.getById(vets, Vet.class, 3); Vet vet = EntityUtils.getById(vets, Vet.class, 3);
assertAll(() -> assertThat(vet.getLastName()).isEqualTo("Douglas"), SoftAssertions softly = new SoftAssertions();
() -> assertThat(vet.getNrOfSpecialties()).isEqualTo(2), softly.assertThat(vet.getLastName()).isEqualTo("Douglas");
() -> assertThat(vet.getSpecialties().get(0).getName()).isEqualTo("dentistry"), softly.assertThat(vet.getNrOfSpecialties()).isEqualTo(2);
() -> assertThat(vet.getSpecialties().get(1).getName()).isEqualTo("surgery")); softly.assertThat(vet.getSpecialties().get(0).getName()).isEqualTo("dentistry");
softly.assertThat(vet.getSpecialties().get(1).getName()).isEqualTo("surgery");
softly.assertAll();
} }
@Test @Test
@ -219,8 +226,10 @@ class ClinicServiceTests {
Collection<Visit> visits = this.visits.findByPetId(7); Collection<Visit> visits = this.visits.findByPetId(7);
assertThat(visits).hasSize(2); assertThat(visits).hasSize(2);
Visit[] visitArr = visits.toArray(new Visit[visits.size()]); Visit[] visitArr = visits.toArray(new Visit[visits.size()]);
assertAll(() -> assertThat(visitArr[0].getDate()).isNotNull(), SoftAssertions softly = new SoftAssertions();
() -> assertThat(visitArr[0].getPetId()).isEqualTo(7)); softly.assertThat(visitArr[0].getDate()).isNotNull();
softly.assertThat(visitArr[0].getPetId()).isEqualTo(7);
softly.assertAll();
} }
} }