Merge branch 'pr304'

zendframework · Mar 27, 2014 · 7884400 · 7884400
2 parents 42c2f86 + 725427b
commit 7884400
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/library/Zend/Test/PHPUnit/Constraint/DomQuery37.php b/library/Zend/Test/PHPUnit/Constraint/DomQuery37.php
@@ -193,7 +193,7 @@ public function evaluate($content, $assertType = '', $match = FALSE)
             case self::ASSERT_CONTENT_COUNT:
             case self::ASSERT_CONTENT_COUNT_MIN:
             case self::ASSERT_CONTENT_COUNT_MAX:
-                if (!$match) {
+                if ($match === false) {
                     require_once 'Zend/Test/PHPUnit/Constraint/Exception.php';
                     throw new Zend_Test_PHPUnit_Constraint_Exception('No count provided against which to compare');
                 }

diff --git a/tests/Zend/Test/PHPUnit/Constraint/DomQueryTest.php b/tests/Zend/Test/PHPUnit/Constraint/DomQueryTest.php
@@ -63,4 +63,32 @@ public function testShouldAllowMatchingOfAttributeValues()
             Zend_Test_PHPUnit_Constraint_DomQuery::ASSERT_CONTENT_CONTAINS, 'value1');
         $this->assertTrue($result);
     }
+
+    /**
+     * @group issue-303
+     */
+    public function testShouldAllowMatchingZeroCounts()
+    {
+        $html = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+    <head>
+        <title>ZF Issue ZF-4010</title>
+    </head>
+    <body>
+        <form>
+            <fieldset id="fieldset-input"><legend>Inputs</legend>
+                <ol>
+                    <li><input type="text" name="input[0]" id="input-0" value="value1" /></li>
+                    <li><input type="text" name="input[1]" id="input-1" value="value2" /></li>
+                    <li><input type="text" name="input[2]" id="input-2" value="" /></li>
+                </ol>
+            </fieldset>
+        </form>
+    </body>
+</html>';
+        $assertion = new Zend_Test_PHPUnit_Constraint_DomQuery('input#input-3 @value');
+        $result = $assertion->evaluate($html,
+            Zend_Test_PHPUnit_Constraint_DomQuery::ASSERT_CONTENT_COUNT, 0);
+        $this->assertTrue($result);
+    }
 }