From e20cc21bb6056b22860a292a75a77bc2b061fa63 Mon Sep 17 00:00:00 2001 From: zipcoder Date: Mon, 12 Feb 2018 21:08:12 -0500 Subject: [PATCH 1/3] One Eyed One Horned Flying Purple People Eater --- .../java/com/zipcodewilmington/person/Person.java | 12 ++++++++++-- .../com/zipcodewilmington/person/TestPerson.java | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zipcodewilmington/person/Person.java b/src/main/java/com/zipcodewilmington/person/Person.java index c12425f..750805a 100644 --- a/src/main/java/com/zipcodewilmington/person/Person.java +++ b/src/main/java/com/zipcodewilmington/person/Person.java @@ -8,28 +8,36 @@ public class Person { private int age; public Person() { + name = ""; + age = Integer.MAX_VALUE; } public Person(int age) { + this.age = age; } public Person(String name) { + this.name = name; } public Person(String name, int age) { + this.age = age; + this.name = name; } public void setName(String name) { + this.name = name; } public void setAge(int age) { + this.age = age; } public String getName() { - return null; + return this.name; } public Integer getAge() { - return null; + return this.age; } } diff --git a/src/test/java/com/zipcodewilmington/person/TestPerson.java b/src/test/java/com/zipcodewilmington/person/TestPerson.java index 39d046a..c9148fd 100644 --- a/src/test/java/com/zipcodewilmington/person/TestPerson.java +++ b/src/test/java/com/zipcodewilmington/person/TestPerson.java @@ -34,7 +34,7 @@ public void testConstructorWithAge(){ Integer expected = 5; Person person = new Person(expected); person.setAge(expected); - String actual = person.getName(); + Integer actual = person.getAge(); Assert.assertEquals(expected, actual); } From 8299093c758ea249d5b4cbcfbbb56c8524ce2160 Mon Sep 17 00:00:00 2001 From: zipcoder Date: Tue, 13 Feb 2018 08:07:25 -0500 Subject: [PATCH 2/3] Final commit, more methods and tests added --- .../com/zipcodewilmington/person/Person.java | 24 +++++++++++++++++ .../zipcodewilmington/person/TestPerson.java | 27 +++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/src/main/java/com/zipcodewilmington/person/Person.java b/src/main/java/com/zipcodewilmington/person/Person.java index 750805a..a559d71 100644 --- a/src/main/java/com/zipcodewilmington/person/Person.java +++ b/src/main/java/com/zipcodewilmington/person/Person.java @@ -6,10 +6,14 @@ public class Person { private String name; private int age; + private String favoriteColor; + private String favoriteAnimal; public Person() { name = ""; age = Integer.MAX_VALUE; + favoriteColor = ""; + favoriteAnimal = ""; } public Person(int age) { @@ -40,4 +44,24 @@ public String getName() { public Integer getAge() { return this.age; } + + public void setFavoriteColor(String color) { + this.favoriteColor = color; + } + + public String getFavoriteColor() { + return favoriteColor; + } + + public void setFavoriteColorToGreen() { + this.favoriteColor = "Green"; + } + + public void setFavoriteAnimal(String animal) { + this.favoriteAnimal = animal; + } + + public String getFavoriteAnimal() { + return favoriteAnimal; + } } diff --git a/src/test/java/com/zipcodewilmington/person/TestPerson.java b/src/test/java/com/zipcodewilmington/person/TestPerson.java index c9148fd..ecda9fa 100644 --- a/src/test/java/com/zipcodewilmington/person/TestPerson.java +++ b/src/test/java/com/zipcodewilmington/person/TestPerson.java @@ -73,4 +73,31 @@ public void testSetAge() { Integer actual = person.getAge(); Assert.assertEquals(expected, actual); } + + @Test + public void testSetFavoriteColorToGreen() { + Person person = new Person(); + String expected = "Green"; + person.setFavoriteColorToGreen(); + String actual = person.getFavoriteColor(); + Assert.assertEquals(expected, actual); + } + + @Test + public void testSetFavoriteColor() { + Person person = new Person(); + String expected = "Red"; + person.setFavoriteColor("Red"); + String actual = person.getFavoriteColor(); + Assert.assertEquals(expected, actual); + } + + @Test + public void testSetFavoriteAnimal() { + Person person = new Person(); + String expected = "Lion"; + person.setFavoriteAnimal("Lion"); + String actual = person.getFavoriteAnimal(); + Assert.assertEquals(expected, actual); + } } From 286007217ab00f9688e701a44723936778ae48ad Mon Sep 17 00:00:00 2001 From: Mitch Taylor Date: Thu, 15 Feb 2018 12:32:59 -0500 Subject: [PATCH 3/3] More fields and tests --- .../com/zipcodewilmington/person/Person.java | 20 +++++++++ .../zipcodewilmington/person/TestPerson.java | 45 +++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/src/main/java/com/zipcodewilmington/person/Person.java b/src/main/java/com/zipcodewilmington/person/Person.java index a559d71..db75b09 100644 --- a/src/main/java/com/zipcodewilmington/person/Person.java +++ b/src/main/java/com/zipcodewilmington/person/Person.java @@ -8,12 +8,15 @@ public class Person { private int age; private String favoriteColor; private String favoriteAnimal; + private String favoriteGame; + private double height; public Person() { name = ""; age = Integer.MAX_VALUE; favoriteColor = ""; favoriteAnimal = ""; + favoriteGame = ""; } public Person(int age) { @@ -64,4 +67,21 @@ public void setFavoriteAnimal(String animal) { public String getFavoriteAnimal() { return favoriteAnimal; } + + public void setFavoriteGame(String game) { + this.favoriteGame = game; + } + + public String getFavoriteGame() { + return favoriteGame; + } + + public void setHeight(double height) { + this.height = height; + } + + public double getHeight() { + return height; + } + } diff --git a/src/test/java/com/zipcodewilmington/person/TestPerson.java b/src/test/java/com/zipcodewilmington/person/TestPerson.java index ecda9fa..cfba905 100644 --- a/src/test/java/com/zipcodewilmington/person/TestPerson.java +++ b/src/test/java/com/zipcodewilmington/person/TestPerson.java @@ -100,4 +100,49 @@ public void testSetFavoriteAnimal() { String actual = person.getFavoriteAnimal(); Assert.assertEquals(expected, actual); } + + @Test + public void testGetFavoriteAnimal() { + Person person = new Person(); + String expected = "Tiger"; + person.setFavoriteAnimal("Tiger"); + String actual = person.getFavoriteAnimal(); + Assert.assertEquals(expected, actual); + } + + @Test + public void testSetFavoriteGame() { + Person person = new Person(); + String expected = "Call of War Battle Game"; + person.setFavoriteGame("Call of War Battle Game"); + String actual = person.getFavoriteAnimal(); + Assert.assertEquals(expected, actual); + } + + @Test + public void testGetFavoriteGame() { + Person person = new Person(); + String expected = "Shoot Bang Gun Shooter"; + person.setFavoriteGame("Shoot Bang Gun Shooter"); + String actual = person.getFavoriteAnimal(); + Assert.assertEquals(expected, actual); + } + + @Test + public void testSetHeight() { + Person person = new Person(); + double expected = 6.1; + person.setHeight(6.1); + double actual = person.getHeight(); + Assert.assertEquals(expected, actual); + } + + @Test + public void testGetHeight() { + Person person = new Person(); + double expected = 6.2; + person.setHeight(6.2); + double actual = person.getHeight(); + Assert.assertEquals(expected, actual); + } }