|
|
@@ -3,7 +3,7 @@ import org.junit.Ignore;
|
|
3
|
3
|
import org.junit.Rule;
|
|
4
|
4
|
import org.junit.rules.ExpectedException;
|
|
5
|
5
|
|
|
6
|
|
-import static org.junit.Assert.assertEquals;
|
|
|
6
|
+import static org.junit.Assert.assertTrue;
|
|
7
|
7
|
|
|
8
|
8
|
public class TriangleTest {
|
|
9
|
9
|
|
|
|
@@ -14,7 +14,7 @@ public class TriangleTest {
|
|
14
|
14
|
public void equilateralTrianglesHaveEqualSides() throws TriangleException {
|
|
15
|
15
|
Triangle triangle = new Triangle(2, 2, 2);
|
|
16
|
16
|
|
|
17
|
|
- assertEquals(true, triangle.isEquilateral());
|
|
|
17
|
+ assertTrue(triangle.isEquilateral());
|
|
18
|
18
|
}
|
|
19
|
19
|
|
|
20
|
20
|
@Ignore("Remove to run test")
|
|
|
@@ -22,7 +22,7 @@ public class TriangleTest {
|
|
22
|
22
|
public void largerEquilateralTrianglesAlsoHaveEqualSides() throws TriangleException {
|
|
23
|
23
|
Triangle triangle = new Triangle(10, 10, 10);
|
|
24
|
24
|
|
|
25
|
|
- assertEquals(true, triangle.isEquilateral());
|
|
|
25
|
+ assertTrue(triangle.isEquilateral());
|
|
26
|
26
|
}
|
|
27
|
27
|
|
|
28
|
28
|
@Ignore("Remove to run test")
|
|
|
@@ -30,7 +30,7 @@ public class TriangleTest {
|
|
30
|
30
|
public void isoscelesTrianglesHaveLastTwoSidesEqual() throws TriangleException {
|
|
31
|
31
|
Triangle triangle = new Triangle(3, 4, 4);
|
|
32
|
32
|
|
|
33
|
|
- assertEquals(true, triangle.isIsosceles());
|
|
|
33
|
+ assertTrue(triangle.isIsosceles());
|
|
34
|
34
|
}
|
|
35
|
35
|
|
|
36
|
36
|
@Ignore("Remove to run test")
|
|
|
@@ -38,7 +38,7 @@ public class TriangleTest {
|
|
38
|
38
|
public void isoscelesTrianglesHaveFirstAndLastSidesEqual() throws TriangleException {
|
|
39
|
39
|
Triangle triangle = new Triangle(4, 3, 4);
|
|
40
|
40
|
|
|
41
|
|
- assertEquals(true, triangle.isIsosceles());
|
|
|
41
|
+ assertTrue(triangle.isIsosceles());
|
|
42
|
42
|
}
|
|
43
|
43
|
|
|
44
|
44
|
@Ignore("Remove to run test")
|
|
|
@@ -46,7 +46,7 @@ public class TriangleTest {
|
|
46
|
46
|
public void isoscelesTrianglesHaveTwoFirstSidesEqual() throws TriangleException {
|
|
47
|
47
|
Triangle triangle = new Triangle(4, 4, 3);
|
|
48
|
48
|
|
|
49
|
|
- assertEquals(true, triangle.isIsosceles());
|
|
|
49
|
+ assertTrue(triangle.isIsosceles());
|
|
50
|
50
|
}
|
|
51
|
51
|
|
|
52
|
52
|
@Ignore("Remove to run test")
|
|
|
@@ -54,7 +54,7 @@ public class TriangleTest {
|
|
54
|
54
|
public void isoscelesTrianglesHaveInFactExactlyTwoSidesEqual() throws TriangleException {
|
|
55
|
55
|
Triangle triangle = new Triangle(10, 10, 2);
|
|
56
|
56
|
|
|
57
|
|
- assertEquals(true, triangle.isIsosceles());
|
|
|
57
|
+ assertTrue(triangle.isIsosceles());
|
|
58
|
58
|
}
|
|
59
|
59
|
|
|
60
|
60
|
@Ignore("Remove to run test")
|
|
|
@@ -62,7 +62,7 @@ public class TriangleTest {
|
|
62
|
62
|
public void scaleneTrianglesHaveNoEqualSides() throws TriangleException {
|
|
63
|
63
|
Triangle triangle = new Triangle(3, 4, 5);
|
|
64
|
64
|
|
|
65
|
|
- assertEquals(true, triangle.isScalene());
|
|
|
65
|
+ assertTrue(triangle.isScalene());
|
|
66
|
66
|
}
|
|
67
|
67
|
|
|
68
|
68
|
@Ignore("Remove to run test")
|
|
|
@@ -70,7 +70,7 @@ public class TriangleTest {
|
|
70
|
70
|
public void scaleneTrianglesHaveNoEqualSidesAtLargerScaleEither() throws TriangleException {
|
|
71
|
71
|
Triangle triangle = new Triangle(10, 11, 12);
|
|
72
|
72
|
|
|
73
|
|
- assertEquals(true, triangle.isScalene());
|
|
|
73
|
+ assertTrue(triangle.isScalene());
|
|
74
|
74
|
}
|
|
75
|
75
|
|
|
76
|
76
|
@Ignore("Remove to run test")
|
|
|
@@ -78,7 +78,7 @@ public class TriangleTest {
|
|
78
|
78
|
public void scaleneTrianglesHaveNoEqualSidesInDescendingOrderEither() throws TriangleException {
|
|
79
|
79
|
Triangle triangle = new Triangle(5, 4, 2);
|
|
80
|
80
|
|
|
81
|
|
- assertEquals(true, triangle.isScalene());
|
|
|
81
|
+ assertTrue(triangle.isScalene());
|
|
82
|
82
|
}
|
|
83
|
83
|
|
|
84
|
84
|
@Ignore("Remove to run test")
|
|
|
@@ -86,7 +86,7 @@ public class TriangleTest {
|
|
86
|
86
|
public void verySmallTrianglesAreLegal() throws TriangleException {
|
|
87
|
87
|
Triangle triangle = new Triangle(0.4, 0.6, 0.3);
|
|
88
|
88
|
|
|
89
|
|
- assertEquals(true, triangle.isScalene());
|
|
|
89
|
+ assertTrue(triangle.isScalene());
|
|
90
|
90
|
}
|
|
91
|
91
|
|
|
92
|
92
|
@Ignore("Remove to run test")
|