Add assertNotWithinRange() and add tests for both methods.

cakephp · Dec 26, 2014 · 60600fd · 60600fd
1 parent d5efea3
commit 60600fd
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 0 deletions.
diff --git a/src/TestSuite/TestCase.php b/src/TestSuite/TestCase.php
@@ -510,6 +510,21 @@ protected static function assertWithinRange($expected, $result, $margin, $messag
 		static::assertTrue((($expected <= $upper) && ($expected >= $lower)), $message);
 	}
 
+/**
+ * Compatibility function to test if a value is not between an acceptable range.
+ *
+ * @param float $expected
+ * @param float $result
+ * @param float $margin the rage of acceptation
+ * @param string $message the text to display if the assertion is not correct
+ * @return void
+ */
+	protected static function assertNotWithinRange($expected, $result, $margin, $message = '') {
+		$upper = $result + $margin;
+		$lower = $result - $margin;
+		static::assertTrue((($expected > $upper) || ($expected < $lower)), $message);
+	}
+
 /**
  * Compatibility function to test paths.
  *

diff --git a/tests/TestCase/TestSuite/TestCaseTest.php b/tests/TestCase/TestSuite/TestCaseTest.php
@@ -320,6 +320,26 @@ public function testAssertTextNotContains() {
 		$this->assertTextNotContains("different\rlines", $stringDirty);
 	}
 
+/**
+ * test testAssertWithinRange()
+ *
+ * @return void
+ */
+	public function testAssertWithinRange() {
+		$this->assertWithinRange(21, 22, 1, 'Not within range');
+		$this->assertWithinRange(21.3, 22.2, 1.0, 'Not within range');
+	}
+
+/**
+ * test testAssertNotWithinRange()
+ *
+ * @return void
+ */
+	public function testAssertNotWithinRange() {
+		$this->assertNotWithinRange(21, 23, 1, 'Within range');
+		$this->assertNotWithinRange(21.3, 22.2, 0.7, 'Within range');
+	}
+
 /**
  * test getMockForModel()
  *