Skip to content

Commit 7d260c1

Browse files
dbudbu
authored
Merge pull request #189 from carusogabriel/improve-assertions
Improve assertions
2 parents 9d958ba + ebc9a8a commit 7d260c1

19 files changed

+66
-66
lines changed

‎tests/NodeTypeDiscovery/NodeDefinitionTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,24 +108,24 @@ public function getRequiredPrimaryTypeNames()
108108
{
109109
$names = $this->content->getRequiredPrimaryTypeNames();
110110
$this->assertInternalType('array', $names);
111-
$this->assertTrue(1, count($names));
111+
$this->assertCount(1, $names);
112112
$this->assertEquals('nt:base', $names[0]);
113113

114114
$names = $this->hierarchyNodeDef->getRequiredPrimaryTypeNames();
115115
$this->assertInternalType('array', $names);
116-
$this->assertTrue(1, count($names));
116+
$this->assertCount(1, $names);
117117
$this->assertEquals('nt:hierarchyNode', $names[0]);
118118
}
119119
public function getRequiredPrimaryTypes()
120120
{
121121
$types = $this->content->getRequiredPrimaryTypeNames();
122122
$this->assertInternalType('array', $types);
123-
$this->assertTrue(1, count($types));
123+
$this->assertCount(1, $types);
124124
$this->assertEquals(self::$base, $types[0]);
125125

126126
$types = $this->hierarchyNodeDef->getRequiredPrimaryTypeNames();
127127
$this->assertInternalType('array', $types);
128-
$this->assertTrue(1, count($types));
128+
$this->assertCount(1, $types);
129129
$this->assertEquals(self::$hierarchyNodeType, $types[0]);
130130
}
131131

‎tests/Observation/ObservationManagerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ protected function assertFilterOnPathDeep(ObservationManagerInterface $observati
242242
$journal->next();
243243

244244
// Notice the assertion is slightly different from the one in testFilterOnPathNoDeep
245-
$this->assertTrue(substr($event->getPath(), 0, strlen($this->nodePath.'/child')) === $this->nodePath.'/child');
245+
$this->assertSame($this->nodePath.'/child', substr($event->getPath(), 0, strlen($this->nodePath.'/child')));
246246
}
247247
}
248248

‎tests/PhpcrUtils/CndParserTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -157,10 +157,10 @@ public function testNoStopAtEofError()
157157
{
158158
$res = $this->cndParser->parseFile(__DIR__.'/resources/cnd/no-stop-at-eof.cnd');
159159

160-
$this->assertTrue(isset($res['namespaces']));
160+
$this->assertArrayHasKey('namespaces', $res);
161161
$this->assertEquals(['phpcr' => 'http://www.doctrine-project.org/projects/phpcr_odm'], $res['namespaces']);
162162

163-
$this->assertTrue(isset($res['nodeTypes']));
163+
$this->assertArrayHasKey('nodeTypes', $res);
164164
}
165165

166166
public function testBigFile()
@@ -169,10 +169,10 @@ public function testBigFile()
169169
$res = $this->cndParser->parseFile(__DIR__.'/resources/cnd/jackrabbit_nodetypes.cnd');
170170

171171
// some random sanity checks
172-
$this->assertTrue(isset($res['nodeTypes']));
172+
$this->assertArrayHasKey('nodeTypes', $res);
173173

174174
$def = $res['nodeTypes'];
175-
$this->assertTrue(isset($def['nt:file']));
175+
$this->assertArrayHasKey('nt:file', $def);
176176
/** @var $parsed NodeTypeDefinitionInterface */
177177
$parsed = $def['nt:file'];
178178
$this->assertEquals('nt:file', $parsed->getName());
@@ -190,10 +190,10 @@ public function testBigFile()
190190
*/
191191
protected function assertExampleCnd($res)
192192
{
193-
$this->assertTrue(isset($res['namespaces']));
193+
$this->assertArrayHasKey('namespaces', $res);
194194
$this->assertEquals(['ns' => 'http://namespace.com/ns'], $res['namespaces']);
195195

196-
$this->assertTrue(isset($res['nodeTypes']));
196+
$this->assertArrayHasKey('nodeTypes', $res);
197197
// get first node type
198198
reset($res['nodeTypes']);
199199
/** @var $def NodeTypeDefinitionInterface */

‎tests/Query/NodeViewTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,6 @@ public function testCountable()
7474
$nodes[] = $node;
7575
}
7676

77-
$this->assertEquals(count($nodes), $this->nodeIterator->count());
77+
$this->assertCount($this->nodeIterator->count(), $nodes);
7878
}
7979
}

‎tests/Query/QOM/QomToSql2ConverterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ protected function assertQuery($expectedSql2, $source, $columns = [], $constrain
411411

412412
$result = $this->parser->convert($query);
413413
if (is_array($expectedSql2)) {
414-
$this->assertTrue(in_array($result, $expectedSql2), "The statement '$result' does not match an expected variation");
414+
$this->assertContains($result, $expectedSql2, "The statement '$result' does not match an expected variation");
415415
} else {
416416
$this->assertEquals($expectedSql2, $result);
417417
}

‎tests/Query/QOM/Sql2ToQomConverterTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function testColumnsAndSelector()
5555
$this->assertEquals('nt:unstructured', $query->getSource()->getNodeTypeName());
5656

5757
$cols = $query->getColumns();
58-
$this->assertTrue(is_array($cols));
58+
$this->assertInternalType('array', $cols);
5959
$this->assertCount(2, $cols);
6060

6161
$this->assertEquals('u', $cols[0]->getselectorName());

‎tests/Query/QueryResultsTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public function testReadPropertyContentFromResults()
146146
{
147147
$seekName = '/tests_general_base/multiValueProperty';
148148

149-
$this->assertTrue(count($this->qr->getNodes()) > 0);
149+
$this->assertGreaterThan(0, count($this->qr->getNodes()));
150150
foreach ($this->qr->getNodes() as $path => $node) {
151151
if ($seekName == $path) {
152152
break;
@@ -202,7 +202,7 @@ public function testCompareNumberFieldsMulti()
202202
}
203203

204204
$this->assertCount(1, $rows);
205-
205+
206206
// returning a string value is, perhaps suprisingly, the correct behavior.
207207
$this->assertEquals('4 2 8', $rows[0]->getValue('data.longNumberToCompareMulti'));
208208
}

‎tests/Query/RowIteratorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,6 @@ public function testCountable()
7979
$rows[] = $row;
8080
}
8181

82-
$this->assertEquals(count($rows), $this->rowIterator->count());
82+
$this->assertCount($this->rowIterator->count(), $rows);
8383
}
8484
}

‎tests/Query/RowTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public function testGetNode()
8787

8888
public function testGetPath()
8989
{
90-
$this->assertTrue(in_array($this->row->getPath(), $this->resultPaths), 'not one of the expected results');
90+
$this->assertContains($this->row->getPath(), $this->resultPaths, 'not one of the expected results');
9191
}
9292

9393
public function testGetScore()

‎tests/Reading/BinaryReadMethodsTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,18 @@ public function setUp()
5555
public function testReadBinaryValue()
5656
{
5757
$binary = $this->binaryProperty->getBinary();
58-
$this->assertTrue(is_resource($binary));
58+
$this->assertInternalType('resource', $binary);
5959
$this->assertEquals($this->decodedstring, stream_get_contents($binary));
6060

6161
// stream must start when getting again
6262
$binary = $this->binaryProperty->getBinary();
63-
$this->assertTrue(is_resource($binary));
63+
$this->assertInternalType('resource', $binary);
6464
$this->assertEquals($this->decodedstring, stream_get_contents($binary), 'Stream must begin at start again on second read');
6565

6666
// stream must not be the same
6767
fclose($binary);
6868
$binary = $this->binaryProperty->getBinary();
69-
$this->assertTrue(is_resource($binary));
69+
$this->assertInternalType('resource', $binary);
7070
$this->assertEquals($this->decodedstring, stream_get_contents($binary), 'Stream must be different for each call, fclose should not matter');
7171
}
7272

@@ -100,7 +100,7 @@ public function testReadBinaryValues()
100100
$vals = $binaryMulti->getValue();
101101
$this->assertInternalType('array', $vals);
102102
foreach ($vals as $value) {
103-
$this->assertTrue(is_resource($value));
103+
$this->assertInternalType('resource', $value);
104104
$this->assertEquals($this->decodedstring, stream_get_contents($value));
105105
}
106106
}
@@ -161,8 +161,8 @@ public function testReadEmptyBinaryMultivalue()
161161
$empty = $node->getProperty('empty_multidata');
162162
$this->assertEquals(PropertyType::BINARY, $empty->getType());
163163
$emptyValue = $empty->getBinary();
164-
$this->assertTrue(is_array($emptyValue));
165-
$this->assertTrue(count($emptyValue) === 0);
164+
$this->assertInternalType('array', $emptyValue);
165+
$this->assertCount(0, $emptyValue);
166166
}
167167

168168
/**
@@ -174,8 +174,8 @@ public function testReadSingleBinaryMultivalue()
174174
$single = $node->getProperty('single_multidata');
175175
$this->assertEquals(PropertyType::BINARY, $single->getType());
176176
$singleValue = $single->getBinary();
177-
$this->assertTrue(is_array($singleValue));
178-
$this->assertTrue(is_resource($singleValue[0]));
177+
$this->assertInternalType('array', $singleValue);
178+
$this->assertInternalType('resource', $singleValue[0]);
179179
$contents = stream_get_contents($singleValue[0]);
180180
$this->assertEquals($this->decodedstring, $contents);
181181
}

‎tests/Reading/NodeReadMethodsTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ public function testGetIdentifierNonReferenceable()
496496
public function testGetIndex()
497497
{
498498
$index = $this->node->getIndex();
499-
$this->assertTrue(is_numeric($index));
499+
$this->assertInternalType('numeric', $index);
500500
$this->assertEquals(1, $index);
501501
}
502502

@@ -523,7 +523,7 @@ public function testGetReferencesAll()
523523
$this->assertCount(2, $iterator, 'Wrong number of references to idExample');
524524
foreach ($iterator as $prop) {
525525
$this->assertInstanceOf(PropertyInterface::class, $prop);
526-
$this->assertTrue(in_array($prop, $source));
526+
$this->assertContains($prop, $source);
527527
}
528528
}
529529

@@ -594,7 +594,7 @@ public function testGetWeakReferencesAll()
594594
$this->assertCount(3, $iterator, 'Wrong number of weak references to weakreference_target');
595595
foreach ($iterator as $prop) {
596596
$this->assertInstanceOf(PropertyInterface::class, $prop);
597-
$this->assertTrue(in_array($prop, $source, true));
597+
$this->assertContains($prop, $source);
598598
}
599599
}
600600

‎tests/Reading/PropertyReadMethodsTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,15 +207,15 @@ public function testGetStringMulti()
207207
public function testGetBinary()
208208
{
209209
$bin = $this->valProperty->getBinary();
210-
$this->assertTrue(is_resource($bin));
210+
$this->assertInternalType('resource', $bin);
211211
$str = $this->valProperty->getString();
212212
$this->assertEquals($str, stream_get_contents($bin));
213213
$this->assertEquals($this->valProperty->getLength(), strlen($str));
214214

215215
$prop = $this->node->getProperty('index.txt/jcr:content/jcr:data');
216216
$this->assertEquals(PropertyType::BINARY, $prop->getType(), 'Expected binary type');
217217
$bin = $prop->getValue();
218-
$this->assertTrue(is_resource($bin));
218+
$this->assertInternalType('resource', $bin);
219219
$this->assertNotNull(stream_get_contents($bin));
220220
fclose($bin);
221221
}
@@ -227,7 +227,7 @@ public function testGetBinaryMulti()
227227
$arr = $prop->getValue();
228228
$this->assertInternalType('array', $arr);
229229
foreach ($arr as $bin) {
230-
$this->assertTrue(is_resource($bin));
230+
$this->assertInternalType('resource', $bin);
231231
$this->assertNotNull(stream_get_contents($bin));
232232
}
233233
}

‎tests/Reading/SessionReadMethodsTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ public function testGetNodes()
9393
]);
9494

9595
$this->assertCount(2, $nodes);
96-
$this->assertTrue(isset($nodes['/tests_general_base']));
97-
$this->assertTrue(isset($nodes['/tests_general_base/numberPropertyNode']));
96+
$this->assertArrayHasKey('/tests_general_base', $nodes);
97+
$this->assertArrayHasKey('/tests_general_base/numberPropertyNode', $nodes);
9898

9999
foreach ($nodes as $key => $node) {
100100
$this->assertInstanceOf(NodeInterface::class, $node);
@@ -115,8 +115,8 @@ public function testGetNodesTraversable()
115115
]));
116116

117117
$this->assertCount(2, $nodes);
118-
$this->assertTrue(isset($nodes['/tests_general_base']));
119-
$this->assertTrue(isset($nodes['/tests_general_base/numberPropertyNode']));
118+
$this->assertArrayHasKey('/tests_general_base', $nodes);
119+
$this->assertArrayHasKey('/tests_general_base/numberPropertyNode', $nodes);
120120

121121
foreach ($nodes as $key => $node) {
122122
$this->assertInstanceOf(NodeInterface::class, $node);
@@ -169,8 +169,8 @@ public function testGetProperties()
169169
'/tests_general_base/../not_existing/jcr:primaryType',
170170
]);
171171
$this->assertCount(2, $properties);
172-
$this->assertTrue(isset($properties['/tests_general_base/jcr:primaryType']));
173-
$this->assertTrue(isset($properties['/tests_general_base/numberPropertyNode/jcr:primaryType']));
172+
$this->assertArrayHasKey('/tests_general_base/jcr:primaryType', $properties);
173+
$this->assertArrayHasKey('/tests_general_base/numberPropertyNode/jcr:primaryType', $properties);
174174
foreach ($properties as $key => $property) {
175175
$this->assertInstanceOf(PropertyInterface::class, $property);
176176
$this->assertEquals($key, $property->getPath());
@@ -186,8 +186,8 @@ public function testGetPropertiesTraversable()
186186
'/tests_general_base/../not_existing/jcr:primaryType',
187187
]));
188188
$this->assertCount(2, $properties);
189-
$this->assertTrue(isset($properties['/tests_general_base/jcr:primaryType']));
190-
$this->assertTrue(isset($properties['/tests_general_base/numberPropertyNode/jcr:primaryType']));
189+
$this->assertArrayHasKey('/tests_general_base/jcr:primaryType', $properties);
190+
$this->assertArrayHasKey('/tests_general_base/numberPropertyNode/jcr:primaryType', $properties);
191191
foreach ($properties as $key => $property) {
192192
$this->assertInstanceOf(PropertyInterface::class, $property);
193193
$this->assertEquals($key, $property->getPath());

‎tests/Versioning/VersionHistoryTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -402,15 +402,15 @@ public function testGetVersionLabels()
402402
$version = $history->getVersion('1.0');
403403

404404
$labels = $history->getVersionLabels($version);
405-
$this->assertEquals(2, count($labels));
406-
$this->assertTrue(in_array('stable', $labels));
407-
$this->assertTrue(in_array('labelname', $labels));
405+
$this->assertCount(2, $labels);
406+
$this->assertContains('stable', $labels);
407+
$this->assertContains('labelname', $labels);
408408

409409
$labels = $history->getVersionLabels();
410-
$this->assertEquals(3, count($labels));
411-
$this->assertTrue(in_array('stable', $labels));
412-
$this->assertTrue(in_array('labelname', $labels));
413-
$this->assertTrue(in_array('anotherlabelname', $labels));
410+
$this->assertCount(3, $labels);
411+
$this->assertContains('stable', $labels);
412+
$this->assertContains('labelname', $labels);
413+
$this->assertContains('anotherlabelname', $labels);
414414
}
415415

416416
/**

‎tests/Writing/CopyMethodsTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,8 @@ public function testCopyChildrenBinaryData()
275275
$srcVal = $srcProp->getBinary();
276276
$dstVal = $dstProp->getBinary();
277277

278-
$this->assertTrue(is_resource($srcVal), 'Failed to get src binary stream');
279-
$this->assertTrue(is_resource($dstVal), 'Failed to get dst binary stream');
278+
$this->assertInternalType('resource', $srcVal, 'Failed to get src binary stream');
279+
$this->assertInternalType('resource', $dstVal, 'Failed to get dst binary stream');
280280

281281
$this->assertEquals(stream_get_contents($srcVal), stream_get_contents($dstVal));
282282
}
@@ -303,13 +303,13 @@ public function testCopyChildrenBinaryDataMultivalue()
303303
$srcVal = $srcProp->getValue();
304304
$dstVal = $dstProp->getValue();
305305

306-
$this->assertTrue(is_array($srcVal), 'Failed to get src value');
307-
$this->assertTrue(is_array($dstVal), 'Failed to get dst value');
306+
$this->assertInternalType('array', $srcVal, 'Failed to get src value');
307+
$this->assertInternalType('array', $dstVal, 'Failed to get dst value');
308308

309-
$this->assertTrue(is_resource($srcVal[0]));
310-
$this->assertTrue(is_resource($srcVal[1]));
311-
$this->assertTrue(is_resource($dstVal[0]));
312-
$this->assertTrue(is_resource($dstVal[1]));
309+
$this->assertInternalType('resource', $srcVal[0]);
310+
$this->assertInternalType('resource', $srcVal[1]);
311+
$this->assertInternalType('resource', $dstVal[0]);
312+
$this->assertInternalType('resource', $dstVal[1]);
313313

314314
$this->assertEquals(stream_get_contents($srcVal[0]), stream_get_contents($dstVal[0]));
315315
$this->assertEquals(stream_get_contents($srcVal[1]), stream_get_contents($dstVal[1]));

‎tests/Writing/MixinCreatedTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public function testCreationNode()
4848
$this->assertInstanceOf(DateTime::class, $date);
4949
/* @var $date DateTime */
5050
$diff = time() - $date->getTimestamp();
51-
$this->assertTrue($diff < 60 * 10, 'jcr:created should be current date as fixture was just imported: '.$date->format('c'));
51+
$this->assertLessThan(60 * 10, $diff, 'jcr:created should be current date as fixture was just imported: '.$date->format('c'));
5252

5353
// Re-read the node to be sure things got properly saved
5454
$this->renewSession();
@@ -59,6 +59,6 @@ public function testCreationNode()
5959
$date = $child->getPropertyValue('jcr:created');
6060
$this->assertInstanceOf(DateTime::class, $date);
6161
$diff = time() - $date->getTimestamp();
62-
$this->assertTrue($diff < 60 * 10, 'jcr:created should be current date as fixture was just imported: '.$date->format('c'));
62+
$this->assertLessThan(60 * 10, $diff, 'jcr:created should be current date as fixture was just imported: '.$date->format('c'));
6363
}
6464
}

‎tests/Writing/NamespaceRegistryTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ public function testGetPrefixes()
4343
{
4444
$ret = $this->nr->getPrefixes();
4545
$this->assertInternalType('array', $ret);
46-
$this->assertTrue(count($ret) >= count($this->nsBuiltIn));
46+
$this->assertGreaterThanOrEqual(count($this->nsBuiltIn), count($ret));
4747
}
4848

4949
public function testGetURIs()
5050
{
5151
$ret = $this->nr->getURIs();
5252
$this->assertInternalType('array', $ret);
53-
$this->assertTrue(count($ret) >= count($this->nsBuiltIn));
53+
$this->assertGreaterThanOrEqual(count($this->nsBuiltIn), count($ret));
5454
//we test in getURI / getPrefix if the names match
5555
}
5656

@@ -150,6 +150,6 @@ public function testIterator()
150150
$this->assertInternalType('string', $url);
151151
$this->assertEquals($url, $this->nr->getURI($prefix));
152152
}
153-
$this->assertTrue($results > 3, 'Not enough namespaces');
153+
$this->assertGreaterThan(3, $results, 'Not enough namespaces');
154154
}
155155
}

0 commit comments

Comments
 (0)