Finish all the test

YangZhou91 · Feb 24, 2014 · 7e08e66 · 7e08e66
1 parent fa8ad94
commit 7e08e66
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 7 deletions.
diff --git a/TriangleDetector/bin/TriangleDetector.apk b/TriangleDetector/bin/TriangleDetector.apk
diff --git a/TriangleDetector/bin/classes.dex b/TriangleDetector/bin/classes.dex
diff --git a/TriangleDetector/bin/classes/com/mcgill/triangledetector/MyFirstTestActivity$1.class b/TriangleDetector/bin/classes/com/mcgill/triangledetector/MyFirstTestActivity$1.class
diff --git a/TriangleDetector/bin/classes/com/mcgill/triangledetector/MyFirstTestActivity.class b/TriangleDetector/bin/classes/com/mcgill/triangledetector/MyFirstTestActivity.class
diff --git a/TriangleDetector/src/com/mcgill/triangledetector/MyFirstTestActivity.java b/TriangleDetector/src/com/mcgill/triangledetector/MyFirstTestActivity.java
@@ -44,9 +44,15 @@ else if (!validateInputRange(valueA,valueB,valueC)){
         		else if (validateEquilateralTriangle(valueA,valueB,valueC)){
         			output.setText("Equilateral Triangle");	
         		}
-        		else if (validateScaleneTrangle(valueA,valueB,valueC)){
+        		else if (validateScaleneTrangle(valueA,valueB,valueC) &&!validateNotTriangle(valueA, valueB, valueC)){
         			output.setText("Scalene Triangle");	
         		}
+        		else if (validateIsoscelesTriangle(valueA,valueB,valueC)){
+        			output.setText("Isoscalene Triangle");	
+        		}
+        		else if (validateNotTriangle(valueA,valueB,valueC)){
+        			output.setText("It is not a Triangle");	
+        		}
         	}
         });
     }
@@ -147,10 +153,10 @@ public boolean validateNotTriangle(String inputA, String inputB, String inputC)
     	int lengthC = Integer.parseInt(inputC);
 
     	if ((lengthA+lengthB > lengthC) && (lengthA+lengthC > lengthB) && (lengthC+lengthB > lengthA)){
-    		return true;
+    		return false;
     	}
     	else {
-    		return false;
+    		return true;
     	}
 	}
 

diff --git a/TriangleDetectorTests/bin/TriangleDetectorTests.apk b/TriangleDetectorTests/bin/TriangleDetectorTests.apk
diff --git a/TriangleDetectorTests/bin/classes.dex b/TriangleDetectorTests/bin/classes.dex
diff --git a/...DetectorTests/bin/classes/com/mcgill/triangledetector/tests/MyFirstTestActivityTest.class b/...DetectorTests/bin/classes/com/mcgill/triangledetector/tests/MyFirstTestActivityTest.class
diff --git a/TriangleDetectorTests/src/com/mcgill/triangledetector/tests/MyFirstTestActivityTest.java b/TriangleDetectorTests/src/com/mcgill/triangledetector/tests/MyFirstTestActivityTest.java
@@ -139,8 +139,8 @@ public void testNotTriangle(){
 		final String inputA = "50";
 		final String inputB = "20";
 		final String inputC = "40";
-		// The expected result returns true if sum of any two lengths are greater than the other
-		final boolean expected = true;
+		// The expected result returns false if it is a triangle
+		final boolean expected = false;
 		boolean actual = mFirstTestActivity.validateNotTriangle(inputA, inputB, inputC);
 		assertEquals(expected, actual);
 	}
@@ -200,7 +200,7 @@ public void testIntegrationScelesTriangle(){
 		String actual = output.getText().toString();
 		assertEquals(expected, actual);
 	}
-	/*
+
 	@UiThreadTest
 	public void testIntegrationIsoscelesTriangle(){
 		inputA.setText("10");
@@ -211,5 +211,15 @@ public void testIntegrationIsoscelesTriangle(){
 		String actual = output.getText().toString();
 		assertEquals(expected, actual);
 	}
-	*/
+	@UiThreadTest
+	public void testIntegrationNotTriangle(){
+		inputA.setText("100");
+		inputB.setText("10");
+		inputC.setText("2");
+		calculateButton.performClick();
+		final String expected = "It is not a Triangle";
+		String actual = output.getText().toString();
+		assertEquals(expected, actual);
+	}
+
 }