Merge pull request zendframework/zendframework#5212 from EpeeCheeze/m…

…aster

assertQueryContentContains searching through all nodes found

src/PHPUnit/Controller/AbstractHttpControllerTestCase.php

@@ -598,13 +598,16 @@ private function queryContentContainsAssertion($path, $match, $useXpath = false)
                 'Failed asserting node DENOTED BY %s EXISTS', $path
             ));
         }
-        if ($result->current()->nodeValue != $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
-                'Failed asserting node denoted by %s CONTAINS content "%s", actual content is "%s"',
-                $path, $match, $result->current()->nodeValue
-            ));
+        foreach ($result as $node) {
+            if ($node->nodeValue == $match) {
+                $this->assertEquals($match, $node->nodeValue);
+                return;
+            }
         }
-        $this->assertEquals($result->current()->nodeValue, $match);
+        throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+            'Failed asserting node denoted by %s CONTAINS content "%s"',
+            $path, $match
+        ));
     }
 
     /**
@@ -644,13 +647,16 @@ private function notQueryContentContainsAssertion($path, $match, $useXpath = fal
                 'Failed asserting node DENOTED BY %s EXISTS', $path
             ));
         }
-        if ($result->current()->nodeValue == $match) {
-            throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
-                'Failed asserting node DENOTED BY %s DOES NOT CONTAIN content "%s"',
-                $path, $match
-            ));
+        foreach ($result as $node) {
+            if ($node->nodeValue == $match) {
+                throw new PHPUnit_Framework_ExpectationFailedException(sprintf(
+                    'Failed asserting node DENOTED BY %s DOES NOT CONTAIN content "%s"',
+                    $path, $match
+                ));
+            }
+            $currentValue = $node->nodeValue;
         }
-        $this->assertNotEquals($result->current()->nodeValue, $match);
+        $this->assertNotEquals($currentValue, $match);
     }
 
     /**

test/PHPUnit/Controller/AbstractHttpControllerTestCaseTest.php

@@ -333,22 +333,31 @@ public function testAssertQueryContentContains()
         $this->assertQueryContentContains('div#content', 'foo');
 
         $this->setExpectedException(
-            'PHPUnit_Framework_ExpectationFailedException',
-            'actual content is "foo"' // check actual content is display
+            'PHPUnit_Framework_ExpectationFailedException'
         );
         $this->assertQueryContentContains('div#content', 'bar');
     }
 
+    public function testAssertQueryContentContainsWithSecondElement()
+    {
+        $this->dispatch('/tests');
+        $this->assertQueryContentContains('div#content', 'foo');
+
+        $this->setExpectedException(
+            'PHPUnit_Framework_ExpectationFailedException'
+        );
+        $this->assertQueryContentContains('div.top', 'bar');
+    }
+
     public function testAssertXpathQueryContentContains()
     {
         $this->dispatch('/tests');
-        $this->assertXpathQueryContentContains('//div[@id="content"]', 'foo');
+        $this->assertXpathQueryContentContains('//div[@class="top"]', 'foo');
 
         $this->setExpectedException(
-            'PHPUnit_Framework_ExpectationFailedException',
-            'actual content is "foo"' // check actual content is display
+            'PHPUnit_Framework_ExpectationFailedException'
         );
-        $this->assertXpathQueryContentContains('//div[@id="content"]', 'bar');
+        $this->assertXpathQueryContentContains('//div[@class="top"]', 'bar');
     }
 
     public function testAssertNotQueryContentContains()

test/_files/Baz/view/baz/index/unittests.phtml

@@ -3,7 +3,7 @@
 <div id="content">foo</div>
 
 <div class="top"></div>
-<div class="top"></div>
+<div class="top">foo</div>
 <div class="top"></div>
 
 <?php for ($i = 0; $i < $num_get; $i++): ?>