rdf-rdfa 0.0.3 → 0.2.1

data/spec/matchers.rb

@@ -2,51 +2,16 @@ module Matchers
   class BeEquivalentGraph
     Info = Struct.new(:about, :information, :trace, :compare, :inputDocument, :outputDocument)
     def normalize(graph)
-      case @info.compare
-      when :array
-        array = case graph
-        when Graph, Parser
-          graph = graph.graph if graph.respond_to?(:graph)
-          anon = "a"
-          anon_ctx = {}
-          graph.triples.collect {|triple| triple.to_ntriples }.each do |t|
-            t.gsub(/_:nbn\d+[a-z]+N/, "_:").
-            gsub!(/_:bn\d+[a-z]+/) do |bn|
-              # Normalize anon BNodes
-              if anon_ctx[bn]
-                anon_ctx[bn]
-              else
-                anon_ctx[bn] = anon
-                anon = anon.succ
-              end
-              "_:#{anon_ctx[bn]}"
-            end
-          end.sort
-        when Array
-          graph.sort
-        else
-          graph.to_s.split("\n").
-            map {|t| t.gsub(/^\s*(.*)\s*$/, '\1')}.
-            reject {|t2| t2.match(/^\s*$/)}.
-            compact.
-            sort.
-            uniq
-        end
-        
-        # Implement to_ntriples on array, to simplify logic later
-        def array.to_ntriples; self.join("\n") + "\n"; end
-        array
+      case graph
+      when RDF::Graph then graph
+      when IO, StringIO
+        RDF::Graph.new.load(graph, :base_uri => @info.about)
       else
-        case graph
-        when Graph then graph
-        when Parser then graph.graph
-        when IO, StringIO
-          Parser.parse(graph, @info.about)
-        else
-          parser = Parser.new(:struct => true)
-          fmt = parser.detect_format(graph.to_s)
-          parser.parse(graph.to_s, @info.about, :type => fmt)
-        end
+        # Figure out which parser to use
+        g = RDF::Graph.new
+        reader_class = detect_format(graph)
+        reader_class.new(graph, :base_uri => @info.about).each {|s| g << s}
+        g
       end
     end
     
@@ -54,10 +19,12 @@ module Matchers
       @info = if info.respond_to?(:about)
         info
       elsif info.is_a?(Hash)
-        identifier = info[:identifier] || expected.is_a?(Graph) ? expected.identifier : info[:about]
-        Info.new(identifier, info[:information] || "", info[:trace], info[:compare])
+        identifier = info[:identifier] || expected.is_a?(RDF::Graph) ? expected.context : info[:about]
+        trace = info[:trace]
+        trace = trace.join("\n") if trace.is_a?(Array)
+        Info.new(identifier, info[:information] || "", trace, info[:compare])
       else
-        Info.new(expected.is_a?(Graph) ? expected.identifier : info, info.to_s)
+        Info.new(expected.is_a?(RDF::Graph) ? expected.context : info, info.to_s)
       end
       @expected = normalize(expected)
     end
@@ -68,15 +35,13 @@ module Matchers
     end
 
     def failure_message_for_should
-      info = @info.respond_to?(:information) ? @info.information : ""
-      if @expected.is_a?(Graph) && @actual.size != @expected.size
+      info = @info.respond_to?(:information) ? @info.information : @info.inspect
+      if @expected.is_a?(RDF::Graph) && @actual.size != @expected.size
         "Graph entry count differs:\nexpected: #{@expected.size}\nactual:   #{@actual.size}"
       elsif @expected.is_a?(Array) && @actual.size != @expected.length
         "Graph entry count differs:\nexpected: #{@expected.length}\nactual:   #{@actual.size}"
-      elsif @expected.is_a?(Graph) && @actual.identifier != @expected.identifier
-        "Graph identifiers differ:\nexpected: #{@expected.identifier}\nactual:   #{@actual.identifier}"
       else
-        "Graph differs#{@info.compare == :array ? '(array)' : ''}\n"
+        "Graph differs"
       end +
       "\n#{info + "\n" unless info.empty?}" +
       (@info.inputDocument ? "Input file: #{@info.inputDocument}\n" : "") +
@@ -101,6 +66,7 @@ module Matchers
         @expected = expected
         @query = Redland::Query.new(expected)
         @info = info
+        #puts "PassQuery: expected #{expected.inspect}"
       end
       def matches?(actual)
         @actual = actual

data/spec/rdfa-triples/0011.nt

@@ -1,3 +1,3 @@
 <$TCPATH/0011.xhtml> <http://purl.org/dc/elements/1.1/creator> "Albert Einstein" .
 # This is one of the allowed result XML Literals
-<$TCPATH/0011.xhtml> <http://purl.org/dc/elements/1.1/title> "E = mc<sup xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\">2</sup>: The Most Urgent Problem of Our Time"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
+<$TCPATH/0011.xhtml> <http://purl.org/dc/elements/1.1/title> "E = mc<sup xmlns=\"http://www.w3.org/1999/xhtml\">2</sup>: The Most Urgent Problem of Our Time"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .

data/spec/rdfa-triples/0092.nt

@@ -1,3 +1,3 @@
 <$TCPATH/0092.xhtml> <http://purl.org/dc/elements/1.1/creator> "Albert Einstein" .
 # One of the allowed results
-<$TCPATH/0092.xhtml> <http://purl.org/dc/elements/1.1/title> "E = mc<sup xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">2</sup>: The Most Urgent Problem of Our Time"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
+<$TCPATH/0092.xhtml> <http://purl.org/dc/elements/1.1/title> "E = mc<sup xmlns=\"http://www.w3.org/1999/xhtml\">2</sup>: The Most Urgent Problem of Our Time"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .

data/spec/rdfa-triples/0094.nt

@@ -1,3 +1,3 @@
 <$TCPATH/0094.xhtml> <http://purl.org/dc/elements/1.1/creator> "Albert Einstein" .
 # One of the allowed results
-<$TCPATH/0094.xhtml> <http://purl.org/dc/elements/1.1/title> "E = mc<sup xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:bla=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">2</sup>: The Most Urgent Problem of Our Time"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
+<$TCPATH/0094.xhtml> <http://purl.org/dc/elements/1.1/title> "E = mc<sup xmlns=\"http://www.w3.org/1999/xhtml\">2</sup>: The Most Urgent Problem of Our Time"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .

data/spec/rdfa-triples/0100.nt

@@ -1,3 +1 @@
-<http://www.example.org> <http://example.org/rdf/example> "Some text here in <strong xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:ex=\"http://example.org/rdf/\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns:svg=\"http://www.w3.org/2000/svg\">bold</strong> and an svg rectangle: <svg:svg xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:ex=\"http://example.org/rdf/\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns:svg=\"http://www.w3.org/2000/svg\"><svg:rect svg:width=\"200\" svg:height=\"100\"></svg:rect></svg:svg>"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-# Another
-# <http://www.example.org> <http://example.org/rdf/example> "Some text here in <strong xmlns=\"http://www.w3.org/1999/xhtml\">bold</strong> and an svg rectangle: <svg:svg xmlns:svg=\"http://www.w3.org/2000/svg\"><svg:rect svg:height=\"100\" svg:width=\"200\"></svg:rect></svg:svg>"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
+<http://www.example.org> <http://example.org/rdf/example> "Some text here in <strong xmlns=\"http://www.w3.org/1999/xhtml\">bold</strong> and an svg rectangle: <svg:svg xmlns:svg=\"http://www.w3.org/2000/svg\"><svg:rect svg:height=\"100\" svg:width=\"200\"></svg:rect></svg:svg>"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .

data/spec/rdfa-triples/0101.nt

@@ -1,3 +1 @@
-<http://www.example.org> <http://example.org/rdf/example> "Du texte ici en <strong xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:ex=\"http://example.org/rdf/\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns:svg=\"http://www.w3.org/2000/svg\" xml:lang=\"fr\">gras</strong> et un rectangle en svg: <svg:svg xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:ex=\"http://example.org/rdf/\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns:svg=\"http://www.w3.org/2000/svg\" xml:lang=\"fr\"><svg:rect svg:width=\"200\" svg:height=\"100\"></svg:rect></svg:svg>"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
-# Another
-# <http://www.example.org> <http://example.org/rdf/example> "Du texte ici en <strong xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"fr\">gras</strong> et un rectangle en svg: <svg:svg xmlns:svg=\"http://www.w3.org/2000/svg\" xml:lang=\"fr\"><svg:rect svg:height=\"100\" svg:width=\"200\"></svg:rect></svg:svg>"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
+<http://www.example.org> <http://example.org/rdf/example> "Du texte ici en <strong xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"fr\">gras</strong> et un rectangle en svg: <svg:svg xmlns:svg=\"http://www.w3.org/2000/svg\" xml:lang=\"fr\"><svg:rect svg:height=\"100\" svg:width=\"200\"></svg:rect></svg:svg>"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .

data/spec/rdfa-triples/0102.nt

@@ -1 +1 @@
-<http://www.example.org> <http://example.org/rdf/example> "Du texte ici en <strong xmlns=\"http://www.w3.org/1999/xhtml\"  xmlns:svg=\"http://www.w3.org/2000/svg\" xmlns:ex=\"http://example.org/rdf/\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xml:lang=\"fr\">gras</strong> et un rectangle en svg: <svg:svg xml:lang=\"hu\" xmlns=\"http://www.w3.org/1999/xhtml\"  xmlns:svg=\"http://www.w3.org/2000/svg\" xmlns:ex=\"http://example.org/rdf/\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"><svg:rect svg:height=\"100\" svg:width=\"200\"></svg:rect></svg:svg>"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
+<http://www.example.org> <http://example.org/rdf/example> "Du texte ici en <strong xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"fr\">gras</strong> et un rectangle en svg: <svg:svg xmlns:svg=\"http://www.w3.org/2000/svg\" xml:lang=\"fr\"><svg:rect svg:height=\"100\" svg:width=\"200\"></svg:rect></svg:svg>"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .

data/spec/rdfa-triples/0103.nt

@@ -1 +1 @@
-<http://www.example.org> <http://example.org/rdf/example> "Some text here in <strong xmlns=\"http://www.w3.org/1999/xhtml\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:ex=\"http://example.org/rdf/\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\">bold</strong> and an svg rectangle: <svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:ex=\"http://example.org/rdf/\" xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"><rect width=\"200\" height=\"100\"></rect></svg>"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
+<http://www.example.org> <http://example.org/rdf/example> "Some text here in <strong xmlns=\"http://www.w3.org/1999/xhtml\">bold</strong> and an svg rectangle: <svg xmlns=\"http://www.w3.org/2000/svg\"><rect width=\"200\" height=\"100\"></rect></svg>"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .

data/spec/rdfa_helper.rb

@@ -1,8 +1,17 @@
+require 'rdf/rdfxml'
+autoload :YAML, "yaml"
+autoload :CGI, 'cgi'
+
+RDFA_DIR = File.join(File.dirname(__FILE__), 'rdfa-test-suite')
+RDFA_NT_DIR = File.join(File.dirname(__FILE__), 'rdfa-triples')
+RDFA_MANIFEST_URL = "http://rdfa.digitalbazaar.com/test-suite/"
+RDFA_TEST_CASE_URL = "#{RDFA_MANIFEST_URL}test-cases/"
+
+class SparqlException < IOError; end
+
 module RdfaHelper
   # Class representing test cases in format http://www.w3.org/2006/03/test-description#
   class TestCase
-    include Matchers
-    
     HTMLRE = Regexp.new('([0-9]{4,4})\.xhtml')
     TCPATHRE = Regexp.compile('\$TCPATH')
     
@@ -18,6 +27,7 @@ module RdfaHelper
     attr_accessor :specificationReference
     attr_accessor :expectedResults
     attr_accessor :parser
+    attr_accessor :debug
     
     @@suite = ""
     
@@ -25,19 +35,22 @@ module RdfaHelper
       self.suite = suite
       self.expectedResults = true
       statements.each do |statement|
-        next if statement.subject.is_a?(BNode)
-        #next unless statement.subject.uri.to_s.match(/0001/)
+        next if statement.subject.is_a?(RDF::Node)
+        pred = statement.predicate.to_s.split(/[\#\/]/).last
+        obj  = statement.object.is_a?(RDF::Literal) ? statement.object.value : statement.object.to_s
+        
+        puts "#{pred}: #{obj}" if $DEBUG
+
         unless self.about
-          self.about = Addressable::URI.parse(statement.subject.uri.to_s)
-          self.name = statement.subject.short_name || self.about
+          self.about = statement.subject
+          self.name = self.about.to_s.split(/[\#\/]/).last || self.about
         end
-        
-        if statement.predicate.short_name == "expectedResults"
-          self.expectedResults = statement.object.contents == "true"
+
+        if pred == "expectedResults"
+          self.expectedResults = obj == "true"
           #puts "expectedResults = #{statement.object.literal.value}"
-        elsif self.respond_to?("#{statement.predicate.short_name}=")
-          self.send("#{statement.predicate.short_name}=", statement.object.to_s)
-          #puts "#{statement.predicate.uri.short_name} = #{s.to_s}"
+        elsif self.respond_to?("#{pred}=")
+          self.send("#{pred}=", obj)
         end
       end
     end
@@ -132,8 +145,7 @@ module RdfaHelper
       rdfa_string = input
       
       # Run
-      @parser = RdfaParser::RdfaParser.new(:graph => Graph.new(:identifier => about))
-      yield(rdfa_string, @parser)
+      graph = yield(rdfa_string)
 
       query_string = results
 
@@ -141,19 +153,19 @@ module RdfaHelper
       
       if (query_string.match(/UNION|OPTIONAL/) || title.match(/XML/)) && triples
         # Check triples, as Rasql doesn't implement UNION
-        @parser.graph.should be_equivalent_graph(triples, self)
+        graph.should be_equivalent_graph(triples, self)
       elsif $redland_enabled
         # Run SPARQL query
-        @parser.graph.should pass_query(query_string, self)
+        graph.should pass_query(query_string, self)
       else
         raise SparqlException, "Query skipped, Redland not installed"
       end
 
-      @parser.graph.to_rdfxml.should be_valid_xml
+      graph.to_rdfxml.should be_valid_xml
     end
     
     def trace
-      @parser.debug.to_a.join("\n")
+      @debug.to_a.join("\n")
     end
     
     def self.test_cases(suite)
@@ -163,26 +175,41 @@ module RdfaHelper
       @suite = suite # Process the given test suite
       @manifest_url = "#{RDFA_MANIFEST_URL}#{suite}-manifest.rdf"
       
-      manifest_str = File.read(File.join(RDFA_DIR, "#{suite}-manifest.rdf"))
-      parser = RdfXmlParser.new
+      manifest_file = File.join(RDFA_DIR, "#{suite}-manifest.rdf")
+      yaml_file = File.join(File.dirname(__FILE__), "#{suite}-manifest.yml")
       
-      begin
-        parser.parse(manifest_str, @manifest_url)
-      rescue
-        raise "Parse error: #{$!}\n\t#{parser.debug.to_a.join("\t\n")}\n\n"
+      @test_cases = unless File.file?(yaml_file)
+        puts "parse #{manifest_file} @#{Time.now}"
+        graph = RDF::Graph.load(manifest_file, :base_uri => @manifest_url)
+        puts "parsed #{graph.size} statements @#{Time.now}"
+
+        graph.subjects.map do |subj|
+          t = TestCase.new(graph.query(:subject => subj), suite)
+          t.name ? t : nil
+        end.
+          compact.
+          sort_by{|t| t.name.to_s}
+      else
+        # Read tests from Manifest.yml
+        self.from_yaml(yaml_file)
       end
-      graph = parser.graph
-      
-      # Group by subject
-      test_hash = graph.triples.inject({}) do |hash, st|
-        a = hash[st.subject] ||= []
-        a << st
-        hash
+    end
+    
+    def self.to_yaml(suite, file)
+      test_cases = self.test_cases(suite)
+      puts "write test cases to #{file}"
+      File.open(file, 'w') do |out|
+        YAML.dump(test_cases, out )
+      end
+    end
+    
+    def self.from_yaml(file)
+      YAML::add_private_type("RdfaHelper::TestCase") do |type, val|
+        TestCase.new( val )
+      end
+      File.open(file, 'r') do |input|
+        @test_cases = YAML.load(input)
       end
-      
-      @test_cases = test_hash.values.map {|statements| TestCase.new(statements, suite)}.
-        compact.
-        sort_by{|t| t.name }
     end
   end
 end

data/spec/rdfa_reader_spec.rb

@@ -1,4 +1,5 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'rdfa_helper'
 
 describe RDF::RDFa::Format do
   it "should be discoverable" do
@@ -16,6 +17,49 @@ describe RDF::RDFa::Format do
 end
 
 describe "RDF::RDFa::Reader" do
+  before(:all) do
+    # Don't load external profiles when testing
+    {
+      "basic" => {
+        :base_uri => "http://www.w3.org/2007/08/pyRdfa/profiles/basic",
+        :format => :rdfa,
+        :file => File.join(File.dirname(__FILE__), "..", "etc", "basic.html"),
+      },
+      "foaf" => {
+        :base_uri => "http://www.w3.org/2007/08/pyRdfa/profiles/foaf",
+        :format => :rdfa,
+        :file => File.join(File.dirname(__FILE__), "..", "etc", "foaf.html"),
+      },
+      "xhv" => {
+        :base_uri => "http://www.w3.org/1999/xhtml/vocab",
+        :format => :rdfa,
+        :file => File.join(File.dirname(__FILE__), "..", "etc", "xhv.html"),
+      },
+      "profile" => {
+        :base_uri => "http://www.w3.org/2005/10/profile",
+        :format => :rdfa,
+        :value => "PROFILE",
+      },
+      "hcard" => {
+        :base_uri => "http://microformats.org/profiles/hcard",
+        :format => :rdfa,
+        :value => "HCARD",
+      },
+    }.each_pair do |name, opts|
+      if opts[:file]
+        graph = RDF::Graph.new
+        RDF::Reader.for(opts[:format]).new(File.read(opts[:file]),
+                    :base_uri => opts[:base_uri]).each do |statement|
+          graph << statement
+        end
+        opts[:value] = graph
+      end
+      RDF::Graph.stub!(:load).with(opts[:base_uri],
+                      :base_uri => opts[:base_uri],
+                      :format => opts[:format]).and_return(opts[:value])
+    end
+  end
+  
   context "discovery" do
     {
       "html" => RDF::Reader.for(:rdfa),
@@ -185,7 +229,7 @@ EOF
       @graph.should have_triple([
         RDF::URI('http://rdfa.digitalbazaar.com/test-suite/test-cases/xhtml1/0011.xhtml'),
         RDF::DC11.title,
-        RDF::Literal("E = mc<sup>2</sup>: The Most Urgent Problem of Our Time", :datatype => RDF.XMLLiteral)
+        RDF::Literal("E = mc<sup xmlns=\"http://www.w3.org/1999/xhtml\">2</sup>: The Most Urgent Problem of Our Time", :datatype => RDF.XMLLiteral)
       ])
     end
   end
@@ -336,17 +380,6 @@ EOF
 </html>
 EOF
       
-      basic = File.open(File.join(File.dirname(__FILE__), "..", "etc", "basic.html"))
-      basic_graph = RDF::Graph.new
-      RDF::RDFa::Reader.new(basic,
-                  :base_uri => "http://www.w3.org/2007/08/pyRdfa/profiles/basic").each do |statement|
-        basic_graph << statement
-      end
-      
-      RDF::Graph.stub!(:load).with("http://www.w3.org/2007/08/pyRdfa/profiles/basic",
-                      :base_uri => "http://www.w3.org/2007/08/pyRdfa/profiles/basic",
-                      :format => :rdfa).and_return(basic_graph)
-
       @graph = parse(sampledoc, :strict => true)
       @statement = @graph.statements.first
     end
@@ -388,17 +421,6 @@ EOF
 </html>
 EOF
       
-      foaf = File.open(File.join(File.dirname(__FILE__), "..", "etc", "foaf.html"))
-      foaf_graph = RDF::Graph.new
-      RDF::RDFa::Reader.new(foaf,
-                  :base_uri => "http://www.w3.org/2007/08/pyRdfa/profiles/foaf").each do |statement|
-        foaf_graph << statement
-      end
-      
-      RDF::Graph.stub!(:load).with("http://www.w3.org/2007/08/pyRdfa/profiles/foaf",
-                      :base_uri => "http://www.w3.org/2007/08/pyRdfa/profiles/foaf",
-                      :format => :rdfa).and_return(foaf_graph)
-
       @graph = parse(sampledoc, :strict => true)
       @statement = @graph.statements.first
     end
@@ -421,23 +443,26 @@ EOF
   end
 
   def self.test_cases(suite)
-     [] #RdfaHelper::TestCase.test_cases(suite)
+    RdfaHelper::TestCase.test_cases(suite)
   end
 
   # W3C Test suite from http://www.w3.org/2006/07/SWD/RDFa/testsuite/
-  %w(xhtml html4 html5).each do |suite|
+  %w(xhtml).each do |suite| # html4 html5
     describe "w3c #{suite} testcases" do
       describe "that are approved" do
         test_cases(suite).each do |t|
-          puts t.inspect
           next unless t.status == "approved"
-          #next unless t.name =~ /0140/
+          #next unless t.name =~ /0001/
           specify "test #{t.name}: #{t.title}#{",  (negative test)" unless t.expectedResults}" do
             #puts t.input
             #puts t.results
             begin
-              t.run_test do |rdfa_string, rdfa_parser|
-                rdfa_parser.parse(rdfa_string, t.informationResourceInput, :debug => [])
+              t.run_test do |rdfa_string|
+                t.debug = []
+                parse(rdfa_string,
+                    :base_uri => t.informationResourceInput,
+                    :strict => true,
+                    :debug => t.debug)
               end
             rescue SparqlException => e
               pending(e.message) { raise }
@@ -452,8 +477,12 @@ EOF
           #puts t.inspect
           specify "test #{t.name}: #{t.title}#{",  (negative test)" unless t.expectedResults}" do
             begin
-              t.run_test do |rdfa_string, rdfa_parser|
-                rdfa_parser.parse(rdfa_string, t.informationResourceInput, :debug => [])
+              t.run_test do |rdfa_string|
+                t.debug = []
+                parse(rdfa_string,
+                    :base_uri => t.informationResourceInput,
+                    :strict => true,
+                    :debug => t.debug)
               end
             rescue SparqlException => e
               pending(e.message) { raise }
@@ -471,7 +500,7 @@ EOF
  end
 
   def parse(input, options)
-    @debug = []
+    @debug = options[:debug] || []
     graph = RDF::Graph.new
     RDF::RDFa::Reader.new(input, options.merge(:debug => @debug)).each do |statement|
       graph << statement