Adding missing parameters to assertEqual() wrapper.

Adding assertNotEqual() wrapper. Adding expectError() but it doesn't work because of Debugger's error handler being set. Fixing fatal error where getDescription would not be defined.
cakephp · May 8, 2010 · e7ff0bd · e7ff0bd
1 parent 82a1bd6
commit e7ff0bd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/cake/tests/lib/cake_test_case.php b/cake/tests/lib/cake_test_case.php
@@ -386,8 +386,12 @@ private function __array_permute($items, $perms = array()) {
 		}
 	}
 
-	protected function assertEqual($a, $b) {
-		return $this->assertEquals($a, $b);
+	protected function assertEqual($a, $b, $message = '') {
+		return $this->assertEquals($a, $b, $message);
+	}
+
+	protected function assertNotEqual($a, $b, $message = '') {
+		return $this->assertNotEquals($a, $b, $message);
 	}
 
 	protected function assertPattern($pattern, $string, $message = '') {
@@ -404,6 +408,13 @@ protected function assertNoPattern($pattern, $string, $message = '') {
 
 	protected function assertNoErrors() {
 	}
+
+	protected function expectError($expected = false, $message = '') {
+		if (!$expected) {
+			$expected = 'Exception';
+		}
+		$this->setExpectedException($expected, $message);
+	}
 
 	protected function expectException($name = null) {
 		$this->setExpectedException($name);

diff --git a/cake/tests/lib/reporter/cake_html_reporter.php b/cake/tests/lib/reporter/cake_html_reporter.php
@@ -257,7 +257,7 @@ public function paintFail($message) {
 
 		echo "<li class='fail'>\n";
 		echo "<span>Failed</span>";
-		echo "<div class='msg'><pre>" . $this->_htmlEntities($message->getDescription()) . "</pre></div>\n";
+		echo "<div class='msg'><pre>" . $this->_htmlEntities($message->toString()) . "</pre></div>\n";
 		echo "<div class='msg'>" . sprintf(__('File: %s'), $context['file']) . "</div>\n";
 		echo "<div class='msg'>" . sprintf(__('Method: %s'), $realContext['function']) . "</div>\n";
 		echo "<div class='msg'>" . sprintf(__('Line: %s'), $context['line']) . "</div>\n";