main

src/App.java

 public class App {
     public static void main(String[] args) throws Exception {
-        Shape shape1 = new Triangle(3);
+        Shape shape1 = new Triangle(8);
         shape1.draw();
+        Shape shape2 = new Square(7);
+        shape2.draw();
+        Shape shape3 = new Rectangle(7, 20);
+        shape3.draw();
+        
     }
 }

src/Rectangle.java

+public class Rectangle extends Shape{
+    // An equilateral triangle
+  
+    public Rectangle() {
+      super();
+    }
+      public Rectangle(int i, int j) {
+      super(i, i, j);
+      
+    }
+  
+    @Override  
+    public void draw() {
+        for (int loop1=0; loop1<width; loop1++){
+            
+            System.out.print("*");
+            for (int loop2=0; loop2<loop1; loop2++){
+              System.out.print("");
+            }
+            for (int loop2=0; loop2<height-1; loop2++){
+              System.out.print("*");
+            }
+          System.out.println(" ");
+        }
+    }
+    
+  
+    @Override
+    public float area() {
+      float area =  height * width;
+      return area;
+    }
+  
+    @Override
+    public float circumference() {
+      float circ = height * width;
+      return circ;
+    }
+   
+  }
+  

src/Shape.java

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

src/Square.java

+public class Square extends Shape{
+    // An equilateral triangle
+  
+    public Square() {
+      super();
+    }
+      public Square(int i) {
+      super(i, i, i);
+    }
+  
+    @Override  
+    public void draw() {
+        for (int loop1=0; loop1<size; loop1++){
+            
+            System.out.print("*");
+            for (int loop2=0; loop2<loop1; loop2++){
+              System.out.print("");
+            }
+            for (int loop2=0; loop2<size-1; loop2++){
+              System.out.print("*");
+            }
+          System.out.println(" ");
+        }
+      }
+    
+  
+    @Override
+    public float area() {
+      float fSize = size;
+      float area = 1f * fSize * fSize ;
+      return area;
+    }
+  
+    @Override
+    public float circumference() {
+      float fSize = size;
+      float circ = fSize + fSize +fSize + fSize;
+      return circ;
+    }
+  
+  }
+  

src/Triangle.java

@@ -5,7 +5,7 @@ public class Triangle extends Shape{
     super();
   }
     public Triangle(int i) {
-    super(i);
+    super(i, i, i);
   }
 
   @Override  

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()); 
   }