Adjust to rdfInterface v2

sweetrdf · Jul 26, 2023 · f76d4cd · f76d4cd
1 parent 2d31b80
commit f76d4cd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/composer.json b/composer.json
@@ -14,11 +14,11 @@
     ],
     "require": {
         "php": ">=8.0",
-        "sweetrdf/rdf-interface": "^1.1.0-RC4",
-        "sweetrdf/rdf-helpers": "^1.1.0-RC3"
+        "sweetrdf/rdf-interface": "^2.0.0-RC1",
+        "sweetrdf/rdf-helpers": "^1.0.2"
     },
     "suggest": {
-        "sweetrdf/quick-rdf": "^1.0",
+        "sweetrdf/quick-rdf": "^2.0.0-RC1",
         "sweetrdf/easyrdf": "^1.4"
     },
     "autoload": {
@@ -30,7 +30,7 @@
         "phpunit/phpunit": "^9.5",
         "phpstan/phpstan": "*",
         "php-coveralls/php-coveralls": "^2.4",
-        "sweetrdf/quick-rdf": "^1.0",
+        "sweetrdf/quick-rdf": "^2.0.0-RC1",
         "sweetrdf/easyrdf": "^1.4"
     },
     "autoload-dev": {

diff --git a/tests/AsEasyRdfTest.php b/tests/AsEasyRdfTest.php
@@ -28,17 +28,17 @@
 
 use quickRdf\DataFactory as DF;
 use quickRdf\Dataset;
+use quickRdf\DatasetNode;
 use rdfInterface2easyRdf\AsEasyRdf;
 use EasyRdf\Literal;
 use EasyRdf\Resource;
 use EasyRdf\Graph;
-use rdfHelpers\DatasetNode;
 
 /**
  *
  * @author zozlak
  */
-class DatasetTest extends \PHPUnit\Framework\TestCase {
+class AsEasyRdfTest extends \PHPUnit\Framework\TestCase {
 
     public function testAsEasyRdf(): void {
         $blank    = DF::blankNode();
@@ -49,7 +49,7 @@ public function testAsEasyRdf(): void {
         $quad     = DF::quad($blank, $named, $literal2);
         $dataset  = new Dataset();
         $dataset->add($quad);
-        $node     = new DatasetNode($dataset, $named);
+        $node     = DatasetNode::factory($named)->withDataset($dataset);
 
         $tmp = AsEasyRdf::asEasyRdf($blank);
         $this->assertInstanceOf(Resource::class, $tmp);
@@ -118,8 +118,8 @@ public function testAsResource(): void {
         $literal2 = DF::literal('bar', 'en');
         $dataset  = new Dataset();
         $dataset->add(DF::quad($blank, $named, $literal2));
-        $node     = new DatasetNode($dataset, $named);
-        
+        $node     = DatasetNode::factory($named)->withDataset($dataset);
+
         $tmp = AsEasyRdf::asResource($blank);
         $this->assertInstanceOf(Resource::class, $tmp);
         $this->assertTrue($tmp->isBNode());
@@ -141,9 +141,9 @@ public function testAsGraph(): void {
         $literal2 = DF::literal('bar', 'en');
         $dataset  = new Dataset();
         $dataset->add(DF::quad($blank, $named, $literal2));
-        $node     = new DatasetNode($dataset, $named);
-        
-        $tmp  = AsEasyRdf::asGraph($node);
+        $node     = DatasetNode::factory($named)->withDataset($dataset);
+
+        $tmp = AsEasyRdf::asGraph($node);
         $this->assertInstanceOf(Graph::class, $tmp);
         $res = $tmp->resources();
         $this->assertCount(2, $res);

diff --git a/tests/AsRdfInterfaceTest.php b/tests/AsRdfInterfaceTest.php
@@ -35,8 +35,8 @@
 use quickRdf\Literal;
 use quickRdf\Quad;
 use quickRdf\Dataset;
+use quickRdf\DatasetNode;
 use rdfHelpers\GenericQuadIterator;
-use rdfHelpers\DatasetNode;
 use rdfInterface2easyRdf\AsRdfInterface;
 
 /**
@@ -275,7 +275,7 @@ public function testAdd(): void {
         $this->assertCount(1, $triples);
         $this->assertTrue($quad1->equals($triples[0]));
 
-        $datasetNode  = AsRdfInterface::add($res1, self::$df, fn($x) => new DatasetNode(new Dataset(), $x));
+        $datasetNode  = AsRdfInterface::add($res1, self::$df, fn($x) => DatasetNode::factory($x));
         $this->assertInstanceOf(DatasetNode::class, $datasetNode);
         $this->assertTrue($quad1->getSubject()->equals($datasetNode->getNode()));
         $resTriples   = iterator_to_array($datasetNode->getIterator());
@@ -285,7 +285,7 @@ public function testAdd(): void {
         $this->assertCount(2, $graphTriples);
         $this->assertTrue($quad1->equals($graphTriples[0]) && $quad2->equals($graphTriples[1]) || $quad1->equals($graphTriples[1]) && $quad2->equals($graphTriples[0]));
 
-        $datasetNode  = AsRdfInterface::add($res1, self::$df, new DatasetNode(new Dataset(), self::$df::blankNode()), false);
+        $datasetNode  = AsRdfInterface::add($res1, self::$df, DatasetNode::factory(self::$df::blankNode()), false);
         $this->assertInstanceOf(DatasetNode::class, $datasetNode);
         $this->assertTrue($quad1->getSubject()->equals($datasetNode->getNode()));
         $resTriples   = iterator_to_array($datasetNode->getIterator());
@@ -354,7 +354,7 @@ public function testAddDatasetNode(): void {
         $quad1 = self::$df::quad(self::$df::namedNode('http://foo'), self::$df::namedNode('http://baz'), self::$df::literal('literal'));
         $quad2 = self::$df::quad(self::$df::namedNode('http://bar'), self::$df::namedNode('http://baz'), self::$df::namedNode('resource'));
 
-        $datasetNode  = AsRdfInterface::addDatasetNode($res1, self::$df, new DatasetNode(new Dataset(), self::$df::blankNode()));
+        $datasetNode  = AsRdfInterface::addDatasetNode($res1, self::$df, DatasetNode::factory(self::$df::blankNode()));
         $this->assertInstanceOf(DatasetNode::class, $datasetNode);
         $this->assertTrue($quad1->getSubject()->equals($datasetNode->getNode()));
         $resTriples   = iterator_to_array($datasetNode->getIterator());
@@ -364,7 +364,7 @@ public function testAddDatasetNode(): void {
         $this->assertCount(2, $graphTriples);
         $this->assertTrue($quad1->equals($graphTriples[0]) && $quad2->equals($graphTriples[1]) || $quad1->equals($graphTriples[1]) && $quad2->equals($graphTriples[0]));
 
-        $dataset      = AsRdfInterface::addDatasetNode($res1, self::$df, fn($x) => new DatasetNode(new Dataset(), $x));
+        $dataset      = AsRdfInterface::addDatasetNode($res1, self::$df, fn($x) => DatasetNode::factory($x));
         $this->assertInstanceOf(DatasetNode::class, $datasetNode);
         $this->assertTrue($quad1->getSubject()->equals($datasetNode->getNode()));
         $resTriples   = iterator_to_array($datasetNode->getIterator());
@@ -374,7 +374,7 @@ public function testAddDatasetNode(): void {
         $this->assertCount(2, $graphTriples);
         $this->assertTrue($quad1->equals($graphTriples[0]) && $quad2->equals($graphTriples[1]) || $quad1->equals($graphTriples[1]) && $quad2->equals($graphTriples[0]));
 
-        $datasetNode  = AsRdfInterface::addDatasetNode($res1, self::$df, new DatasetNode(new Dataset(), self::$df::blankNode()), false);
+        $datasetNode  = AsRdfInterface::addDatasetNode($res1, self::$df, DatasetNode::factory(self::$df::blankNode()), false);
         $this->assertInstanceOf(DatasetNode::class, $datasetNode);
         $this->assertTrue($quad1->getSubject()->equals($datasetNode->getNode()));
         $resTriples   = iterator_to_array($datasetNode->getIterator());