Skip to content

Commit 60f2f7d

Browse files
PratikshaPratiksha
Pratiksha
authored and
Pratiksha
committed
fixed integration test
1 parent 3b3eae0 commit 60f2f7d

File tree

3 files changed

+47
-66
lines changed

3 files changed

+47
-66
lines changed

‎src/Results/ResultSet.php‎

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ class ResultSet implements IteratorAggregate, Countable
2222
* @param list<ResultRow> $rows
2323
*/
2424
public function __construct(
25-
private readonly array $rows,
26-
private readonly ?ResultCounters $counters = null,
27-
private readonly Bookmarks $bookmarks,
28-
private readonly ?ProfiledQueryPlan $profiledQueryPlan,
29-
private readonly AccessMode $accessMode
25+
public readonly array $rows,
26+
public readonly ?ResultCounters $counters = null,
27+
public readonly Bookmarks $bookmarks,
28+
public readonly ?ProfiledQueryPlan $profiledQueryPlan,
29+
public readonly AccessMode $accessMode
3030
) {
3131
}
3232

@@ -39,11 +39,6 @@ public function getIterator(): Traversable
3939
return new ArrayIterator($this->rows);
4040
}
4141

42-
public function getQueryCounters(): ?ResultCounters
43-
{
44-
return $this->counters;
45-
}
46-
4742
public function getProfiledQueryPlan(): ?ProfiledQueryPlan
4843
{
4944
return $this->profiledQueryPlan;
@@ -58,18 +53,4 @@ public function count(): int
5853
return count($this->rows);
5954
}
6055

61-
public function getBookmarks(): ?Bookmarks
62-
{
63-
return $this->bookmarks;
64-
}
65-
66-
public function getAccessMode(): ?AccessMode
67-
{
68-
return $this->accessMode;
69-
}
70-
71-
public function getData(): array
72-
{
73-
return $this->rows;
74-
}
7556
}

‎tests/Integration/Neo4jQueryAPIIntegrationTest.php‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function testParseRunQueryResponse(): void
4343
{
4444
$query = 'CREATE (n:TestNode {name: "Test"}) RETURN n';
4545
$response = $this->api->run($query);
46-
$bookmarks = $response->getBookmarks() ?? new Bookmarks([]);
46+
$bookmarks = $response->bookmarks ?? new Bookmarks([]);
4747

4848
$this->assertEquals(new ResultSet(
4949
rows: [
@@ -83,7 +83,7 @@ private function initializeApi(): Neo4jQueryAPI
8383
public function testCounters(): void
8484
{
8585
$result = $this->api->run('CREATE (x:Node {hello: "world"})');
86-
$queryCounters = $result->getQueryCounters();
86+
$queryCounters = $result->counters;
8787

8888
$this->assertNotNull($queryCounters);
8989
$this->assertEquals(1, $queryCounters->nodesCreated);
@@ -93,13 +93,13 @@ public function testCreateBookmarks(): void
9393
{
9494
$result = $this->api->run('CREATE (x:Node {hello: "world"})');
9595

96-
$bookmarks = $result->getBookmarks() ?? new Bookmarks([]);
96+
$bookmarks = $result->bookmarks ?? new Bookmarks([]);
9797

9898
$result = $this->api->run('CREATE (x:Node {hello: "world2"})');
99-
$bookmarks->addBookmarks($result->getBookmarks());
99+
$bookmarks->addBookmarks($result->bookmarks);
100100

101101
$result = $this->api->run('MATCH (x:Node {hello: "world2"}) RETURN x');
102-
$bookmarks->addBookmarks($result->getBookmarks());
102+
$bookmarks->addBookmarks($result->bookmarks);
103103

104104
$this->assertCount(1, $result);
105105
}
@@ -419,7 +419,7 @@ public function testWithExactNames(): void
419419
'names' => ['bob1', 'alicy']
420420
]);
421421

422-
$this->assertEquals($expected->getQueryCounters(), $results->getQueryCounters());
422+
$this->assertEquals($expected->counters, $results->counters);
423423

424424
// Ensure results are not empty
425425
$this->assertNotEmpty(iterator_to_array($results), 'No results returned from query.');
@@ -431,7 +431,7 @@ public function testWithExactNames(): void
431431

432432
$this->assertEquals(iterator_to_array($expected), $filteredResults);
433433

434-
$bookmarks = $results->getBookmarks() ?? new Bookmarks([]);
434+
$bookmarks = $results->bookmarks ?? new Bookmarks([]);
435435
$this->assertCount(1, $bookmarks);
436436
}
437437

@@ -452,12 +452,12 @@ public function testWithSingleName(): void
452452
'name' => 'bob1'
453453
]);
454454

455-
$this->assertEquals($expected->getQueryCounters(), $results->getQueryCounters());
455+
$this->assertEquals($expected->counters, $results->counters);
456456

457457
$filteredResults = array_slice(iterator_to_array($results), 0, 1);
458458
$this->assertEquals(iterator_to_array($expected), $filteredResults);
459459

460-
$bookmarks = $results->getBookmarks() ?: [];
460+
$bookmarks = $results->bookmarks ?: [];
461461
$this->assertCount(1, $bookmarks);
462462
}
463463

@@ -482,9 +482,9 @@ public function testWithInteger(): void
482482
'age' => 30
483483
]);
484484

485-
$this->assertEquals($expected->getQueryCounters(), $results->getQueryCounters());
485+
$this->assertEquals($expected->counters, $results->counters);
486486
$this->assertEquals(iterator_to_array($expected), iterator_to_array($results));
487-
$bookmarks = $results->getBookmarks() ?: [];
487+
$bookmarks = $results->bookmarks ?: [];
488488
$this->assertCount(1, $bookmarks);
489489
}
490490

@@ -510,9 +510,9 @@ public function testWithFloat(): void
510510
'height' => 1.75
511511
]);
512512

513-
$this->assertEquals($expected->getQueryCounters(), $results->getQueryCounters());
513+
$this->assertEquals($expected->counters, $results->counters);
514514
$this->assertEquals(iterator_to_array($expected), iterator_to_array($results));
515-
$bookmarks = $results->getBookmarks() ?: [];
515+
$bookmarks = $results->bookmarks ?: [];
516516
$this->assertCount(1, $bookmarks);
517517
}
518518

@@ -537,9 +537,9 @@ public function testWithNull(): void
537537
'middleName' => null
538538
]);
539539

540-
$this->assertEquals($expected->getQueryCounters(), $results->getQueryCounters());
540+
$this->assertEquals($expected->counters, $results->counters);
541541
$this->assertEquals(iterator_to_array($expected), iterator_to_array($results));
542-
$bookmarks = $results->getBookmarks() ?: [];
542+
$bookmarks = $results->bookmarks ?: [];
543543
$this->assertCount(1, $bookmarks);
544544
}
545545

@@ -564,9 +564,9 @@ public function testWithBoolean(): void
564564
'isActive' => true
565565
]);
566566

567-
$this->assertEquals($expected->getQueryCounters(), $results->getQueryCounters());
567+
$this->assertEquals($expected->counters, $results->counters);
568568
$this->assertEquals(iterator_to_array($expected), iterator_to_array($results));
569-
$bookmarks = $results->getBookmarks() ?: [];
569+
$bookmarks = $results->bookmarks ?: [];
570570
$this->assertCount(1, $bookmarks);
571571
}
572572

@@ -591,9 +591,9 @@ public function testWithString(): void
591591
'name' => 'Alice'
592592
]);
593593

594-
$this->assertEquals($expected->getQueryCounters(), $results->getQueryCounters());
594+
$this->assertEquals($expected->counters, $results->counters);
595595
$this->assertEquals(iterator_to_array($expected), iterator_to_array($results));
596-
$bookmarks = $results->getBookmarks() ?: [];
596+
$bookmarks = $results->bookmarks ?: [];
597597
$this->assertCount(1, $bookmarks);
598598
}
599599

@@ -620,9 +620,9 @@ public function testWithArray(): void
620620
['names' => ['bob1', 'alicy']]
621621
);
622622

623-
$this->assertEquals($expected->getQueryCounters(), $results->getQueryCounters());
623+
$this->assertEquals($expected->counters, $results->counters);
624624
$this->assertEquals(iterator_to_array($expected), iterator_to_array($results));
625-
$bookmarks = $results->getBookmarks() ?: [];
625+
$bookmarks = $results->bookmarks ?: [];
626626
$this->assertCount(1, $bookmarks);
627627
}
628628

@@ -649,9 +649,9 @@ public function testWithDate(): void
649649
['date' => "2024-12-11T11:00:00Z"]
650650
);
651651

652-
$this->assertEquals($expected->getQueryCounters(), $results->getQueryCounters());
652+
$this->assertEquals($expected->counters, $results->counters);
653653
$this->assertEquals(iterator_to_array($expected), iterator_to_array($results));
654-
$bookmarks = $results->getBookmarks() ?: [];
654+
$bookmarks = $results->bookmarks ?: [];
655655
$this->assertCount(1, $bookmarks);
656656
}
657657

@@ -678,9 +678,9 @@ public function testWithDuration(): void
678678
['duration' => 'P14DT16H12M'],
679679
);
680680

681-
$this->assertEquals($expected->getQueryCounters(), $results->getQueryCounters());
681+
$this->assertEquals($expected->counters, $results->counters);
682682
$this->assertEquals(iterator_to_array($expected), iterator_to_array($results));
683-
$bookmarks = $results->getBookmarks() ?: [];
683+
$bookmarks = $results->bookmarks ?: [];
684684
$this->assertCount(1, $bookmarks);
685685
}
686686

@@ -712,9 +712,9 @@ public function testWithWGS84_2DPoint(): void
712712
);
713713

714714

715-
$this->assertEquals($expected->getQueryCounters(), $results->getQueryCounters());
715+
$this->assertEquals($expected->counters, $results->counters);
716716
$this->assertEquals(iterator_to_array($expected), iterator_to_array($results));
717-
$bookmarks = $results->getBookmarks() ?: [];
717+
$bookmarks = $results->bookmarks ?: [];
718718
$this->assertCount(1, $bookmarks);
719719
}
720720

@@ -746,9 +746,9 @@ public function testWithWGS84_3DPoint(): void
746746
);
747747

748748

749-
$this->assertEquals($expected->getQueryCounters(), $results->getQueryCounters());
749+
$this->assertEquals($expected->counters, $results->counters);
750750
$this->assertEquals(iterator_to_array($expected), iterator_to_array($results));
751-
$bookmarks = $results->getBookmarks() ?: [];
751+
$bookmarks = $results->bookmarks ?: [];
752752
$this->assertCount(1, $bookmarks);
753753
}
754754

@@ -779,9 +779,9 @@ public function testWithCartesian2DPoint(): void
779779
);
780780

781781

782-
$this->assertEquals($expected->getQueryCounters(), $results->getQueryCounters());
782+
$this->assertEquals($expected->counters, $results->counters);
783783
$this->assertEquals(iterator_to_array($expected), iterator_to_array($results));
784-
$bookmarks = $results->getBookmarks() ?: [];
784+
$bookmarks = $results->bookmarks ?: [];
785785
$this->assertCount(1, $bookmarks);
786786
}
787787

@@ -813,9 +813,9 @@ public function testWithCartesian3DPoint(): void
813813
);
814814

815815

816-
$this->assertEquals($expected->getQueryCounters(), $results->getQueryCounters());
816+
$this->assertEquals($expected->counters, $results->counters);
817817
$this->assertEquals(iterator_to_array($expected), iterator_to_array($results));
818-
$bookmarks = $results->getBookmarks() ?: [];
818+
$bookmarks = $results->bookmarks ?: [];
819819
$this->assertCount(1, $bookmarks);
820820
}
821821

@@ -858,9 +858,9 @@ public function testWithNode(): void
858858
);
859859

860860

861-
$this->assertEquals($expected->getQueryCounters(), $results->getQueryCounters());
861+
$this->assertEquals($expected->counters, $results->counters);
862862
$this->assertEquals(iterator_to_array($expected), iterator_to_array($results));
863-
$bookmarks = $results->getBookmarks() ?: [];
863+
$bookmarks = $results->bookmarks ?: [];
864864
$this->assertCount(1, $bookmarks);
865865
}
866866

@@ -908,9 +908,9 @@ public function testWithPath(): void
908908
);
909909

910910

911-
$this->assertEquals($expected->getQueryCounters(), $results->getQueryCounters());
911+
$this->assertEquals($expected->counters, $results->counters);
912912
$this->assertEquals(iterator_to_array($expected), iterator_to_array($results));
913-
$bookmarks = $results->getBookmarks() ?: [];
913+
$bookmarks = $results->bookmarks ?: [];
914914
$this->assertCount(1, $bookmarks);
915915
}
916916

@@ -941,9 +941,9 @@ public function testWithMap(): void
941941
);
942942

943943

944-
$this->assertEquals($expected->getQueryCounters(), $results->getQueryCounters());
944+
$this->assertEquals($expected->counters, $results->counters);
945945
$this->assertEquals(iterator_to_array($expected), iterator_to_array($results));
946-
$bookmarks = $results->getBookmarks() ?: [];
946+
$bookmarks = $results->bookmarks ?: [];
947947
$this->assertCount(1, $bookmarks);
948948
}
949949

@@ -1001,9 +1001,9 @@ public function testWithRelationship(): void
10011001
);
10021002

10031003

1004-
$this->assertEquals($expected->getQueryCounters(), $results->getQueryCounters());
1004+
$this->assertEquals($expected->counters, $results->counters);
10051005
$this->assertEquals(iterator_to_array($expected), iterator_to_array($results));
1006-
$bookmarks = $results->getBookmarks() ?: [];
1006+
$bookmarks = $results->bookmarks ?: [];
10071007
$this->assertCount(1, $bookmarks);
10081008
}
10091009
}

‎tests/Unit/Neo4jQueryAPIUnitTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public function testParseBookmarks(): void
136136
$result = $this->parser->parseRunQueryResponse($mockResponse);
137137
$this->assertInstanceOf(ResultSet::class, $result);
138138

139-
$bookmarks = $result->getBookmarks();
139+
$bookmarks = $result->bookmarks;
140140
$this->assertInstanceOf(Bookmarks::class, $bookmarks);
141141
$this->assertCount(3, $bookmarks->getBookmarks());
142142
$this->assertEquals(['bm1', 'bm2', 'bm3'], $bookmarks->getBookmarks());

0 commit comments

Comments
 (0)