Fix "ignore case" in DOMNodeComparator

sebastianbergmann · May 23, 2018 · feeec2d · feeec2d
1 parent 26ca1ea
commit feeec2d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/DOMNodeComparator.php b/src/DOMNodeComparator.php
@@ -82,6 +82,6 @@ private function nodeToText(DOMNode $node, bool $canonicalize, bool $ignoreCase)
 
         $text = $node instanceof DOMDocument ? $node->saveXML() : $document->saveXML($node);
 
-        return $ignoreCase ? $text : \strtolower($text);
+        return $ignoreCase ? \strtolower($text) : $text;
     }
 }
diff --git a/tests/DOMNodeComparatorTest.php b/tests/DOMNodeComparatorTest.php
@@ -73,6 +73,11 @@ public function assertEqualsSucceedsProvider()
             $this->createDOMDocument("<root>\n  <child/>\n</root>"),
             $this->createDOMDocument('<root><child/></root>')
           ],
+          [
+            $this->createDOMDocument('<Root></Root>'),
+            $this->createDOMDocument('<root></root>'),
+            $ignoreCase = true
+          ]
         ];
     }
 
@@ -98,6 +103,14 @@ public function assertEqualsFailsProvider()
           [
             $this->createDOMDocument('<foo> bar </foo>'),
             $this->createDOMDocument('<foo> bir </foo>')
+          ],
+          [
+            $this->createDOMDocument('<Root></Root>'),
+            $this->createDOMDocument('<root></root>')
+          ],
+          [
+            $this->createDOMDocument('<root> bar </root>'),
+            $this->createDOMDocument('<root> BAR </root>')
           ]
         ];
     }
@@ -136,13 +149,16 @@ public function testAcceptsFails($expected, $actual)
      *
      * @param mixed $expected
      * @param mixed $actual
+     * @param bool  $ignoreCase
      */
-    public function testAssertEqualsSucceeds($expected, $actual)
+    public function testAssertEqualsSucceeds($expected, $actual, $ignoreCase = false)
     {
         $exception = null;
 
         try {
-            $this->comparator->assertEquals($expected, $actual);
+            $delta = 0.0;
+            $canonicalize = false;
+            $this->comparator->assertEquals($expected, $actual, $delta, $canonicalize, $ignoreCase);
         } catch (ComparisonFailure $exception) {
         }