From b3e5a9bd6cae050aa723a744bbf4fc731501f938 Mon Sep 17 00:00:00 2001 From: laura Date: Sat, 3 Jul 2021 10:49:51 -0400 Subject: [PATCH 1/2] fixing test --- pom.xml | 12 ++++++++++++ .../com/zipcodewilmington/person/Person.java | 18 +++++++++++++++--- .../zipcodewilmington/person/TestPerson.java | 8 +++++--- 3 files changed, 32 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 6d56659..f38e221 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,18 @@ com.zipcodewilmington person 1.0-SNAPSHOT + + + + org.apache.maven.plugins + maven-compiler-plugin + + 11 + 11 + + + + junit diff --git a/src/main/java/com/zipcodewilmington/person/Person.java b/src/main/java/com/zipcodewilmington/person/Person.java index c12425f..5d5a422 100644 --- a/src/main/java/com/zipcodewilmington/person/Person.java +++ b/src/main/java/com/zipcodewilmington/person/Person.java @@ -7,29 +7,41 @@ public class Person { private String name; private int age; - public Person() { + public Person (String name, Integer age){ + this.name = name; + this.age = age; } + + public Person(int age) { + this.age = age; + } public Person(String name) { + this.name = name; } public Person(String name, int age) { + this.name = name; + this.age = age; } public void setName(String name) { + this.name = name; } public void setAge(int age) { + this.age = age; + } public String getName() { - return null; + return name; } public Integer getAge() { - return null; + return age; } } diff --git a/src/test/java/com/zipcodewilmington/person/TestPerson.java b/src/test/java/com/zipcodewilmington/person/TestPerson.java index 59af3b2..db7b508 100644 --- a/src/test/java/com/zipcodewilmington/person/TestPerson.java +++ b/src/test/java/com/zipcodewilmington/person/TestPerson.java @@ -14,7 +14,7 @@ public void testDefaultConstructor() { Integer expectedAge = Integer.MAX_VALUE; // When - Person person = new Person(); + Person person = new Person(expectedName, expectedAge); // Then String actualName = person.getName(); @@ -71,10 +71,11 @@ public void testConstructorWithNameAndAge() { @Test public void testSetName() { // Given - Person person = new Person(); + //Person person = new Person(); String expected = "Leon"; // When + Person person = new Person(expected); person.setName(expected); String actual = person.getName(); @@ -85,10 +86,11 @@ public void testSetName() { @Test public void testSetAge() { // Given - Person person = new Person(); + //Person person = new Person(); Integer expected = 5; // When + Person person = new Person(expected); person.setAge(expected); // Then From a5ea345757824ff195371112e51b10cb8fbad85e Mon Sep 17 00:00:00 2001 From: laura Date: Fri, 16 Jul 2021 17:09:57 -0400 Subject: [PATCH 2/2] person and test --- .../com/zipcodewilmington/person/Person.java | 53 +++++++++++++ .../zipcodewilmington/person/TestPerson.java | 74 +++++++++++++++++++ 2 files changed, 127 insertions(+) diff --git a/src/main/java/com/zipcodewilmington/person/Person.java b/src/main/java/com/zipcodewilmington/person/Person.java index 5d5a422..12d2a28 100644 --- a/src/main/java/com/zipcodewilmington/person/Person.java +++ b/src/main/java/com/zipcodewilmington/person/Person.java @@ -4,8 +4,16 @@ * Created by leon on 2/12/18. */ public class Person { + + private String name; private int age; + private String hairColor; + private int hait; + private String nationality; + private String favColor; + private String favSong; + public Person (String name, Integer age){ this.name = name; @@ -44,4 +52,49 @@ public String getName() { public Integer getAge() { return age; } + + + + public void setHairColor(String hairColor) { + this.hairColor = hairColor; + } + + public String getHairColor() { + return hairColor; + } + + + public void setHait(int hait) { + this.hait = hait; + } + + public int getHait() { + return hait; + } + + + public void setNationality(String nationality) { + this.nationality = nationality; + } + + public String getNationality() { + return nationality; + } + + public void setFavoriteColor(String favColor) { + this.favColor= favColor; + } + + public String getFavoriteColor(){ + return favColor; + } + + + public void setFavoriteSong(String favSong) { + this.favSong = favSong; + } + + public String getFavoriteSong(){ + return favSong; + } } diff --git a/src/test/java/com/zipcodewilmington/person/TestPerson.java b/src/test/java/com/zipcodewilmington/person/TestPerson.java index db7b508..e7fe2d5 100644 --- a/src/test/java/com/zipcodewilmington/person/TestPerson.java +++ b/src/test/java/com/zipcodewilmington/person/TestPerson.java @@ -81,6 +81,7 @@ public void testSetName() { // Then Assert.assertEquals(expected, actual); + System.out.println(actual); } @Test @@ -97,4 +98,77 @@ public void testSetAge() { Integer actual = person.getAge(); Assert.assertEquals(expected, actual); } + + + @Test + public void testHairColorTest() { + //GIVEN + String expected = "blue"; + + //WHEN + Person person = new Person(expected); + person.setHairColor(expected); + String actual = person.getHairColor(); + + //THEN + Assert.assertEquals(expected, actual); + } + + @Test + public void setHaitTest(){ + //GIVEN + int expected = 4; + + //WHEN + Person person = new Person(expected); + person.setHait(expected); + int actual = person.getHait(); + + //THEN + Assert.assertEquals(expected, actual); + } + + @Test + public void setNationalityTest(){ + //GIVEN + String expected = "Mexico"; + + //WHEN + Person person = new Person(expected); + person.setNationality(expected); + String actual = person.getNationality(); + + //THEN + Assert.assertEquals(expected, actual); + } + + @Test + public void setFavoriteColorTest(){ + //GIVEN + String expected = "pink"; + //WHEN + Person person = new Person(expected); + person.setFavoriteColor(expected); + String actual = person.getFavoriteColor(); + //THEN + Assert.assertEquals(expected, actual); + + } + + + + @Test + public void SetFavoriteSong(){ + //GIVEN + String expected = "Dynamite"; + //WHEN + Person person = new Person(expected); + person.setFavoriteSong(expected); + String actual = person.getFavoriteSong(); + //THEN + Assert.assertEquals(expected, actual); + } + + + }