Updates for test suite locations.

Author: gkellogg

script/tc

@@ -44,12 +44,12 @@ def earl_preamble(**options)
 end
 
 def run_tc(tc, **options)
-  STDERR.write "run #{tc.name}"
+  STDERR.write "run #{tc.name} "
 
   if options[:verbose]
     puts "\nTestCase: #{tc.inspect}"
     puts "\nInput:\n" + tc.input 
-    puts "\nExpected:\n" + tc.expected
+    puts "\nExpected:\n" + tc.expected if tc.expected
   end
 
   logger = options[:live] ? Logger.new(STDERR) : RDF::Spec.logger
@@ -61,6 +61,7 @@ def run_tc(tc, **options)
     options = {
       base_uri:  tc.base,
       validate:  true,
+      rdfstar: true,
       logger: logger
     }.merge(options)
 
@@ -86,11 +87,14 @@ def run_tc(tc, **options)
       end
     end
 
-    STDERR.puts "Result: #{graph.dump(:ntriples)}" if options[:verbose]
+    STDERR.puts "Result:\n#{graph.dump(:ntriples)}" if options[:verbose]
 
     if tc.evaluate? && result.nil?
       output_graph = RDF::Repository.load(tc.result, format:  :ntriples, base_uri: tc.base, rdfstar: true)
       result = graph.isomorphic_with?(output_graph) ? "passed" : "failed"
+    elsif tc.c14n? && result.nil?
+      c14n = RDF::NTriples::Writer.buffer {|w| w << graph}
+      result = c14n == tc.expected ? "passed" : "failed"
     else
       result ||= "passed"
     end
@@ -142,7 +146,6 @@ OPT_ARGS = [
   ["--ntriples",        GetoptLong::NO_ARGUMENT, "Run N-Triples tests"],
   ["--output", "-o",    GetoptLong::REQUIRED_ARGUMENT, "Output to specified file"],
   ["--quiet", "-q",     GetoptLong::NO_ARGUMENT, "Minimal output"],
-  ["--rdfstar",         GetoptLong::NO_ARGUMENT, "Run RDF-star tests"],
   ["--skip-slow", "-s", GetoptLong::NO_ARGUMENT, "Avoid files taking too much time"],
   ["--validate",        GetoptLong::NO_ARGUMENT, "Validate input"],
   ["--verbose", "-v",   GetoptLong::NO_ARGUMENT, "Verbose output"],
@@ -185,22 +188,25 @@ opts.each do |opt, arg|
   when '--quiet'
     options[:quiet] = true
     options[:level] = Logger::FATAL
-  when '--rdfstar'          then options[:rdfstar] = true
   when '--skip-slow'        then options[:slow] = true
   when '--validate'         then options[:validate] = true
   when '--verbose'          then options[:verbose] = true
   # when '--write-manifests'  then options[:write_manifests] = true
   end
 end
 
-manifests = if options[:rdfstar]
-  %w{nt/syntax turtle/syntax turtle/eval}.map do
-    |man| "https://w3c.github.io/rdf-star/tests/#{man}/"
-  end
-elsif options[:ntriples]
-  [Fixtures::SuiteTest::BASE + "rdf11/rdf-n-triples/"]
+manifests = if options[:ntriples]
+  [
+    Fixtures::SuiteTest::BASE + "rdf11/rdf-n-triples/",
+    Fixtures::SuiteTest::BASE + "rdf12/rdf-n-triples/syntax/",
+    Fixtures::SuiteTest::BASE + "rdf12/rdf-n-triples/c14n/",
+  ]
 else
-  [Fixtures::SuiteTest::BASE + "rdf11/rdf-turtle/"]
+  [
+    Fixtures::SuiteTest::BASE + "rdf11/rdf-turtle/",
+    Fixtures::SuiteTest::BASE + "rdf12/rdf-turtle/syntax/",
+    Fixtures::SuiteTest::BASE + "rdf12/rdf-turtle/eval/",
+  ]
 end.map {|m| "#{m}manifest.ttl"}
 
 earl_preamble(**options) if options[:earl]

spec/ntriples_spec.rb

@@ -6,7 +6,7 @@
   describe "w3c N-Triples tests" do
     require 'suite_helper'
 
-    %w(rdf11/rdf-n-triples/manifest.ttl).each do |man|
+    %w(rdf11/rdf-n-triples/manifest.ttl rdf12/rdf-n-triples/c14n/manifest.ttl).each do |man|
       Fixtures::SuiteTest::Manifest.open(Fixtures::SuiteTest::BASE + man) do |m|
         describe m.comment do
           m.entries.each do |t|
@@ -37,6 +37,9 @@
               if t.evaluate?
                 output_graph = RDF::Graph.load(t.result, format:  :ntriples, base_uri:  t.base)
                 expect(graph).to be_equivalent_graph(output_graph, t)
+              elsif t.c14n?
+                c14n = RDF::NTriples::Writer.buffer {|w| w << graph}
+                expect(c14n).to eql t.expected
               else
                 expect(graph).to be_a(RDF::Enumerable)
               end

spec/star_spec.rb

@@ -2,12 +2,15 @@
 require 'spec_helper'
 
 describe RDF::Turtle::Reader do
-  # W3C Turtle Test suite from http://w3c.github.io/rdf-tests/turtle/manifest.ttl
+  # W3C Turtle Test suite from http://w3c.github.io/rdf-tests/rdf/rdf12/
   describe "w3c turtle tests" do
     require 'suite_helper'
 
-    %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|
+    %w(
+      rdf12/rdf-n-triples/syntax/manifest.ttl
+      rdf12/rdf-turtle/syntax/manifest.ttl
+      rdf12/rdf-turtle/eval/manifest.ttl).each do |man|
+      Fixtures::SuiteTest::Manifest.open(Fixtures::SuiteTest::BASE + man) do |m|
         describe [m.label, m.comment].compact.join(': ') do
           m.entries.each do |t|
             specify "#{t.name}: #{t.comment}" do

spec/suite_helper.rb

@@ -8,8 +8,6 @@ module RDF::Util
   module File
     REMOTE_PATH = "https://w3c.github.io/rdf-tests/rdf/"
     LOCAL_PATH = ::File.expand_path("../w3c-rdf-tests/rdf/", __FILE__) + '/'
-    REMOTE_PATH_STAR = "https://w3c.github.io/rdf-star/"
-    LOCAL_PATH_STAR = ::File.expand_path("../w3c-rdf-star/", __FILE__) + '/'
 
     class << self
       alias_method :original_open_file, :open_file
@@ -55,38 +53,6 @@ def self.open_file(filename_or_url, **options, &block)
         # For overriding content type from test data
         document_options[:headers][:content_type] = options[:contentType] if options[:contentType]
 
-        remote_document = RDF::Util::File::RemoteDocument.new(response.read, **document_options)
-        if block_given?
-          yield remote_document
-        else
-          remote_document
-        end
-      when (filename_or_url.to_s =~ %r{^#{REMOTE_PATH_STAR}} && Dir.exist?(LOCAL_PATH_STAR))
-        #puts "attempt to open #{filename_or_url} locally"
-        localpath = filename_or_url.to_s.sub(REMOTE_PATH_STAR, LOCAL_PATH_STAR)
-        response = begin
-          ::File.open(localpath)
-        rescue Errno::ENOENT => e
-          raise IOError, e.message
-        end
-        document_options = {
-          base_uri:     RDF::URI(filename_or_url),
-          charset:      Encoding::UTF_8,
-          code:         200,
-          headers:      {}
-        }
-        #puts "use #{filename_or_url} locally"
-        document_options[:headers][:content_type] = case filename_or_url.to_s
-        when /\.ttl$/    then 'text/turtle'
-        when /\.nt$/     then 'application/n-triples'
-        when /\.jsonld$/ then 'application/ld+json'
-        else                  'unknown'
-        end
-
-        document_options[:headers][:content_type] = response.content_type if response.respond_to?(:content_type)
-        # For overriding content type from test data
-        document_options[:headers][:content_type] = options[:contentType] if options[:contentType]
-
         remote_document = RDF::Util::File::RemoteDocument.new(response.read, **document_options)
         if block_given?
           yield remote_document
@@ -96,6 +62,8 @@ def self.open_file(filename_or_url, **options, &block)
       else
         original_open_file(filename_or_url, **options, &block)
       end
+    rescue IOError => e
+      raise IOError, "Error opening #{filename_or_url.inspect}: #{e.message}"
     end
   end
 end
@@ -112,6 +80,7 @@ module SuiteTest
         "rdft": "http://www.w3.org/ns/rdftest#",
 
         "label": "rdfs:label",
+        "baseIri": {"@id": "mf:assumedTestBase", "@type": "@id"},
         "comment": "rdfs:comment",
         "entries": {"@id": "mf:entries", "@container": "@list"},
         "name": "mf:name",
@@ -125,6 +94,8 @@ module SuiteTest
           "rdft:TestTurtleNegativeSyntax",
           "rdft:TestNTriplesPositiveSyntax",
           "rdft:TestNTriplesNegativeSyntax",
+          "rdft:TestNTriplesPositiveC14N",
+          "rdft:TestNTriplesNegativeC14N",
           "rdft:TestTurtleEval",
           "rdft:TestTurtleNegativeEval"
         ]
@@ -150,15 +121,20 @@ def self.from_jsonld(json)
 
       def entries
         # Map entries to resources
-        attributes['entries'].map {|e| Entry.new(e)}
+        attributes['entries'].map {|e| Entry.new(e, base_iri: attributes['baseIri'])}
       end
     end
 
     class Entry < JSON::LD::Resource
       attr_accessor :logger
 
+      def initialize(json, base_iri:)
+        @base_iri = base_iri
+        super
+      end
+
       def base
-        RDF::URI(action)
+        RDF::URI(@base_iri || action)
       end
 
       # Alias data and query
@@ -167,23 +143,23 @@ def input
       end
 
       def expected
-        @expected ||= RDF::Util::File.open_file(result) {|f| f.read}
+        @expected ||= RDF::Util::File.open_file(result) {|f| f.read} if result
       end
 
       def evaluate?
         Array(attributes['@type']).join(" ").match(/Eval/)
       end
 
       def syntax?
-        Array(attributes['@type']).join(" ").match(/Syntax/)
+        !!Array(attributes['@type']).join(" ").match(/Syntax/)
       end
 
       def entailment?
-        Array(attributes['@type']).join(" ").match(/Entailment/)
+        !!Array(attributes['@type']).join(" ").match(/Entailment/)
       end
 
       def ntriples?
-        Array(attributes['@type']).join(" ").match(/NTriples/)
+        !!Array(attributes['@type']).join(" ").match(/NTriples/)
       end
 
       def positive_test?
@@ -194,6 +170,10 @@ def negative_test?
         !positive_test?
       end
 
+      def c14n?
+        !!Array(attributes['@type']).join(" ").match(/C14N/)
+      end
+
       def inspect
         super.sub('>', "\n" +
         "  syntax?: #{syntax?.inspect}\n" +