Merge pull request #951 from jackattack24/matchCanonical

Triangle: Update tests to use canonical data

exercises/triangle/.meta/.version

@@ -0,0 +1 @@
+1.0.0

exercises/triangle/.meta/src/reference/java/Triangle.java

@@ -25,7 +25,7 @@ class Triangle {
     }
 
     boolean isIsosceles() {
-        return uniqueSides == 2;
+        return (uniqueSides == 2 || isEquilateral());
     }
 
     boolean isScalene() {

exercises/triangle/src/test/java/TriangleTest.java

@@ -4,6 +4,7 @@ import org.junit.Rule;
 import org.junit.rules.ExpectedException;
 
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 
 public class TriangleTest {
 
@@ -19,24 +20,39 @@ public class TriangleTest {
 
     @Ignore("Remove to run test")
     @Test
-    public void largerEquilateralTrianglesAlsoHaveEqualSides() throws TriangleException {
-        Triangle triangle = new Triangle(10, 10, 10);
+    public void trianglesWithOneUnequalSideAreNotEquilateral() throws TriangleException {
+        Triangle triangle = new Triangle(2, 3, 2);
 
-        assertTrue(triangle.isEquilateral());
+        assertFalse(triangle.isEquilateral());
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void isoscelesTrianglesHaveLastTwoSidesEqual() throws TriangleException {
-        Triangle triangle = new Triangle(3, 4, 4);
+    public void trianglesWithNoEqualSidesAreNotEquilateral() throws TriangleException {
+        Triangle triangle = new Triangle(5, 4, 6);
 
-        assertTrue(triangle.isIsosceles());
+        assertFalse(triangle.isEquilateral());
+    }
+    
+    @Ignore("Remove to run test")
+    @Test
+    public void trianglesWithNoSizeAreIllegal() throws TriangleException {
+        expectedException.expect(TriangleException.class);
+        new Triangle(0, 0, 0);
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void isoscelesTrianglesHaveFirstAndLastSidesEqual() throws TriangleException {
-        Triangle triangle = new Triangle(4, 3, 4);
+    public void verySmallTrianglesCanBeEquilateral() throws TriangleException {
+        Triangle triangle = new Triangle(0.5, 0.5, 0.5);
+
+        assertTrue(triangle.isEquilateral());
+    }
+
+    @Ignore("Remove to run test")
+    @Test
+    public void isoscelesTrianglesHaveLastTwoSidesEqual() throws TriangleException {
+        Triangle triangle = new Triangle(3, 4, 4);
 
         assertTrue(triangle.isIsosceles());
     }
@@ -48,79 +64,82 @@ public class TriangleTest {
 
         assertTrue(triangle.isIsosceles());
     }
-
+    
     @Ignore("Remove to run test")
     @Test
-    public void isoscelesTrianglesHaveInFactExactlyTwoSidesEqual() throws TriangleException {
-        Triangle triangle = new Triangle(10, 10, 2);
+    public void isoscelesTrianglesHaveFirstAndLastSidesEqual() throws TriangleException {
+        Triangle triangle = new Triangle(4, 3, 4);
 
         assertTrue(triangle.isIsosceles());
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void scaleneTrianglesHaveNoEqualSides() throws TriangleException {
-        Triangle triangle = new Triangle(3, 4, 5);
+    public void isoscelesTrianglesCanHaveAllSidesEqual() throws TriangleException {
+        Triangle triangle = new Triangle(4, 4, 4);
 
-        assertTrue(triangle.isScalene());
+        assertTrue(triangle.isIsosceles());
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void scaleneTrianglesHaveNoEqualSidesAtLargerScaleEither() throws TriangleException {
-        Triangle triangle = new Triangle(10, 11, 12);
+    public void isoscelesTrianglesMustHaveAtLeastTwoEqualSides() throws TriangleException {
+        Triangle triangle = new Triangle(2, 3, 4);
 
-        assertTrue(triangle.isScalene());
+        assertFalse(triangle.isIsosceles());
     }
-
+    
     @Ignore("Remove to run test")
     @Test
-    public void scaleneTrianglesHaveNoEqualSidesInDescendingOrderEither() throws TriangleException {
-        Triangle triangle = new Triangle(5, 4, 2);
-
-        assertTrue(triangle.isScalene());
+    public void testSidesThatViolateTriangleInequalityAreNotIsoscelesEvenIfTwoAreEqual() throws TriangleException {
+        expectedException.expect(TriangleException.class);
+        new Triangle(1, 1, 3);
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void verySmallTrianglesAreLegal() throws TriangleException {
-        Triangle triangle = new Triangle(0.4, 0.6, 0.3);
+    public void verySmallTrianglesCanBeIsosceles() throws TriangleException {
+        Triangle triangle = new Triangle(0.5, 0.4, 0.5);
 
-        assertTrue(triangle.isScalene());
+        assertTrue(triangle.isIsosceles());
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void trianglesWithNoSizeAreIllegal() throws TriangleException {
-        expectedException.expect(TriangleException.class);
-        new Triangle(0, 0, 0);
+    public void scaleneTrianglesHaveNoEqualSides() throws TriangleException {
+        Triangle triangle = new Triangle(5, 4, 6);
+
+        assertTrue(triangle.isScalene());
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void trianglesWithNegativeSidesAreIllegal() throws TriangleException {
-        expectedException.expect(TriangleException.class);
-        new Triangle(3, 4, -5);
+    public void trianglesWithAllSidesEqualAreNotScalene() throws TriangleException {
+        Triangle triangle = new Triangle(4, 4, 4);
+
+        assertFalse(triangle.isScalene());
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void trianglesViolatingTriangleInequalityAreIllegal() throws TriangleException {
-        expectedException.expect(TriangleException.class);
-        new Triangle(1, 1, 3);
-    }
+    public void trianglesWithOneUnequalSideAreNotScalene() throws TriangleException {
+        Triangle triangle = new Triangle(4, 4, 3);
 
+        assertFalse(triangle.isScalene());
+    }
+    
     @Ignore("Remove to run test")
     @Test
-    public void trianglesViolatingTriangleInequalityAreIllegal2() throws TriangleException {
+    public void testSidesThatViolateTriangleInequalityAreNotScaleneEvenIfTheyAreAllDifferent() throws TriangleException {
         expectedException.expect(TriangleException.class);
-        new Triangle(2, 5, 2);
+        new Triangle(7, 3, 2);
     }
 
     @Ignore("Remove to run test")
     @Test
-    public void trianglesViolatingTriangleInequalityAreIllegal3() throws TriangleException {
-        expectedException.expect(TriangleException.class);
-        new Triangle(7, 3, 2);
+    public void verySmallTrianglesCanBeScalene() throws TriangleException {
+        Triangle triangle = new Triangle(0.5, 0.4, 0.6);
+
+        assertTrue(triangle.isScalene());
     }
 }