Moved assertEqualsWithoutLE() to \yiiunit\TestCase, fixed some test f…

…ailures on Windows
des1roer · Feb 15, 2015 · a831271 · a831271
1 parent 6e67f71
commit a831271
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 18 deletions.
diff --git a/tests/unit/TestCase.php b/tests/unit/TestCase.php
@@ -83,4 +83,18 @@ protected function destroyApplication()
     {
         \Yii::$app = null;
     }
+
+    /**
+     * Asserting two strings equality ignoring line endings
+     *
+     * @param string $expected
+     * @param string $actual
+     */
+    public function assertEqualsWithoutLE($expected, $actual)
+    {
+        $expected = str_replace("\r\n", "\n", $expected);
+        $actual = str_replace("\r\n", "\n", $actual);
+
+        $this->assertEquals($expected, $actual);
+    }
 }
diff --git a/tests/unit/framework/helpers/HtmlTest.php b/tests/unit/framework/helpers/HtmlTest.php
@@ -28,14 +28,6 @@ protected function setUp()
         ]);
     }
 
-    public function assertEqualsWithoutLE($expected, $actual)
-    {
-        $expected = str_replace("\r\n", "\n", $expected);
-        $actual = str_replace("\r\n", "\n", $actual);
-
-        $this->assertEquals($expected, $actual);
-    }
-
     public function testEncode()
     {
         $this->assertEquals("a&lt;&gt;&amp;&quot;&#039;�", Html::encode("a<>&\"'\x80"));

diff --git a/tests/unit/framework/web/AssetBundleTest.php b/tests/unit/framework/web/AssetBundleTest.php
@@ -71,7 +71,7 @@ public function testSimpleDependency()
 1<link href="/files/cssFile.css" rel="stylesheet">23<script src="/js/jquery.js"></script>
 <script src="/files/jsFile.js"></script>4
 EOF;
-        $this->assertEquals($expected, $view->renderFile('@yiiunit/data/views/rawlayout.php'));
+        $this->assertEqualsWithoutLE($expected, $view->renderFile('@yiiunit/data/views/rawlayout.php'));
     }
 
     public function positionProvider()
@@ -142,7 +142,7 @@ public function testPositionDependency($pos, $jqAlreadyRegistered)
 EOF;
             break;
         }
-        $this->assertEquals($expected, $view->renderFile('@yiiunit/data/views/rawlayout.php'));
+        $this->assertEqualsWithoutLE($expected, $view->renderFile('@yiiunit/data/views/rawlayout.php'));
     }
 
     public function positionProvider2()

diff --git a/tests/unit/framework/widgets/ActiveFormTest.php b/tests/unit/framework/widgets/ActiveFormTest.php
@@ -18,14 +18,6 @@ protected function setUp()
         $this->mockApplication();
     }
 
-    public function assertEqualsWithoutLE($expected, $actual)
-    {
-        $expected = str_replace("\r\n", "\n", $expected);
-        $actual = str_replace("\r\n", "\n", $actual);
-
-        $this->assertEquals($expected, $actual);
-    }
-
     public function testBooleanAttributes()
     {
         $o = ['template' => '{input}'];