Commit 817d6e88 authored by aurian.foulner's avatar aurian.foulner

origin

parent 89aec285
No preview for this file type
No preview for this file type
No preview for this file type
No preview for this file type
public class Rectangle extends Shape{
int height;
int width;
public Rectangle () {
height = 4;
width = 3;
}
public Rectangle (int width, int height) {
this.height = height;
this.width = width;
}
public int getHeight() {return height;}
public int getWidth(){return width;}
public void setHeight(int height){this.height = height;}
public void setWidth(int width){this.width = width;}
public int getSize(){return size;}
public void setSize(int size){this.size = size;}
@Override
public float area () { float area = getHeight() * getWidth();
return area;}
@Override
public float circumference() { float circ = getHeight() + getHeight() + getWidth() +getWidth();
return circ;}
@Override
public void draw() {}
}
public class Square extends Shape{
public Square() {
super();
}
public Square(int i){
super(i);
}
@Override
public float area (){
float fsize = size;
float area = fsize * fsize;
return area;
}
@Override
public float circumference() {
float fsize = size;
float circ = fsize + fsize + fsize + fsize;
return circ;
}
@Override
public void draw(){
}
}
...@@ -83,7 +83,7 @@ public class unitTest { ...@@ -83,7 +83,7 @@ public class unitTest {
@Test @Test
public void testRectangleConstructor() { public void testRectangleConstructor() {
// test default constructor // test default constructor
Shape testShape = new Rectangle(); Rectangle testShape = new Rectangle();
assertEquals(3, testShape.getWidth()); assertEquals(3, testShape.getWidth());
assertEquals(4, testShape.getHeight()); assertEquals(4, testShape.getHeight());
...@@ -96,7 +96,7 @@ public class unitTest { ...@@ -96,7 +96,7 @@ public class unitTest {
@Test @Test
public void testRectangleWidth() { public void testRectangleWidth() {
// test setSize() // test setSize()
Shape testShape = new Rectangle(5,4); Rectangle testShape = new Rectangle(5,4);
testShape.setWidth(6); testShape.setWidth(6);
assertEquals(6, testShape.getWidth()); assertEquals(6, testShape.getWidth());
} }
...@@ -104,7 +104,7 @@ public class unitTest { ...@@ -104,7 +104,7 @@ public class unitTest {
@Test @Test
public void testRectangleHeight() { public void testRectangleHeight() {
// test setSize() // test setSize()
Shape testShape = new Rectangle(78); Rectangle testShape = new Rectangle(7,8);
testShape.setHeight(3); testShape.setHeight(3);
assertEquals(3, testShape.getHeight()); assertEquals(3, testShape.getHeight());
} }
...@@ -112,13 +112,13 @@ public class unitTest { ...@@ -112,13 +112,13 @@ public class unitTest {
@Test @Test
public void testRectangleCircumference() { public void testRectangleCircumference() {
// test circumference() // test circumference()
Shape testShape = new Rectangle(6,3); Rectangle testShape = new Rectangle(6,3);
assertEquals(18.0, testShape.circumference(), 1e-6); assertEquals(18.0, testShape.circumference(), 1e-6);
} }
@Test @Test
public void testRectangleArea() { public void testRectangleArea() {
// test area() // test area()
Shape testShape = new Rectangle(5,7); Rectangle testShape = new Rectangle(5,7);
assertEquals(35.0, testShape.area(), 1e-6); assertEquals(35.0, testShape.area(), 1e-6);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment