diff --git a/src/test/java/org/springframework/samples/petclinic/owner/OwnerTest.java b/src/test/java/org/springframework/samples/petclinic/owner/OwnerTest.java index effc3c83d..b5609fc82 100644 --- a/src/test/java/org/springframework/samples/petclinic/owner/OwnerTest.java +++ b/src/test/java/org/springframework/samples/petclinic/owner/OwnerTest.java @@ -11,56 +11,58 @@ import org.springframework.core.style.ToStringCreator; public class OwnerTest { - private Owner instance; + private Owner ownerInstance; @Before public void setUp() { - this.instance = new Owner(); + this.ownerInstance = new Owner(); } @Test public void getSetTelephoneTest() { // Owner instance = new Owner(); - instance.setTelephone("514 371 9999"); - String result = instance.getTelephone(); + ownerInstance.setTelephone("514 371 9999"); + String result = ownerInstance.getTelephone(); assertEquals("514 371 9999", result); } @Test public void setGetCityTest() { // Owner instance = new Owner(); - instance.setCity("Montreal"); - String result = instance.getCity(); + ownerInstance.setCity("Montreal"); + String result = ownerInstance.getCity(); assertEquals("Montreal", result); } @Test public void toStringTest() { - ToStringCreator creator = new ToStringCreator(instance); + ToStringCreator creator = new ToStringCreator(ownerInstance); String expected = creator - .append("id", instance.getId()) - .append("new", instance.isNew()) - .append("lastName", instance.getLastName()) - .append("firstName", instance.getFirstName()) - .append("address", instance.getAddress()) - .append("city", instance.getCity()) - .append("telephone", instance.getTelephone()) + .append("id", ownerInstance.getId()) + .append("new", ownerInstance.isNew()) + .append("lastName", ownerInstance.getLastName()) + .append("firstName", ownerInstance.getFirstName()) + .append("address", ownerInstance.getAddress()) + .append("city", ownerInstance.getCity()) + .append("telephone", ownerInstance.getTelephone()) .toString(); - String result = instance.toString(); + String result = ownerInstance.toString(); assertEquals(expected, result); } @Test public void setPetgetPetsTest() { Pet pet = new Pet(); - instance.addPet(pet); - List result = instance.getPets(); + pet.setName("Pogo"); + ownerInstance.addPet(pet); + List result = ownerInstance.getPets(); Pet onlyPet = result.iterator().next(); assertEquals(1, result.size()); // Make sure there's only one element in the Collection returned assertEquals(pet, onlyPet); + assertEquals(pet.getName(), onlyPet.getName()); } } \ No newline at end of file