Exercise Completed

src/App.java

 public class App {
     public static void main(String[] args) throws Exception {
-        Shape shape1 = new Triangle(3);
-        shape1.draw();
+        Shape shape1 = new Rectangle(5, 6);
+        shape1.getHeight();
     }
 }

src/Rectangle.java

+public class Rectangle extends Shape{
+
+    protected int width;
+    protected int height;
+    
+    public Rectangle() {
+        width = 3;
+        height = 4;
+    }
+
+    public Rectangle(int w, int h) {
+        width = w;
+        height = h;
+    }
+
+    public int getWidth() {
+        return width;
+    }
+
+    public void setWidth(int w) {
+        width = w;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public void setHeight(int h) {
+        height = h;
+    }
+
+    public float area() {
+        return (width * height);
+    }
+
+    public float circumference() {
+        return ((width * 2) + (height * 2));
+    }
+
+    public void draw() {
+        for (int i = 0; i < height; i++) {
+            String temp = "@ ".repeat(width);
+            System.out.println(temp);
+        }
+    }
+}

src/Shape.java

 abstract public class Shape {
 
   protected int size;
+  protected int height;
+  protected int width;
 
   abstract public void draw();
   abstract public float area();
@@ -9,6 +11,12 @@ abstract public class Shape {
   public int getSize() { return size; }
   public void setSize(int size) { this.size = size; }
 
+  public int getHeight() { return height; }
+  public void setHeight(int h) { height = h; }
+
+  public int getWidth() { return width; }
+  public void setWidth(int w) { width = w; }
+
   public Shape(){
     this.size = 3;
   }

src/Square.java

+public class Square extends Shape{
+
+    public Square() {
+        size = 3;
+    }
+
+    public Square(int i) {
+        size = i;
+    }
+    
+    public float area() {
+        return size * size;
+    }
+
+    public float circumference() {
+        return (size * 4);
+    }
+
+    public void draw() {
+        for (int i = 0; i < size; i++) {
+            String temp = "@ ".repeat(size);
+            System.out.print(temp);
+            System.out.println("");
+        }
+    }
+
+}

src/unitTest.java

@@ -104,7 +104,7 @@ public class unitTest {
   @Test
   public void testRectangleHeight() {  
     // test setSize()
-    Shape testShape = new Rectangle(78);
+    Shape testShape = new Rectangle(7,8);
     testShape.setHeight(3);
     assertEquals(3, testShape.getHeight()); 
   }