Merge commit '84dc2fd5a0a5cad6fff99b3d2a088de9e83d9367'

app/Tdt/Core/Tests/Api/ModelPagingTest.php

@@ -163,16 +163,31 @@ private function processDcat()
 
         $total_triples = $parser->parse($graph, $turtle, 'turtle', '');
 
+        $datasets = $graph->allOfType('dcat:Dataset');
+
         // Make sure triples are created and inserted into the graph
-        $this->assertEquals(33, $total_triples);
+        $this->assertEquals(2, count($datasets));
+
+        foreach ($datasets as $dataset) {
+
+            $literal_properties = ['dc:title', 'dc:description', 'dc:identifier', 'dc:issued', 'dc:modified'];
+
+            foreach ($literal_properties as $property) {
+
+                $literal = $dataset->getLiteral($property);
+
+                $this->assertNotEmpty($literal);
+            }
+
+            // Get the distribution
+            $distribution = $dataset->getResource('dcat:distribution');
+
+            $this->assertNotEmpty($distribution);
+        }
 
-        // This array will hold 7 entries, one for the Dcat catalog entry itself
-        // and the two first entries of the definitions it gets from the controller
-        // their distributions
-        // and the various license entries
-        $dcat_array = $graph->toRdfPhp();
+        $catalog = $graph->allOfType('dcat:Catalog');
 
-        $this->assertEquals(7, count($dcat_array));
+        $this->assertEquals(1, count($catalog));
 
         $this->processLinkHeader($response);
     }