attempt to soothe windows

tests/Assertions.php

@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+
+namespace Qiq;
+
+trait Assertions
+{
+    public function assertSameString(string $expect, string $actual) : void
+    {
+        $expect = str_replace("\r\n", "\n", $expect);
+        $actual = str_replace("\r\n", "\n", $actual);
+        $this->assertSame($expect, $actual);
+    }
+}

tests/Helper/Html/CheckboxFieldsTest.php

@@ -19,7 +19,7 @@ public function test() : void
         <label><input type="checkbox" name="foo[]" value="maybe" />May &amp; be</label>
 
         HTML;
-        $this->assertSame($expect, $actual);
+        $this->assertSameString($expect, $actual);
     }
 
     public function testSingleOption() : void
@@ -36,7 +36,7 @@ public function testSingleOption() : void
         <label><input type="checkbox" name="foo" value="1" checked />Yes</label>
 
         HTML;
-        $this->assertSame($expect, $actual);
+        $this->assertSameString($expect, $actual);
     }
 
     public function testScalarChecked() : void
@@ -53,6 +53,6 @@ public function testScalarChecked() : void
         <label><input type="checkbox" name="foo[]" value="maybe" />May &amp; be</label>
 
         HTML;
-        $this->assertSame($expect, $actual);
+        $this->assertSameString($expect, $actual);
     }
 }

tests/Helper/Html/DlTest.php

@@ -26,9 +26,9 @@ public function test() : void
                 <dd>Baz Def</dd>
         </dl>
         HTML;
-        $this->assertSame($expect, $actual);
+        $this->assertSameString($expect, $actual);
         $actual = $this->helpers->dl([]);
         $expect = '';
-        $this->assertSame($expect, $actual);
+        $this->assertSameString($expect, $actual);
     }
 }

tests/Helper/Html/HtmlHelperTestCase.php

@@ -1,11 +1,14 @@
 <?php
 namespace Qiq\Helper\Html;
 
+use Qiq\Assertions;
 use Qiq\Container;
 use Qiq\Indent;
 
 abstract class HtmlHelperTestCase extends \PHPUnit\Framework\TestCase
 {
+    use Assertions;
+
     protected HtmlHelpers $helpers;
 
     protected Container $container;

tests/Helper/Html/ItemsTest.php

@@ -13,6 +13,6 @@ public function test() : void
         <li>&gt;dib</li>
 
         HTML;
-        $this->assertSame($expect, $actual);
+        $this->assertSameString($expect, $actual);
     }
 }

tests/Helper/Html/OlTest.php

@@ -15,9 +15,9 @@ public function test() : void
             <li>&gt;dib</li>
         </ol>
         HTML;
-        $this->assertSame($expect, $actual);
+        $this->assertSameString($expect, $actual);
         $actual = $this->helpers->ol([]);
         $expect = '';
-        $this->assertSame($expect, $actual);
+        $this->assertSameString($expect, $actual);
     }
 }

tests/Helper/Html/RadioFieldsTest.php

@@ -19,6 +19,6 @@ public function test() : void
         <label><input type="radio" name="foo" value="maybe" />May &amp; be</label>
 
         HTML;
-        $this->assertSame($expect, $actual);
+        $this->assertSameString($expect, $actual);
     }
 }

tests/Helper/Html/SelectTest.php

@@ -44,7 +44,7 @@ public function test() : void
             </optgroup>
         </select>
         HTML;
-        $this->assertSame($expect, $actual);
+        $this->assertSameString($expect, $actual);
     }
 
     public function testMultiple() : void
@@ -87,6 +87,6 @@ public function testMultiple() : void
             </optgroup>
         </select>
         HTML;
-        $this->assertSame($expect, $actual);
+        $this->assertSameString($expect, $actual);
     }
 }

tests/Helper/Html/UlTest.php

@@ -15,9 +15,9 @@ public function test() : void
             <li>&gt;dib</li>
         </ul>
         HTML;
-        $this->assertSame($expect, $actual);
+        $this->assertSameString($expect, $actual);
         $actual = $this->helpers->ul([]);
         $expect = '';
-        $this->assertSame($expect, $actual);
+        $this->assertSameString($expect, $actual);
     }
 }

tests/TemplateTest.php

@@ -3,12 +3,15 @@
 
 namespace Qiq;
 
+use Qiq\Assertions;
 use Qiq\Compiler\NonCompiler;
 use Qiq\Compiler\QiqCompiler;
 use RuntimeException;
 
 class TemplateTest extends \PHPUnit\Framework\TestCase
 {
+    use Assertions;
+
     protected HtmlTemplate $template;
 
     protected function setUp() : void
@@ -94,14 +97,22 @@ public function testRelative() : void
     public function testRelativeFailure() : void
     {
         $this->template->setView('rel/foo/broken');
-        $this->expectException(Exception\FileNotFound::class);
-        $this->expectExceptionMessage(<<<EOT
-        Could not resolve dots in template name.
-        Original name: '../../../zim'
-        Resolved into: '../zim'
-        Probably too many '../' in the original name.
-        EOT);
-        ($this->template)();
+
+        try {
+            ($this->template)();
+        } catch (Exception\FileNotFound $e) {
+            $expect = <<<'EXPECT'
+            Could not resolve dots in template name.
+            Original name: '../../../zim'
+            Resolved into: '../zim'
+            Probably too many '../' in the original name.
+            EXPECT;
+            $actual = $e->getMessage();
+            $this->assertSameString(trim($expect), trim($actual));
+            return;
+        }
+
+        throw new RuntimeException('Should have thrown exception');
     }
 
     public function testExtends() : void
@@ -111,19 +122,17 @@ public function testExtends() : void
         $expect = <<<EOT
         Layout 1 Content
         View 1 Content
-
         Foo 3a View
         Foo 1 Layout
         Foo 2 Layout
         Foo 3 Layout
         Foo 1 View
         Foo 2 View
         Foo 3b View
-
-
         EOT;
         $actual = ($this->template)();
-        $this->assertSame($expect, $actual);
+        $actual = str_replace("\n\n", "\n", $actual);
+        $this->assertSameString(trim($expect), trim($actual));
     }
 
     public function testInheritanceDocExample() : void