From 06e40afe679dc8987a40d28e562e7294246afa1c Mon Sep 17 00:00:00 2001 From: sophiaquach16 Date: Thu, 22 Feb 2018 22:53:01 -0500 Subject: [PATCH 1/3] Added some missing tests for methods in Owner.java class --- .../samples/petclinic/owner/OwnerTest.java | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 src/test/java/org/springframework/samples/petclinic/owner/OwnerTest.java diff --git a/src/test/java/org/springframework/samples/petclinic/owner/OwnerTest.java b/src/test/java/org/springframework/samples/petclinic/owner/OwnerTest.java new file mode 100644 index 000000000..d373fe7eb --- /dev/null +++ b/src/test/java/org/springframework/samples/petclinic/owner/OwnerTest.java @@ -0,0 +1,66 @@ +package org.springframework.samples.petclinic.owner; + +import static org.junit.Assert.*; + +import java.util.List; + +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.springframework.core.style.ToStringCreator; + +public class OwnerTest { + + private Owner instance; + + @Before + public void setUp() { + this.instance = new Owner(); + } + + + @Test + public void getSetTelephoneTest() { + // Owner instance = new Owner(); + instance.setTelephone("514 371 9999"); + String result = instance.getTelephone(); + assertEquals("514 371 9999", result); + } + + @Test + public void setGetCityTest() { + // Owner instance = new Owner(); + instance.setCity("Montreal"); + String result = instance.getCity(); + assertEquals("Montreal", result); + } + + @Test + public void toStringTest() { + ToStringCreator creator = new ToStringCreator(instance); + 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()) + .toString(); + String result = instance.toString(); + assertEquals(expected, result); + } + + @Test + public void setPetsInternalgetPetsInternalTest() { + Pet pet = new Pet(); + instance.addPet(pet); + List result = instance.getPets(); + Pet onlyPet = result.iterator().next(); + + assertEquals(1, result.size()); // Make sure there's only one element in the Collection returned + assertEquals(pet, onlyPet); + } + +} \ No newline at end of file From 7c36089f6f376e126f7a6feb24b536007cbde1ae Mon Sep 17 00:00:00 2001 From: sophiaquach16 Date: Sat, 24 Feb 2018 11:52:42 -0500 Subject: [PATCH 2/3] Changed test name in OwnerTest.java --- .../org/springframework/samples/petclinic/owner/OwnerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d373fe7eb..effc3c83d 100644 --- a/src/test/java/org/springframework/samples/petclinic/owner/OwnerTest.java +++ b/src/test/java/org/springframework/samples/petclinic/owner/OwnerTest.java @@ -53,7 +53,7 @@ public class OwnerTest { } @Test - public void setPetsInternalgetPetsInternalTest() { + public void setPetgetPetsTest() { Pet pet = new Pet(); instance.addPet(pet); List result = instance.getPets(); From d20b9c70023630aa6ce2234d54eb9b1c4c6522b8 Mon Sep 17 00:00:00 2001 From: sophiaquach16 Date: Sat, 24 Feb 2018 19:30:38 -0500 Subject: [PATCH 3/3] Requested changes of OwnerTest.java --- .../samples/petclinic/owner/OwnerTest.java | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) 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