Fix tests that fail on windows.

Refs #2148
cakephp · Jan 25, 2012 · 154b001 · 154b001
1 parent bd0104d
commit 154b001
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/lib/Cake/Test/Case/Utility/DebuggerTest.php b/lib/Cake/Test/Case/Utility/DebuggerTest.php
@@ -329,9 +329,7 @@ public function testExportVar() {
 	float => (float) 1.333
 }
 TEXT;
-		$result = str_replace(array("\r\n", "\n"), "", $result);
-		$expected =  str_replace(array("\r\n", "\n"), "", $expected);
-		$this->assertEquals($expected, $result);
+		$this->assertTextEquals($expected, $result);
 
 		$data = array(
 			1 => 'Index one',
@@ -344,7 +342,7 @@ public function testExportVar() {
 	(int) 5 => 'Index five'
 )
 TEXT;
-		$this->assertEquals($expected, $result);
+		$this->assertTextEquals($expected, $result);
 	}
 
 /**
@@ -404,9 +402,7 @@ public function testDump() {
 	)
 )</pre>
 TEXT;
-		$result = str_replace(array("\r\n", "\n"), "", $result);
-		$expected =  str_replace(array("\r\n", "\n"), "", $expected);
-		$this->assertEquals($expected, $result);
+		$this->assertTextEquals($expected, $result);
 	}
 
 /**

diff --git a/lib/Cake/Test/Case/Utility/SanitizeTest.php b/lib/Cake/Test/Case/Utility/SanitizeTest.php
@@ -367,7 +367,7 @@ public function testStripScripts() {
 HTML;
 		$expected = "text\n\ntext";
 		$result = Sanitize::stripScripts($string);
-		$this->assertEquals($expected, $result);
+		$this->assertTextEquals($expected, $result);
 
 		$string = <<<HTML
 text
@@ -380,7 +380,7 @@ public function testStripScripts() {
 HTML;
 		$expected = "text\n\ntext";
 		$result = Sanitize::stripScripts($string);
-		$this->assertEquals($expected, $result);
+		$this->assertTextEquals($expected, $result);
 	}
 
 /**

diff --git a/lib/Cake/Test/Case/Utility/StringTest.php b/lib/Cake/Test/Case/Utility/StringTest.php
@@ -315,7 +315,7 @@ public function testWrap() {
 This is the song that never ends.
 This is the song that never ends.
 TEXT;
-		$this->assertEquals($expected, $result, 'Text not wrapped.');
+		$this->assertTextEquals($expected, $result, 'Text not wrapped.');
 
 		$result = String::wrap($text, array('width' => 20, 'wordWrap' => false));
 		$expected = <<<TEXT
@@ -326,7 +326,7 @@ public function testWrap() {
 the song that never
  ends.
 TEXT;
-		$this->assertEquals($expected, $result, 'Text not wrapped.');
+		$this->assertTextEquals($expected, $result, 'Text not wrapped.');
 	}
 
 /**
@@ -342,5 +342,6 @@ public function testWrapIndent() {
 	This is the song that never ends.
 	This is the song that never ends.
 TEXT;
+		$this->assertTextEquals($expected, $result);
 	}
 }