From 06e40afe679dc8987a40d28e562e7294246afa1c Mon Sep 17 00:00:00 2001
From: sophiaquach16 <sophiaquach16@gmail.com>
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<Pet> 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 88bc05311ab31ba92a6d16457ace3982db4fa5b1 Mon Sep 17 00:00:00 2001
From: SunXP <roger_lu_dude@hotmail.com>
Date: Sat, 24 Feb 2018 04:51:04 -0500
Subject: [PATCH 2/3] adding more unit tests to for the Owner class

---
 .../samples/petclinic/owner/OwnerTest.java    | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

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..d09c5c1a0 100644
--- a/src/test/java/org/springframework/samples/petclinic/owner/OwnerTest.java
+++ b/src/test/java/org/springframework/samples/petclinic/owner/OwnerTest.java
@@ -2,6 +2,7 @@ package org.springframework.samples.petclinic.owner;
 
 import static org.junit.Assert.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Before;
@@ -63,4 +64,36 @@ public class OwnerTest {
 		assertEquals(pet, onlyPet);
 	}
 
+	@Test
+	public void getPetTest() {	
+		Pet pet = new Pet();
+		pet.setName("Pochi");
+		instance.addPet(pet);
+		
+		assertEquals(pet, instance.getPet("Pochi"));	
+		assertEquals(pet, instance.getPet("Pochi", false)); //tests pet object exists
+		assertEquals(null, instance.getPet("Pochi", true));	//tests pet object doesn't exist
+	}
+	
+	@Test
+	public void getPetsTest() {
+		Pet pet = new Pet();
+		List<Pet> list = new ArrayList<>();
+		list.add(pet);
+		instance.addPet(pet);
+		
+		assertEquals(list, instance.getPets());
+		
+		Pet pet2 = new Pet();
+		list.add(pet2);
+		instance.addPet(pet2);
+		
+		assertEquals(list, instance.getPets());
+	}
+	
+	@Test
+	public void setGetAddress() {
+		instance.setAddress("123 FakeStreet");
+		assertEquals("123 FakeStreet", instance.getAddress());
+	}
 }
\ No newline at end of file

From 6cb72af44358964bc77e5ead942fac007429c07b Mon Sep 17 00:00:00 2001
From: SunXP <roger_lu_dude@hotmail.com>
Date: Sat, 24 Feb 2018 16:08:36 -0500
Subject: [PATCH 3/3] Pulled name change correction from sophiaDev

---
 .../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 d09c5c1a0..ef09a0c73 100644
--- a/src/test/java/org/springframework/samples/petclinic/owner/OwnerTest.java
+++ b/src/test/java/org/springframework/samples/petclinic/owner/OwnerTest.java
@@ -54,7 +54,7 @@ public class OwnerTest {
 	}
 	
 	@Test
-	public void setPetsInternalgetPetsInternalTest() {
+	public void setPetgetPetsTest() {
 		Pet pet = new Pet();
 		instance.addPet(pet);
 		List<Pet> result = instance.getPets();