fixing type matches and type and detection point matches

jtmelton · Feb 5, 2015 · e45e824 · e45e824
1 parent d02912a
commit e45e824
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/appsensor-core/src/test/java/org/owasp/appsensor/core/DetectionPointTest.java b/appsensor-core/src/test/java/org/owasp/appsensor/core/DetectionPointTest.java
@@ -8,15 +8,15 @@ public class DetectionPointTest {
 	@Test(expected=IllegalArgumentException.class)
 	public void testTypeMatchesNull() {
 		DetectionPoint point1 = new DetectionPoint();
-		point1.typeMatches(null);
+		point1.typeAndThresholdMatches(null);
 	}
 
 	@Test
 	public void testTypeMatchesEmptyDetectionPoints() {
 		DetectionPoint point1 = new DetectionPoint();
 		DetectionPoint point2 = new DetectionPoint();
 
-		Assert.assertTrue(point1.typeMatches(point2));
+		Assert.assertTrue(point1.typeAndThresholdMatches(point2));
 	}
 
 	@Test
@@ -26,7 +26,7 @@ public void testTypeMatchesFullMismatch() {
 		DetectionPoint point2 = new DetectionPoint("b", "b1", 
 				new Threshold(5, new Interval(2, Interval.SECONDS)));
 
-		Assert.assertFalse(point1.typeMatches(point2));
+		Assert.assertFalse(point1.typeAndThresholdMatches(point2));
 	}
 
 	@Test
@@ -36,7 +36,7 @@ public void testTypeMatchesCategoryMismatch() {
 		DetectionPoint point2 = new DetectionPoint("a", "b1", 
 				new Threshold(5, new Interval(2, Interval.SECONDS)));
 
-		Assert.assertFalse(point1.typeMatches(point2));
+		Assert.assertFalse(point1.typeAndThresholdMatches(point2));
 	}
 
 	@Test
@@ -46,7 +46,7 @@ public void testTypeMatchesLabelMismatch() {
 		DetectionPoint point2 = new DetectionPoint("b", "a1", 
 				new Threshold(5, new Interval(2, Interval.SECONDS)));
 
-		Assert.assertFalse(point1.typeMatches(point2));
+		Assert.assertFalse(point1.typeAndThresholdMatches(point2));
 	}
 
 	@Test
@@ -56,7 +56,7 @@ public void testTypeMatchesThresholdMismatch() {
 		DetectionPoint point2 = new DetectionPoint("a", "a1", 
 				new Threshold(5, new Interval(2, Interval.SECONDS)));
 
-		Assert.assertTrue(point1.typeMatches(point2));
+		Assert.assertFalse(point1.typeAndThresholdMatches(point2));
 	}
 
 	@Test
@@ -66,7 +66,7 @@ public void testTypeMatchesThresholdMatch() {
 		DetectionPoint point2 = new DetectionPoint("a", "a1", 
 				new Threshold(5, new Interval(1, Interval.SECONDS)));
 
-		Assert.assertTrue(point1.typeMatches(point2));
+		Assert.assertTrue(point1.typeAndThresholdMatches(point2));
 	}