From 2adf3841931bb79a7341951015068deec2da6e8b Mon Sep 17 00:00:00 2001
From: AnthonyF525 <Anthony.falice@yahoo.com>
Date: Mon, 28 Jul 2025 12:02:02 -0400
Subject: [PATCH 1/3] For Pull request

---
 .../java/com/zipcodewilmington/assessment1/Cat.java |  4 ++--
 .../java/com/zipcodewilmington/assessment1/Pet.java | 13 +++++++++++--
 .../com/zipcodewilmington/assessment1/PetOwner.java |  2 ++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zipcodewilmington/assessment1/Cat.java b/src/main/java/com/zipcodewilmington/assessment1/Cat.java
index 1cf2894..bd32ffa 100644
--- a/src/main/java/com/zipcodewilmington/assessment1/Cat.java
+++ b/src/main/java/com/zipcodewilmington/assessment1/Cat.java
@@ -9,7 +9,7 @@ public class Cat extends Pet {
      * @param age age of this Cat
      */
     public Cat(String name, Integer age) {
-
+        super(name, age);
     }
 
     /**
@@ -38,6 +38,6 @@ public Cat() {
      * @return meow as a string
      */
     public String speak() {
-        return null;
+        return "meow";
     }
 }
diff --git a/src/main/java/com/zipcodewilmington/assessment1/Pet.java b/src/main/java/com/zipcodewilmington/assessment1/Pet.java
index afc3e99..6003621 100644
--- a/src/main/java/com/zipcodewilmington/assessment1/Pet.java
+++ b/src/main/java/com/zipcodewilmington/assessment1/Pet.java
@@ -9,12 +9,16 @@ public abstract class Pet implements Animal {
      * by default, pet has age of 0; name of "";
      */
     public Pet() {
+        this.name = "";
+        this.age = 0;
     }
 
     /**
      * @param name name of this pet
      */
     public Pet(String name) {
+        this.name = name;
+        this.age = 0;
     }
 
 
@@ -22,6 +26,8 @@ public Pet(String name) {
      * @param age age of this pet
      */
     public Pet(int age) {
+        this.age = age;
+        this.name = "";
     }
 
     /**
@@ -29,20 +35,22 @@ public Pet(int age) {
      * @param age age of this pet
      */
     public Pet(String name, int age) {
+        this.name = name;
+        this.age = age;
     }
 
     /**
      * @return name of this pet
      */
     public String getName() {
-        return null;
+        return name;
     }
 
     /**
      * @return age of this pet
      */
     public Integer getAge() {
-        return null;
+        return age;
     }
 
     /**
@@ -50,6 +58,7 @@ public Integer getAge() {
      * ensure this instance of `Pet` is added to the owner's composite `pets` list
      */
     public void setOwner(PetOwner newPetOwner) {
+        this.petOwner = newPetOwner;
     }
 
     /**
diff --git a/src/main/java/com/zipcodewilmington/assessment1/PetOwner.java b/src/main/java/com/zipcodewilmington/assessment1/PetOwner.java
index 326ada5..f32cf34 100644
--- a/src/main/java/com/zipcodewilmington/assessment1/PetOwner.java
+++ b/src/main/java/com/zipcodewilmington/assessment1/PetOwner.java
@@ -9,6 +9,8 @@ public class PetOwner {
      * @param pets array of Pet object
      */
     public PetOwner(String name, Pet... pets) {
+        this.name = name;
+        this.pets = pets;
     }
 
     /**

From 546e512a7f31397055041027841da212833bf36c Mon Sep 17 00:00:00 2001
From: AnthonyF525 <Anthony.falice@yahoo.com>
Date: Mon, 28 Jul 2025 12:07:55 -0400
Subject: [PATCH 2/3] Trying to test

---
 src/main/java/com/zipcodewilmington/assessment1/Cat.java | 4 +++-
 src/main/java/com/zipcodewilmington/assessment1/Dog.java | 2 +-
 src/main/java/com/zipcodewilmington/assessment1/Pet.java | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zipcodewilmington/assessment1/Cat.java b/src/main/java/com/zipcodewilmington/assessment1/Cat.java
index bd32ffa..c2e1abe 100644
--- a/src/main/java/com/zipcodewilmington/assessment1/Cat.java
+++ b/src/main/java/com/zipcodewilmington/assessment1/Cat.java
@@ -16,13 +16,14 @@ public Cat(String name, Integer age) {
      * @param age age of this Cat
      */
     public Cat(Integer age) {
+        super(age);
     }
 
     /**
      * @param name name of this Cat
      */
     public Cat(String name) {
-
+        super(name);
     }
 
     /**
@@ -32,6 +33,7 @@ public Cat(String name) {
      * age is 0
      */
     public Cat() {
+        
     }
 
     /**
diff --git a/src/main/java/com/zipcodewilmington/assessment1/Dog.java b/src/main/java/com/zipcodewilmington/assessment1/Dog.java
index bca1c07..277f976 100644
--- a/src/main/java/com/zipcodewilmington/assessment1/Dog.java
+++ b/src/main/java/com/zipcodewilmington/assessment1/Dog.java
@@ -38,6 +38,6 @@ public Dog() {
      * @return bark as a string
      */
     public String speak() {
-        return null;
+        return "bark";
     }
 }
diff --git a/src/main/java/com/zipcodewilmington/assessment1/Pet.java b/src/main/java/com/zipcodewilmington/assessment1/Pet.java
index 6003621..6c10f52 100644
--- a/src/main/java/com/zipcodewilmington/assessment1/Pet.java
+++ b/src/main/java/com/zipcodewilmington/assessment1/Pet.java
@@ -65,6 +65,6 @@ public void setOwner(PetOwner newPetOwner) {
      * @return PetOwner object whose composite `pets` collection contains this Pet instance
      */
     public PetOwner getOwner() {
-        return null;
+        return petOwner;
     }
 }

From 138d5bb9d9bc67140ab97eb60b9f0e648c6670b3 Mon Sep 17 00:00:00 2001
From: AnthonyF525 <Anthony.falice@yahoo.com>
Date: Mon, 28 Jul 2025 12:22:01 -0400
Subject: [PATCH 3/3] test finished

---
 .../java/com/zipcodewilmington/assessment1/Pet.java  | 12 +++++++-----
 .../com/zipcodewilmington/assessment1/PetOwner.java  |  7 ++++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zipcodewilmington/assessment1/Pet.java b/src/main/java/com/zipcodewilmington/assessment1/Pet.java
index 6c10f52..0b60a26 100644
--- a/src/main/java/com/zipcodewilmington/assessment1/Pet.java
+++ b/src/main/java/com/zipcodewilmington/assessment1/Pet.java
@@ -9,8 +9,8 @@ public abstract class Pet implements Animal {
      * by default, pet has age of 0; name of "";
      */
     public Pet() {
-        this.name = "";
-        this.age = 0;
+        String name = "";
+        int age = 0;
     }
 
     /**
@@ -19,6 +19,7 @@ public Pet() {
     public Pet(String name) {
         this.name = name;
         this.age = 0;
+        
     }
 
 
@@ -28,6 +29,7 @@ public Pet(String name) {
     public Pet(int age) {
         this.age = age;
         this.name = "";
+        
     }
 
     /**
@@ -35,8 +37,8 @@ public Pet(int age) {
      * @param age age of this pet
      */
     public Pet(String name, int age) {
-        this.name = name;
-        this.age = age;
+        String name = name;
+        int age = age;
     }
 
     /**
@@ -58,7 +60,7 @@ public Integer getAge() {
      * ensure this instance of `Pet` is added to the owner's composite `pets` list
      */
     public void setOwner(PetOwner newPetOwner) {
-        this.petOwner = newPetOwner;
+        this.PetOwner = newPetOwner;
     }
 
     /**
diff --git a/src/main/java/com/zipcodewilmington/assessment1/PetOwner.java b/src/main/java/com/zipcodewilmington/assessment1/PetOwner.java
index f32cf34..8f71b5e 100644
--- a/src/main/java/com/zipcodewilmington/assessment1/PetOwner.java
+++ b/src/main/java/com/zipcodewilmington/assessment1/PetOwner.java
@@ -10,13 +10,14 @@ public class PetOwner {
      */
     public PetOwner(String name, Pet... pets) {
         this.name = name;
-        this.pets = pets;
+        this.Pets = pets;
     }
 
     /**
      * @param pet pet to be added to the composite collection of Pets
      */
     public void addPet(Pet pet) {
+        this.Pets.add(pet);
     }
 
     /**
@@ -70,13 +71,13 @@ public Integer getNumberOfPets() {
      * @return the name property of the Pet
      */
     public String getName() {
-        return null;
+        return name;
     }
 
     /**
      * @return array representation of animals owned by this PetOwner
      */
     public Pet[] getPets() {
-        return null;
+        return Pets;
     }
 }