From bffd6946ab9eabf05585aa84bd8ef331063e6c94 Mon Sep 17 00:00:00 2001 From: ashenafee Date: Mon, 27 Sep 2021 17:39:59 -0400 Subject: [PATCH] Created class Dog, and its respective tests; DogTest. Added two different Dog objects to the main method in Trader. --- src/main/java/Dog.java | 33 +++++++++++++++++++++++++++++++++ src/main/java/Trader.java | 4 +++- src/test/java/DogTest.java | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 src/main/java/Dog.java create mode 100644 src/test/java/DogTest.java diff --git a/src/main/java/Dog.java b/src/main/java/Dog.java new file mode 100644 index 0000000..821dbb8 --- /dev/null +++ b/src/main/java/Dog.java @@ -0,0 +1,33 @@ +public class Dog implements Tradable, Domesticatable { + + private int i1; + private String s1; + + public Dog(String breed) { + this.s1 = breed; + + if (breed.equals("Chihuahua")) { + this.i1 = 5; + } else if (breed.equals("Labrador")) { + this.i1 = 10; + } else if (breed.equals("Golden Retriever")) { + this.i1 = 15; + } else if (breed.equals("German Shepherd")) { + this.i1 = 20; + } + } + + @Override + public String sound() { + return "Woof!"; + } + + @Override + public int getPrice() { + return this.i1; + } + + public String getBreed() { + return this.s1; + } +} diff --git a/src/main/java/Trader.java b/src/main/java/Trader.java index 7d4d1f4..8cb7428 100644 --- a/src/main/java/Trader.java +++ b/src/main/java/Trader.java @@ -96,8 +96,10 @@ public static void main(String[] args) { List all_items = Arrays.asList( new Horse(), new Horse(), - new Horse() + new Horse(), // TODO: Add Tradable objects here! + new Dog("Labrador"), + new Dog("German Shepherd") ); /* Below, we've created two Traders. Their money, inventory, and diff --git a/src/test/java/DogTest.java b/src/test/java/DogTest.java new file mode 100644 index 0000000..e6f54d4 --- /dev/null +++ b/src/test/java/DogTest.java @@ -0,0 +1,34 @@ +import org.junit.Before; +import org.junit.Test; +import static org.junit.Assert.*; + +public class DogTest { + Dog c; + Dog gs; + + @Before + public void setUp() { + c = new Dog("Chihuahua"); + gs = new Dog("German Shepherd"); + } + + @Test(timeout=50) + public void TestGetBreed() { + assertEquals("Chihuahua", c.getBreed()); + assertEquals("German Shepherd", gs.getBreed()); + } + + @Test(timeout=50) + public void TestGetPrice() { + assertEquals(5, c.getPrice()); + assertEquals(20, gs.getPrice()); + } + + @Test(timeout=50) + public void TestSound() { + assertEquals("Woof!", c.sound()); + assertEquals("Woof!", gs.sound()); + assertEquals(c.sound(), gs.sound()); + } + +}