Run more RDF* tests.

Author: gkellogg

spec/star_spec.rb

@@ -6,41 +6,45 @@
   describe "w3c turtle tests" do
     require 'suite_helper'
 
-    Fixtures::SuiteTest::Manifest.open("https://w3c.github.io/rdf-star/tests/turtle/syntax/manifest.ttl") do |m|
-      describe m.comment do
-        m.entries.each do |t|
-          specify "#{t.name}: #{t.comment}" do
-            t.logger = RDF::Spec.logger
-            t.logger.info t.inspect
-            t.logger.info "source:\n#{t.input}"
+    %w(nt/syntax turtle/syntax turtle/eval).each do |man|
+      Fixtures::SuiteTest::Manifest.open("https://w3c.github.io/rdf-star/tests/#{man}/manifest.ttl") do |m|
+        describe [m.label, m.comment].compact.join(': ') do
+          m.entries.each do |t|
+            specify "#{t.name}: #{t.comment}" do
+              t.logger = RDF::Spec.logger
+              t.logger.info t.inspect
+              t.logger.info "source:\n#{t.input}"
 
-            reader = RDF::Turtle::Reader.new(t.input,
-                base_uri:  t.base,
-                canonicalize:  false,
-                validate:  true,
-                rdfstar: true,
-                logger: t.logger)
+              reader_class = t.ntriples? ? RDF::NTriples::Reader : RDF::Turtle::Reader
 
-            graph = RDF::Repository.new
+              reader = reader_class.new(t.input,
+                  base_uri:  t.base,
+                  canonicalize:  false,
+                  validate:  true,
+                  rdfstar: true,
+                  logger: t.logger)
 
-            if t.positive_test?
-              begin
-                graph << reader
-              rescue Exception => e
-                expect(e.message).to produce("Not exception #{e.inspect}", t)
-              end
+              graph = RDF::Repository.new
+
+              if t.positive_test?
+                begin
+                  graph << reader
+                rescue Exception => e
+                  expect(e.message).to produce("Not exception #{e.inspect}", t)
+                end
 
-              if t.evaluate?
-                output_graph = RDF::Repository.load(t.result, format:  :ntriples, base_uri:  t.base)
-                expect(graph).to be_equivalent_graph(output_graph, t)
+                if t.evaluate?
+                  output_graph = RDF::Repository.load(t.result, format:  :ntriples, rdfstar: true, base_uri:  t.base)
+                  expect(graph).to be_equivalent_graph(output_graph, t)
+                else
+                  expect(graph).to be_a(RDF::Enumerable)
+                end
               else
-                expect(graph).to be_a(RDF::Enumerable)
+                expect {
+                  graph << reader
+                  expect(graph.dump(:ntriples)).to produce("not this", t)
+                }.to raise_error(RDF::ReaderError)
               end
-            else
-              expect {
-                graph << reader
-                expect(graph.dump(:ntriples)).to produce("not this", t)
-              }.to raise_error(RDF::ReaderError)
             end
           end
         end

spec/suite_helper.rb

@@ -146,7 +146,8 @@ module SuiteTest
         "mf": "http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#",
         "mq": "http://www.w3.org/2001/sw/DataAccess/tests/test-query#",
         "rdft": "http://www.w3.org/ns/rdftest#",
-    
+
+        "label": "rdfs:label",
         "comment": "rdfs:comment",
         "entries": {"@id": "mf:entries", "@container": "@list"},
         "name": "mf:name",
@@ -217,14 +218,18 @@ def entailment?
         Array(attributes['@type']).join(" ").match(/Entailment/)
       end
 
+      def ntriples?
+        Array(attributes['@type']).join(" ").match(/NTriples/)
+      end
+
       def positive_test?
         !Array(attributes['@type']).join(" ").match(/Negative/)
       end
-      
+
       def negative_test?
         !positive_test?
       end
-      
+
       def inspect
         super.sub('>', "\n" +
         "  syntax?: #{syntax?.inspect}\n" +