use assertCount

dbu · dbu · commit bd9682c72b1d · 2014-03-01T16:36:28.000+01:00
diff --git a/tests/05_Reading/NodeReadMethodsTest.php b/tests/05_Reading/NodeReadMethodsTest.php
@@ -231,7 +231,7 @@ public function testGetNodesNameGlobs()
             /** @var $n \PHPCR\NodeInterface */
             array_push($nodes, $n->getName());
         }
-        $this->assertEquals(2, count($nodes));
+        $this->assertCount(2, $nodes);
         $this->assertContains('idExample', $nodes);
         $this->assertContains('test:namespacedNode', $nodes);
         $this->assertNotContains('jcr:content', $nodes); //jrc:content is not immediate child
@@ -390,7 +390,7 @@ public function testGetPropertiesValuesGlob()
         } elseif (count($props) == 2) {
             $this->assertArrayHasKey('jcr:primaryType', $props);
             $this->assertArrayHasKey('jcr:mixinTypes', $props);
-            $this->assertEquals(0, count($props['jcr:mixinTypes']));
+            $this->assertCount(0, $props['jcr:mixinTypes']);
         } else {
             $this->fail('wrong number of properties starting with jcr:');
         }
@@ -462,7 +462,7 @@ public function testGetReferencesAll()
         $this->assertInstanceOf('Iterator', $iterator);
 
         //there are two nodes with reference to idExample.
-        $this->assertEquals(2, count($iterator), "Wrong number of references to idExample");
+        $this->assertCount(2, $iterator, "Wrong number of references to idExample");
         foreach ($iterator as $prop) {
             $this->assertInstanceOf('\PHPCR\PropertyInterface', $prop);
             $this->assertTrue(in_array($prop, $source));
@@ -481,7 +481,7 @@ public function testGetReferencesOnNonReferencedNode()
         $this->assertInstanceOf('Iterator', $iterator);
 
         //there is no node with reference to numberPropertyNode.
-        $this->assertEquals(0, count($iterator), "Wrong number of references to numberPropertyNode");
+        $this->assertCount(0, $iterator, "Wrong number of references to numberPropertyNode");
     }
 
     /**
@@ -496,7 +496,7 @@ public function testGetReferencesName()
         $this->assertInstanceOf('Iterator', $iterator);
 
         //there is exactly one node with reference to idExample.
-        $this->assertEquals(1, count($iterator), "Wrong number of references with name ref to idExample");
+        $this->assertCount(1, $iterator, "Wrong number of references with name ref to idExample");
         foreach ($iterator as $prop) {
             $this->assertInstanceOf('\PHPCR\PropertyInterface', $prop);
             $this->assertEquals($source, $prop);
@@ -515,7 +515,7 @@ public function testGetReferencesNonexistingName()
         $target = $this->rootNode->getNode('tests_general_base/idExample');
         $iterator = $target->getReferences('notexisting');
         $this->assertInstanceOf('Iterator', $iterator);
-        $this->assertEquals(0, count($iterator), "Wrong number of references with name notexisting to idExample");
+        $this->assertCount(0, $iterator, "Wrong number of references with name notexisting to idExample");
     }
 
     /**
@@ -530,7 +530,7 @@ public function testGetWeakReferencesAll()
         $iterator = $target->getWeakReferences();
         $this->assertInstanceOf('Iterator', $iterator);
 
-        $this->assertEquals(2, count($iterator), "Wrong number of weak references to weakreference_target");
+        $this->assertCount(2, $iterator, "Wrong number of weak references to weakreference_target");
         foreach ($iterator as $prop) {
             $this->assertInstanceOf('\PHPCR\PropertyInterface', $prop);
             $this->assertTrue(in_array($prop, $source, true));
@@ -548,7 +548,7 @@ public function testGetWeakReferencesName()
         $iterator = $target->getWeakReferences('ref1');
         $this->assertInstanceOf('Iterator', $iterator);
 
-        $this->assertEquals(1, count($iterator), "Wrong number of weak references to weakreference_target");
+        $this->assertCount(1, $iterator, "Wrong number of weak references to weakreference_target");
         foreach ($iterator as $prop) {
             $this->assertInstanceOf('\PHPCR\PropertyInterface', $prop);
             $this->assertEquals($prop, $source);
@@ -565,7 +565,7 @@ public function testGetWeakReferencesNonExistingName()
         $iterator = $target->getWeakReferences('unexisting_name');
         $this->assertInstanceOf('Iterator', $iterator);
 
-        $this->assertEquals(0, count($iterator), "Wrong number of weak references to weakreference_target");
+        $this->assertCount(0, $iterator, "Wrong number of weak references to weakreference_target");
     }
 
     /**
@@ -579,7 +579,7 @@ public function testGetWeakReferencesOnNonReferencedNode()
         $this->assertInstanceOf('Iterator', $iterator);
 
         //there is no node with reference to numberPropertyNode.
-        $this->assertEquals(0, count($iterator), "Wrong number of references to numberPropertyNode");
+        $this->assertCount(0, $iterator, "Wrong number of references to numberPropertyNode");
     }
 
     public function testGetSharedSetUnreferenced()
diff --git a/tests/05_Reading/PropertyReadMethodsTest.php b/tests/05_Reading/PropertyReadMethodsTest.php
@@ -337,7 +337,7 @@ public function testGetBooleanMulti()
         foreach ($arr as $v) {
             $this->assertInternalType('boolean', $v);
         }
-        $this->assertEquals(2, count($arr));
+        $this->assertCount(2, $arr);
         $this->assertFalse($arr[0]);
         $this->assertTrue($arr[1]);
     }
@@ -426,7 +426,7 @@ public function testGetPropertyMulti()
     {
         $propertyPath = $this->node->getNode('numberPropertyNode/jcr:content')->getProperty('multiPropertyPath');
         $properties = $propertyPath->getProperty();
-        $this->assertEquals(2, count($properties));
+        $this->assertCount(2, $properties);
         foreach ($properties as $prop) {
             $this->assertInstanceOf('PHPCR\PropertyInterface', $prop);
         }
diff --git a/tests/06_Query/QOM/Sql2ToQomConverterTest.php b/tests/06_Query/QOM/Sql2ToQomConverterTest.php
@@ -44,7 +44,7 @@ public function testColumnsAndSelector()
 
         $cols = $query->getColumns();
         $this->assertTrue(is_array($cols));
-        $this->assertEquals(2, count($cols));
+        $this->assertCount(2, $cols);
 
         $this->assertEquals('u', $cols[0]->getselectorName());
         $this->assertEquals('prop1', $cols[0]->getPropertyName());
diff --git a/tests/06_Query/QueryObjectQOMTest.php b/tests/06_Query/QueryObjectQOMTest.php
@@ -51,7 +51,7 @@ public function testExecute()
     {
         $qr = $this->query->execute();
         $this->assertInstanceOf('PHPCR\Query\QueryResultInterface', $qr);
-        $this->assertEquals(5, count($qr->getRows()));
+        $this->assertCount(5, $qr->getRows());
         // we assume content is the same as for sql2
     }
 
diff --git a/tests/06_Query/QueryResultsTest.php b/tests/06_Query/QueryResultsTest.php
@@ -98,7 +98,7 @@ public function testGetNodesAtOnce()
 
             $keys[] = $path;
         }
-        $this->assertEquals(8, count($keys));
+        $this->assertCount(8, $keys);
 
         $this->assertContains('/tests_general_base/idExample/jcr:content/Test escaping_x0020bla <>\'" node', $keys);
     }
@@ -159,7 +159,7 @@ public function testCompareNumberFields()
             $rows[] = $row;
         }
 
-        $this->assertEquals(1, count($rows));
+        $this->assertCount(1, $rows);
         $this->assertEquals(10, $rows[0]->getValue('data.longNumberToCompare'));
     }
 
@@ -176,7 +176,7 @@ public function testCompareStringFields()
             $rows[] = $row;
         }
 
-        $this->assertEquals(1, count($rows));
+        $this->assertCount(1, $rows);
         $this->assertEquals(2, $rows[0]->getValue('data.stringToCompare'));
     }
 
@@ -193,7 +193,7 @@ public function testBooleanField()
             $rows[] = $row;
         }
 
-        $this->assertEquals(1, count($rows));
+        $this->assertCount(1, $rows);
         $this->assertEquals(false, $rows[0]->getValue('data.thisIsNo'));
 
          $query = $this->sharedFixture['qm']->createQuery(
@@ -207,7 +207,7 @@ public function testBooleanField()
             $rows[] = $row;
         }
 
-        $this->assertEquals(1, count($rows));
+        $this->assertCount(1, $rows);
         $this->assertEquals(true, $rows[0]->getValue('data.thisIsYes'));
     }
 }
diff --git a/tests/06_Query/QuerySql2OperationsTest.php b/tests/06_Query/QuerySql2OperationsTest.php
@@ -57,14 +57,14 @@ public function testQueryFieldSomeNull()
             $vals[] = ($node->hasProperty('foo') ? $node->getPropertyValue('foo') : null);
         }
         $this->assertContains('bar', $vals);
-        $this->assertEquals(9, count($vals));
+        $this->assertCount(9, $vals);
 
         $vals = array();
         foreach ($result->getRows() as $row) {
             $vals[] = $row->getValue('foo');
         }
         $this->assertContains('bar', $vals);
-        $this->assertEquals(9, count($vals));
+        $this->assertCount(9, $vals);
     }
 
     public function testQueryFieldSelector()
diff --git a/tests/06_Query/RowIteratorTest.php b/tests/06_Query/RowIteratorTest.php
@@ -15,7 +15,7 @@ public function setUp()
         parent::setUp();
 
         $this->rowIterator = $this->query->execute()->getRows();
-        $this->assertEquals(5, count($this->rowIterator));
+        $this->assertCount(5, $this->rowIterator);
     }
 
     public function testIterator()
@@ -25,7 +25,7 @@ public function testIterator()
         foreach ($this->rowIterator as $key => $row) {
             $this->assertInstanceOf('PHPCR\Query\RowInterface', $row); // Test if the return element is an istance of row
             $this->assertInstanceOf('PHPCR\NodeInterface', $row->getNode()); //Test if we can get the node of a certain row
-            $this->assertEquals(3, count($row->getValues())); // test if we can get all the values of a row
+            $this->assertCount(3, $row->getValues()); // test if we can get all the values of a row
 
             foreach ($row as $key => $value) { // Test if we can iterate over the columns inside a row
                 $count++;
diff --git a/tests/06_Query/Sql1/QueryOperationsTest.php b/tests/06_Query/Sql1/QueryOperationsTest.php
@@ -53,14 +53,14 @@ public function testQueryFieldSomenull()
             $vals[] = ($node->hasProperty('foo') ? $node->getPropertyValue('foo') : null);
         }
         $this->assertContains('bar', $vals);
-        $this->assertEquals(9, count($vals));
+        $this->assertCount(9, $vals);
 
         $vals = array();
         foreach ($result->getRows() as $row) {
             $vals[] = $row->getValue('foo');
         }
         $this->assertContains('bar', $vals);
-        $this->assertEquals(9, count($vals));
+        $this->assertCount(9, $vals);
     }
 
     public function testQueryOrder()
diff --git a/tests/06_Query/XPath/QueryOperationsTest.php b/tests/06_Query/XPath/QueryOperationsTest.php
@@ -50,14 +50,14 @@ public function testQueryFieldSomenull()
             $vals[] = ($node->hasProperty('foo') ? $node->getPropertyValue('foo') : null);
         }
         $this->assertContains('bar', $vals);
-        $this->assertEquals(9, count($vals));
+        $this->assertCount(9, $vals);
 
         $vals = array();
         foreach ($result->getRows() as $row) {
             $vals[] = $row->getValue('foo');
         }
         $this->assertContains('bar', $vals);
-        $this->assertEquals(9, count($vals));
+        $this->assertCount(9, $vals);
     }
 
     public function testQueryOrder()
diff --git a/tests/08_NodeTypeDiscovery/NodeDefinitionTest.php b/tests/08_NodeTypeDiscovery/NodeDefinitionTest.php
@@ -32,14 +32,14 @@ public function setUp()
         try {
             $defs = self::$file->getChildNodeDefinitions();
             $this->assertInternalType('array', $defs);
-            $this->assertEquals(1, count($defs));
+            $this->assertCount(1, $defs);
             list($key, $this->content) = each($defs);
             $this->assertInstanceOf('\PHPCR\NodeType\NodeDefinitionInterface', $this->content);
             $this->assertEquals('jcr:content', $this->content->getName());
 
             $defs = self::$folder->getChildNodeDefinitions();
             $this->assertInternalType('array', $defs);
-            $this->assertEquals(1, count($defs));
+            $this->assertCount(1, $defs);
             list($key, $this->hierarchyNodeDef) = each($defs);
             $this->assertInstanceOf('\PHPCR\NodeType\NodeDefinitionInterface', $this->hierarchyNodeDef);
             $this->assertEquals('*', $this->hierarchyNodeDef->getName());
diff --git a/tests/08_NodeTypeDiscovery/NodeTypeTest.php b/tests/08_NodeTypeDiscovery/NodeTypeTest.php
@@ -42,7 +42,7 @@ public function testGetSupertypesNone()
     {
         $types = self::$base->getSupertypes();
         $this->assertInternalType('array', $types);
-        $this->assertEquals(0, count($types));
+        $this->assertCount(0, $types);
     }
 
     public function testGetDeclaredSupertypes()
@@ -72,7 +72,7 @@ public function testGetDeclaredSupertypesNone()
     {
         $types = self::$base->getDeclaredSupertypes();
         $this->assertInternalType('array', $types);
-        $this->assertEquals(0, count($types));
+        $this->assertCount(0, $types);
     }
 
     public function testGetSubtypes()
@@ -113,7 +113,7 @@ public function testGetChildNodeDefinitions()
     {
         $children = self::$file->getChildNodeDefinitions();
         $this->assertInternalType('array', $children);
-        $this->assertEquals(1, count($children));
+        $this->assertCount(1, $children);
         list($key, $child) = each($children);
         $this->assertInstanceOf('\PHPCR\NodeType\NodeDefinitionInterface', $child);
         $this->assertEquals('jcr:content', $child->getName());
@@ -124,7 +124,7 @@ public function testGetPropertyDefinitions()
     {
         $properties = self::$file->getPropertyDefinitions();
         $this->assertInternalType('array', $properties);
-        $this->assertEquals(4, count($properties));
+        $this->assertCount(4, $properties);
         $names=array();
         foreach ($properties as $prop) {
             $this->assertInstanceOf('\PHPCR\NodeType\PropertyDefinitionInterface', $prop);
diff --git a/tests/08_NodeTypeDiscovery/PropertyDefinitionTest.php b/tests/08_NodeTypeDiscovery/PropertyDefinitionTest.php
@@ -127,7 +127,7 @@ public function testGetDefaultValues()
     {
         $def = $this->primaryType->getDefaultValues();
         $this->assertInternalType('array', $def);
-        $this->assertEquals(0, count($def));
+        $this->assertCount(0, $def);
         // no built-in types with default value
     }
 
@@ -151,7 +151,7 @@ public function testGetValueConstraints()
     {
         $constraint = $this->primaryType->getValueConstraints();
         $this->assertInternalType('array', $constraint);
-        $this->assertEquals(0, count($constraint));
+        $this->assertCount(0, $constraint);
         // no built-in type with constraints
     }
 
diff --git a/tests/15_Versioning/VersionManagerTest.php b/tests/15_Versioning/VersionManagerTest.php
@@ -27,15 +27,15 @@ public function testCheckinCheckoutVersion()
     {
         $history = $this->vm->getVersionHistory('/tests_version_base/versioned');
         $this->assertInstanceOf('PHPCR\Version\VersionHistoryInterface', $history);
-        $this->assertEquals(1, count($history->getAllVersions()));
+        $this->assertCount(1, $history->getAllVersions());
 
         $this->vm->checkout('/tests_version_base/versioned');
         $node = $this->session->getNode('/tests_version_base/versioned');
         $node->setProperty('foo', 'bar');
         $this->session->save();
 
         $this->vm->checkin('/tests_version_base/versioned');
-        $this->assertEquals(2, count($history->getAllVersions()));
+        $this->assertCount(2, $history->getAllVersions());
 
         $this->renewSession();
         $node = $this->session->getNode('/tests_version_base/versioned');
@@ -93,10 +93,10 @@ public function testCheckinTwice()
 
         $version2 = $this->vm->checkin('/tests_version_base/versioned'); // this should not create a new version
 
-        $this->assertEquals($count, count($history->getAllVersions()));
+        $this->assertCount($count, $history->getAllVersions());
         $session = $this->saveAndRenewSession();
         $history = $session->getWorkspace()->getVersionManager()->getVersionHistory('/tests_version_base/versioned');
-        $this->assertEquals($count, count($history->getAllVersions()));
+        $this->assertCount($count, $history->getAllVersions());
 
         $this->assertSame($version, $version2, 'must be the same version instance');
     }
diff --git a/tests/15_Versioning/VersionTest.php b/tests/15_Versioning/VersionTest.php
@@ -120,18 +120,18 @@ public function testGetLinearSuccessorNull()
     public function testGetPredecessors()
     {
         $versions = $this->version->getPredecessors();
-        $this->assertEquals(1, count($versions));
+        $this->assertCount(1, $versions);
         $pred = $versions[0];
         $this->assertInstanceOf('PHPCR\Version\VersionInterface', $pred);
         $versions = $pred->getSuccessors();
-        $this->assertEquals(1, count($versions), 'expected a successor of our predecessor');
+        $this->assertCount(1, $versions, 'expected a successor of our predecessor');
         $this->assertSame($this->version, $versions[0]);
     }
 
     public function testGetSuccessors()
     {
         $versions = $this->version->getSuccessors();
-        $this->assertEquals(0, count($versions));
+        $this->assertCount(0, $versions);
     }
 
     /**
diff --git a/tests/19_NodeTypeManagement/NodeTypeBaseCase.php b/tests/19_NodeTypeManagement/NodeTypeBaseCase.php
@@ -82,15 +82,15 @@ public function testRegisterNodeTypes()
 
     protected function assertTypes($types)
     {
-        $this->assertEquals(2, count($types), 'Wrong number of nodes registered');
+        $this->assertCount(2, $types, 'Wrong number of nodes registered');
 
         // apitest
         list($name, $type) = each($types);
         $this->assertEquals('phpcr:apitest', $name);
         $this->assertInstanceOf('PHPCR\NodeType\NodeTypeDefinitionInterface', $type);
         /** @var $type NodeTypeDefinitionInterface */
         $props = $type->getDeclaredPropertyDefinitions();
-        $this->assertEquals(1, count($props), 'Wrong number of properties in phpcr:apitest');
+        $this->assertCount(1, $props, 'Wrong number of properties in phpcr:apitest');
         $this->assertEquals('phpcr:class', $props[0]->getName());
         $this->assertTrue($props[0]->isMultiple());
 
@@ -100,7 +100,7 @@ protected function assertTypes($types)
         $this->assertInstanceOf('PHPCR\NodeType\NodeTypeDefinitionInterface', $type);
         /** @var $type NodeTypeDefinitionInterface */
         $props = $type->getDeclaredPropertyDefinitions();
-        $this->assertEquals(1, count($props), 'Wrong number of properties in phpcr:test');
+        $this->assertCount(1, $props, 'Wrong number of properties in phpcr:test');
         $this->assertEquals('phpcr:prop', $props[0]->getName());
         $this->assertFalse($props[0]->isMultiple());
     }
diff --git a/tests/22_SameNameSiblings/DeleteMethodsTest.php b/tests/22_SameNameSiblings/DeleteMethodsTest.php
@@ -124,7 +124,7 @@ public function testDeleteManyNodes()
         $this->saveAndRenewSession();
 
         $parent = $this->session->getNode($parentPath);
-        $this->assertEquals(count($childrenAtEnd), count($parent->getNodes()));
+        $this->assertCount(count($childrenAtEnd), $parent->getNodes());
 
         foreach ($parent->getNodes() as $node) {
             $child = each($childrenAtEnd);
diff --git a/tests/PhpcrUtils/CndParserTest.php b/tests/PhpcrUtils/CndParserTest.php

Original file line number	Diff line number	Diff line change
`@@ -337,7 +337,7 @@ public function testGetBooleanMulti()`
`337`	`337`	`foreach ($arr as $v) {`
`338`	`338`	`$this->assertInternalType('boolean', $v);`
`339`	`339`	`}`
`340`		`- $this->assertEquals(2, count($arr));`
	`340`	`+ $this->assertCount(2, $arr);`
`341`	`341`	`$this->assertFalse($arr[0]);`
`342`	`342`	`$this->assertTrue($arr[1]);`
`343`	`343`	`}`
`@@ -426,7 +426,7 @@ public function testGetPropertyMulti()`
`426`	`426`	`{`
`427`	`427`	`$propertyPath = $this->node->getNode('numberPropertyNode/jcr:content')->getProperty('multiPropertyPath');`
`428`	`428`	`$properties = $propertyPath->getProperty();`
`429`		`- $this->assertEquals(2, count($properties));`
	`429`	`+ $this->assertCount(2, $properties);`
`430`	`430`	`foreach ($properties as $prop) {`
`431`	`431`	`$this->assertInstanceOf('PHPCR\PropertyInterface', $prop);`
`432`	`432`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function testExecute()`
`51`	`51`	`{`
`52`	`52`	`$qr = $this->query->execute();`
`53`	`53`	`$this->assertInstanceOf('PHPCR\Query\QueryResultInterface', $qr);`
`54`		`- $this->assertEquals(5, count($qr->getRows()));`
	`54`	`+ $this->assertCount(5, $qr->getRows());`
`55`	`55`	`// we assume content is the same as for sql2`
`56`	`56`	`}`
`57`	`57`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public function testGetNodesAtOnce()`
`98`	`98`
`99`	`99`	`$keys[] = $path;`
`100`	`100`	`}`
`101`		`- $this->assertEquals(8, count($keys));`
	`101`	`+ $this->assertCount(8, $keys);`
`102`	`102`
`103`	`103`	`$this->assertContains('/tests_general_base/idExample/jcr:content/Test escaping_x0020bla <>\'" node', $keys);`
`104`	`104`	`}`
`@@ -159,7 +159,7 @@ public function testCompareNumberFields()`
`159`	`159`	`$rows[] = $row;`
`160`	`160`	`}`
`161`	`161`
`162`		`- $this->assertEquals(1, count($rows));`
	`162`	`+ $this->assertCount(1, $rows);`
`163`	`163`	`$this->assertEquals(10, $rows[0]->getValue('data.longNumberToCompare'));`
`164`	`164`	`}`
`165`	`165`
`@@ -176,7 +176,7 @@ public function testCompareStringFields()`
`176`	`176`	`$rows[] = $row;`
`177`	`177`	`}`
`178`	`178`
`179`		`- $this->assertEquals(1, count($rows));`
	`179`	`+ $this->assertCount(1, $rows);`
`180`	`180`	`$this->assertEquals(2, $rows[0]->getValue('data.stringToCompare'));`
`181`	`181`	`}`
`182`	`182`
`@@ -193,7 +193,7 @@ public function testBooleanField()`
`193`	`193`	`$rows[] = $row;`
`194`	`194`	`}`
`195`	`195`
`196`		`- $this->assertEquals(1, count($rows));`
	`196`	`+ $this->assertCount(1, $rows);`
`197`	`197`	`$this->assertEquals(false, $rows[0]->getValue('data.thisIsNo'));`
`198`	`198`
`199`	`199`	`$query = $this->sharedFixture['qm']->createQuery(`
`@@ -207,7 +207,7 @@ public function testBooleanField()`
`207`	`207`	`$rows[] = $row;`
`208`	`208`	`}`
`209`	`209`
`210`		`- $this->assertEquals(1, count($rows));`
	`210`	`+ $this->assertCount(1, $rows);`
`211`	`211`	`$this->assertEquals(true, $rows[0]->getValue('data.thisIsYes'));`
`212`	`212`	`}`
`213`	`213`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,14 +57,14 @@ public function testQueryFieldSomeNull()`
`57`	`57`	`$vals[] = ($node->hasProperty('foo') ? $node->getPropertyValue('foo') : null);`
`58`	`58`	`}`
`59`	`59`	`$this->assertContains('bar', $vals);`
`60`		`- $this->assertEquals(9, count($vals));`
	`60`	`+ $this->assertCount(9, $vals);`
`61`	`61`
`62`	`62`	`$vals = array();`
`63`	`63`	`foreach ($result->getRows() as $row) {`
`64`	`64`	`$vals[] = $row->getValue('foo');`
`65`	`65`	`}`
`66`	`66`	`$this->assertContains('bar', $vals);`
`67`		`- $this->assertEquals(9, count($vals));`
	`67`	`+ $this->assertCount(9, $vals);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`public function testQueryFieldSelector()`
Original file line number	Diff line number	Diff line change
`@@ -53,14 +53,14 @@ public function testQueryFieldSomenull()`
`53`	`53`	`$vals[] = ($node->hasProperty('foo') ? $node->getPropertyValue('foo') : null);`
`54`	`54`	`}`
`55`	`55`	`$this->assertContains('bar', $vals);`
`56`		`- $this->assertEquals(9, count($vals));`
	`56`	`+ $this->assertCount(9, $vals);`
`57`	`57`
`58`	`58`	`$vals = array();`
`59`	`59`	`foreach ($result->getRows() as $row) {`
`60`	`60`	`$vals[] = $row->getValue('foo');`
`61`	`61`	`}`
`62`	`62`	`$this->assertContains('bar', $vals);`
`63`		`- $this->assertEquals(9, count($vals));`
	`63`	`+ $this->assertCount(9, $vals);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public function testQueryOrder()`
Original file line number	Diff line number	Diff line change
`@@ -50,14 +50,14 @@ public function testQueryFieldSomenull()`
`50`	`50`	`$vals[] = ($node->hasProperty('foo') ? $node->getPropertyValue('foo') : null);`
`51`	`51`	`}`
`52`	`52`	`$this->assertContains('bar', $vals);`
`53`		`- $this->assertEquals(9, count($vals));`
	`53`	`+ $this->assertCount(9, $vals);`
`54`	`54`
`55`	`55`	`$vals = array();`
`56`	`56`	`foreach ($result->getRows() as $row) {`
`57`	`57`	`$vals[] = $row->getValue('foo');`
`58`	`58`	`}`
`59`	`59`	`$this->assertContains('bar', $vals);`
`60`		`- $this->assertEquals(9, count($vals));`
	`60`	`+ $this->assertCount(9, $vals);`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`public function testQueryOrder()`