Merge branch 'hotfix/windows-unittests-logger' of https://github.com/…

…WalterTamboer/zf2
zendframework · Jul 23, 2012 · f0877a7 · f0877a7
2 parents 4dc18b1 + 00e6828
commit f0877a7
Showing 1 changed file with 23 additions and 25 deletions.
diff --git a/tests/Zend/Log/Formatter/ExceptionHandlerTest.php b/tests/Zend/Log/Formatter/ExceptionHandlerTest.php
@@ -50,31 +50,29 @@ public function testFormat()
                 )
             )
         );
-        $expected = <<<EOF
-2012-06-12T09:00:00+02:00 CRIT (1) test in test.php on line 1
-[Trace]
-File  : test.php
-Line  : 1
-Func  : test
-Class : Test
-Type  : static
-Args  : Array
-(
-    [0] => 1
-)
-
-File  : test.php
-Line  : 2
-Func  : test
-Class : Test
-Type  : static
-Args  : Array
-(
-    [0] => 1
-)
-
-
-EOF;
+
+        // The formatter ends with unix style line endings so make sure we expect that 
+        // output as well:
+        $expected = "2012-06-12T09:00:00+02:00 CRIT (1) test in test.php on line 1\n";
+        $expected .= "[Trace]\n";
+        $expected .= "File  : test.php\n";
+        $expected .= "Line  : 1\n";
+        $expected .= "Func  : test\n";
+        $expected .= "Class : Test\n";
+        $expected .= "Type  : static\n";
+        $expected .= "Args  : Array\n";
+        $expected .= "(\n";
+        $expected .= "    [0] => 1\n";
+        $expected .= ")\n\n";
+        $expected .= "File  : test.php\n";
+        $expected .= "Line  : 2\n";
+        $expected .= "Func  : test\n";
+        $expected .= "Class : Test\n";
+        $expected .= "Type  : static\n";
+        $expected .= "Args  : Array\n";
+        $expected .= "(\n";
+        $expected .= "    [0] => 1\n";
+        $expected .= ")\n\n";
 
         $formatter = new ExceptionHandler();
         $output = $formatter->format($event);