Patrick.Sy/spring-petclinic
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-23 00:05:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[FIX] Adjusted some of the code formatting and an assertEquals in the PetTests. Also, attempted to mock out the storage dependency purely for testing; however, since isolating the core application's spring-based use of db was more difficult than expected; the code was removed.

Browse source
This commit is contained in:
Jad Malek 2018-02-24 16:58:23 -05:00
parent 6fbaa583cb
commit 36d98e5949
2 changed files with 62 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/test/java/org/springframework/samples/petclinic/owner/PetTests.java
View file

@ -12,22 +12,22 @@ import java.time.*;
import java.util.Date; import java.util.Date;
public class PetTests { public class PetTests {
private Pet pet; private Pet pet;
private Date birthDate; private Date birthDate;
private void establishCurrentDateForTesting() { private void establishCurrentDateForTesting() {
LocalDateTime timePoint = LocalDateTime.now(); LocalDateTime timePoint = LocalDateTime.now();
LocalDate localDate = timePoint.toLocalDate(); LocalDate localDate = timePoint.toLocalDate();
birthDate = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant()); birthDate = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
} }
@Before @Before
public void testSetUp() { public void testSetUp() {
this.pet = new Pet(); this.pet = new Pet();
PetType dog = new PetType(); PetType dog = new PetType();
dog.setId(9); dog.setId(9);
dog.setName("Duncan Jones"); dog.setName("Duncan Jones");
} }
@Test @Test
@ -38,7 +38,7 @@ public class PetTests {
Date resultOfGetDate = pet.getBirthDate(); Date resultOfGetDate = pet.getBirthDate();
assertEquals(this.birthDate, resultOfGetDate); assertEquals(this.birthDate, resultOfGetDate);
} }
@Test @Test
public void testSetAndGetType() { public void testSetAndGetType() {
//Creating a new pet type to test the setters and getters for pet's type //Creating a new pet type to test the setters and getters for pet's type
@ -49,7 +49,7 @@ public class PetTests {
PetType resultOfGetType = pet.getType(); PetType resultOfGetType = pet.getType();
assertEquals(walrus, resultOfGetType); assertEquals(walrus, resultOfGetType);
} }
@Test @Test
public void testSetAndGetOwner() { public void testSetAndGetOwner() {
//Creating a new owner type to test the setters and getters for the pet's owner //Creating a new owner type to test the setters and getters for the pet's owner
@ -58,7 +58,7 @@ public class PetTests {
Owner resultOfGetOwner = pet.getOwner(); Owner resultOfGetOwner = pet.getOwner();
assertEquals(amandeepBhandal, resultOfGetOwner); assertEquals(amandeepBhandal, resultOfGetOwner);
} }
@Test @Test
public void testSetAndGetVisitsInternal() { public void testSetAndGetVisitsInternal() {
//Creating a new set of visits, albeit an empty set, to test the setters and getters for the pet's visits //Creating a new set of visits, albeit an empty set, to test the setters and getters for the pet's visits
@ -67,7 +67,7 @@ public class PetTests {
Set<Visit> resultOfGetVisitsInternal = pet.getVisitsInternal(); Set<Visit> resultOfGetVisitsInternal = pet.getVisitsInternal();
assertEquals(visitsForTesting, resultOfGetVisitsInternal); assertEquals(visitsForTesting, resultOfGetVisitsInternal);
} }
@Test @Test
public void testAddVisitAndGetVisits() { public void testAddVisitAndGetVisits() {
//Creating a new set of visits, albeit an empty set, to test the setters and getters for the pet's visits //Creating a new set of visits, albeit an empty set, to test the setters and getters for the pet's visits
@ -76,6 +76,6 @@ public class PetTests {
List<Visit> resultOfGetVisits = pet.getVisits(); List<Visit> resultOfGetVisits = pet.getVisits();
Visit onlyVisitInCollection = resultOfGetVisits.iterator().next(); Visit onlyVisitInCollection = resultOfGetVisits.iterator().next();
assertEquals(1, resultOfGetVisits.size()); assertEquals(1, resultOfGetVisits.size());
assertEquals(visitForTesting, onlyVisitInCollection); assertEquals(visitForTesting.getId(), onlyVisitInCollection.getId());
} }
} }

104
src/test/java/org/springframework/samples/petclinic/owner/PetValidatorTests.java
View file

@ -16,97 +16,97 @@ public class PetValidatorTests {
public void testValidationWithValidName() { public void testValidationWithValidName() {
//given //given
PetValidator petValidator = new PetValidator(); PetValidator petValidator = new PetValidator();
Pet validPet = new Pet(); Pet validPet = new Pet();
validPet.setName("Peter"); validPet.setName("Peter");
Errors errors = new BeanPropertyBindingResult(validPet, ""); Errors errors = new BeanPropertyBindingResult(validPet, "");
//when //when
petValidator.validate(validPet, errors); petValidator.validate(validPet, errors);
//then //then
assertNull(errors.getFieldError("name")); assertNull(errors.getFieldError("name"));
} }
@Test @Test
public void testValidationWithInvalidName() { public void testValidationWithInvalidName() {
//given //given
PetValidator petValidator = new PetValidator(); PetValidator petValidator = new PetValidator();
Pet invalidPet = new Pet(); Pet invalidPet = new Pet();
invalidPet.setName(""); invalidPet.setName("");
Errors errors = new BeanPropertyBindingResult(invalidPet, ""); Errors errors = new BeanPropertyBindingResult(invalidPet, "");
//when //when
petValidator.validate(invalidPet, errors); petValidator.validate(invalidPet, errors);
//then //then
assertTrue(errors.hasErrors()); assertTrue(errors.hasErrors());
} }
@Test @Test
public void testValidationWithValidType() { public void testValidationWithValidType() {
//given //given
PetValidator petValidator = new PetValidator(); PetValidator petValidator = new PetValidator();
Pet validPet = new Pet(); Pet validPet = new Pet();
PetType tiger = new PetType(); PetType tiger = new PetType();
tiger.setId(24); tiger.setId(24);
validPet.setType(tiger); validPet.setType(tiger);
Errors errors = new BeanPropertyBindingResult(validPet, ""); Errors errors = new BeanPropertyBindingResult(validPet, "");
//when //when
petValidator.validate(validPet, errors); petValidator.validate(validPet, errors);
//then //then
assertNull(errors.getFieldError("type")); assertNull(errors.getFieldError("type"));
} }
@Test @Test
public void testValidationWithInvalidType() { public void testValidationWithInvalidType() {
//given //given
PetValidator petValidator = new PetValidator(); PetValidator petValidator = new PetValidator();
Pet invalidPet = new Pet(); Pet invalidPet = new Pet();
PetType emptyType = null; PetType emptyType = null;
invalidPet.setType(emptyType); invalidPet.setType(emptyType);
Errors errors = new BeanPropertyBindingResult(invalidPet, ""); Errors errors = new BeanPropertyBindingResult(invalidPet, "");
//when //when
petValidator.validate(invalidPet, errors); petValidator.validate(invalidPet, errors);
//then //then
assertTrue(errors.hasErrors()); assertTrue(errors.hasErrors());
} }
@Test @Test
public void testValidationWithValidBirthDate() { public void testValidationWithValidBirthDate() {
//given //given
PetValidator petValidator = new PetValidator(); PetValidator petValidator = new PetValidator();
Pet validPet = new Pet(); Pet validPet = new Pet();
LocalDateTime timePoint = LocalDateTime.now(); LocalDateTime timePoint = LocalDateTime.now();
LocalDate localDate = timePoint.toLocalDate(); LocalDate localDate = timePoint.toLocalDate();
Date birthDate = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant()); Date birthDate = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
validPet.setBirthDate(birthDate); validPet.setBirthDate(birthDate);
Errors errors = new BeanPropertyBindingResult(validPet, ""); Errors errors = new BeanPropertyBindingResult(validPet, "");
//when //when
petValidator.validate(validPet, errors); petValidator.validate(validPet, errors);
//then //then
assertNull(errors.getFieldError("birthDate")); assertNull(errors.getFieldError("birthDate"));
} }
@Test @Test
public void testValidationWithInvalidBirthDate() { public void testValidationWithInvalidBirthDate() {
//given //given
PetValidator petValidator = new PetValidator(); PetValidator petValidator = new PetValidator();
Pet invalidPet = new Pet(); Pet invalidPet = new Pet();
Date birthDate = null; Date birthDate = null;
invalidPet.setBirthDate(birthDate); invalidPet.setBirthDate(birthDate);
Errors errors = new BeanPropertyBindingResult(invalidPet, ""); Errors errors = new BeanPropertyBindingResult(invalidPet, "");
//when //when
petValidator.validate(invalidPet, errors); petValidator.validate(invalidPet, errors);
//then //then
assertTrue(errors.hasErrors()); assertTrue(errors.hasErrors());
} }
} }