Makes RDF testsuites parsing more robust

lib/src/model/graph.rs

@@ -174,6 +174,11 @@ impl Graph {
         self.graph_mut().remove(triple)
     }
 
+    /// Clears the graph
+    pub fn clear(&mut self) {
+        self.dataset.clear()
+    }
+
     /// Loads a file into the graph.
     ///
     /// Usage example:

testsuite/src/manifest.rs

@@ -246,12 +246,15 @@ impl Iterator for TestManifest {
             None => {
                 match self.manifests_to_do.pop() {
                     Some(url) => {
-                        let manifest = SubjectRef::from(NamedNodeRef::new(url.as_str()).unwrap());
+                        self.graph.clear();
                         if let Err(error) = load_to_graph(&url, &mut self.graph) {
                             return Some(Err(error));
                         }
 
-                        // New manifests
+                        for manifest in self
+                            .graph
+                            .subjects_for_predicate_object(rdf::TYPE, mf::MANIFEST)
+                        {
                             match self
                                 .graph
                                 .object_for_subject_predicate(manifest, mf::INCLUDE)
@@ -280,11 +283,15 @@ impl Iterator for TestManifest {
                                         .extend(RdfListIterator::iter(&self.graph, list.into()));
                                 }
                                 Some(term) => {
-                                return Some(Err(anyhow!("Invalid tests list. Got term {}", term)));
+                                    return Some(Err(anyhow!(
+                                        "Invalid tests list. Got term {}",
+                                        term
+                                    )));
                                 }
                                 None => (),
                             }
                         }
+                    }
                     None => return None,
                 }
                 self.next()

testsuite/src/vocab.rs

@@ -34,6 +34,9 @@ pub mod mf {
     pub const ENTRIES: NamedNodeRef<'_> = NamedNodeRef::new_unchecked(
         "http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#entries",
     );
+    pub const MANIFEST: NamedNodeRef<'_> = NamedNodeRef::new_unchecked(
+        "http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#Manifest",
+    );
     pub const NAME: NamedNodeRef<'_> = NamedNodeRef::new_unchecked(
         "http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#name",
     );