diff --git a/src/main/java/Superpowers/Human.java b/src/main/java/Superpowers/Human.java index 91ef267..4eabef6 100644 --- a/src/main/java/Superpowers/Human.java +++ b/src/main/java/Superpowers/Human.java @@ -7,4 +7,45 @@ * hero name, super ability. As before, create methods for retrieving field data and printing to screen. */ public class Human { + + private String name; + private int age; + private String gender; + private String occupation; + private String address; + + public Human(){ + + } + + public Human(String name, int age, String gender, String occupation, String address){ + this.name = name; + this.age = age; + this.gender = gender; + this.occupation = occupation; + this.address = address; + + } + + public String getName(){ + return name; + } + + public int getAge() { + return age; + } + + public String getGender(){ + return gender; + } + + public String getOccupation(){ + return occupation; + } + + public String getAddress(){ + return address; + } } + + diff --git a/src/main/java/Superpowers/SuperHuman.java b/src/main/java/Superpowers/SuperHuman.java new file mode 100644 index 0000000..a0f9642 --- /dev/null +++ b/src/main/java/Superpowers/SuperHuman.java @@ -0,0 +1,41 @@ +package Superpowers; + +public class SuperHuman extends Human { + + private boolean good; + private boolean bad; + private String heroName; + private String superAbility; + + + + + + + public SuperHuman(String name, int age, String gender, String occupation, String address, String heroName, String superAbility, boolean good, boolean bad ) { + + super(name, age, gender, occupation, address); + this.good = good; + this.bad = bad; + this.heroName = heroName; + this.superAbility = superAbility; + + + } + + public boolean getGood() { + return good; + } + + public boolean getBad(){ + return bad; + } + + public String getheroName(){ + return heroName; + } + public String getsuperAbility(){ + return superAbility; + } +} + diff --git a/src/test/java/Superpowers/HumanTest.java b/src/test/java/Superpowers/HumanTest.java index cefb2ae..1f66889 100644 --- a/src/test/java/Superpowers/HumanTest.java +++ b/src/test/java/Superpowers/HumanTest.java @@ -1,5 +1,21 @@ package Superpowers; +import org.junit.Assert; +import org.junit.Test; + public class HumanTest { + @Test + public void testFields(){ + Human human = new Human("Bob", 36, "Male", "carpenter", "address"); + + Assert.assertEquals("Bob", human.getName()); + Assert.assertEquals(36, human.getAge()); + Assert.assertEquals("Male", human.getGender()); + Assert.assertEquals("carpenter", human.getOccupation()); + Assert.assertEquals("address", human.getAddress()); + + } + + } diff --git a/src/test/java/Superpowers/TestSuperHuman.java b/src/test/java/Superpowers/TestSuperHuman.java new file mode 100644 index 0000000..069b007 --- /dev/null +++ b/src/test/java/Superpowers/TestSuperHuman.java @@ -0,0 +1,26 @@ +package Superpowers; + +import org.junit.Assert; +import org.junit.Test; + +public class TestSuperHuman { + @Test + public void SuperHumanTest(){ + SuperHuman superHuman = new SuperHuman("Bob", 36, "Male", "carpenter", + "address", "superBeast", "Git What chu Need", true, false ); + + + Assert.assertEquals("superBeast", superHuman.getheroName()); + Assert.assertEquals("Git What chu Need", superHuman.getsuperAbility()); + Assert.assertEquals(true, superHuman.getGood()); + Assert.assertEquals(false, superHuman.getBad()); + + Assert.assertEquals("Bob", superHuman.getName()); + Assert.assertEquals(36, superHuman.getAge()); + Assert.assertEquals("Male", superHuman.getGender()); + Assert.assertEquals("carpenter", superHuman.getOccupation()); + Assert.assertEquals("address", superHuman.getAddress()); + + } + +}