ld4l-open_annotation_rdf 0.1.0 → 0.2.0

data/spec/ld4l/open_annotation_rdf/semantic_tag_body_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
-require 'ld4l/open_annotation_rdf/vocab/dctypes'
-require 'ld4l/open_annotation_rdf/vocab/oa'
-
 
 describe 'LD4L::OpenAnnotationRDF::SemanticTagBody' do
 
+  after do
+    ActiveTriples::Repositories.repositories[LD4L::OpenAnnotationRDF::CommentAnnotation.repository].clear!
+  end
+
   subject { LD4L::OpenAnnotationRDF::SemanticTagBody.new }
 
   describe 'rdf_subject' do
@@ -24,22 +25,22 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagBody' do
 
     describe 'when changing subject' do
       before do
-        subject << RDF::Statement.new(subject.rdf_subject, RDF::DC.title, RDF::Literal('Comet in Moominland'))
-        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.isPartOf, subject.rdf_subject)
-        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.relation, 'http://example.org/moomin_land')
+        subject << RDF::Statement.new(subject.rdf_subject, RDF::Vocab::DC.title, RDF::Literal('Comet in Moominland'))
+        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.isPartOf, subject.rdf_subject)
+        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.relation, 'http://example.org/moomin_land')
         subject.set_subject! RDF::URI('http://example.org/moomin')
       end
 
       it 'should update graph subjects' do
-        expect(subject.has_statement?(RDF::Statement.new(subject.rdf_subject, RDF::DC.title, RDF::Literal('Comet in Moominland')))).to be true
+        expect(subject.has_statement?(RDF::Statement.new(subject.rdf_subject, RDF::Vocab::DC.title, RDF::Literal('Comet in Moominland')))).to be true
       end
 
       it 'should update graph objects' do
-        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.isPartOf, subject.rdf_subject))).to be true
+        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.isPartOf, subject.rdf_subject))).to be true
       end
 
       it 'should leave other uris alone' do
-        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.relation, 'http://example.org/moomin_land'))).to be true
+        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.relation, 'http://example.org/moomin_land'))).to be true
       end
     end
 
@@ -62,9 +63,9 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagBody' do
   describe 'type' do
     it "should be set to text and astext from new" do
       expected_results = subject.type
-      expected_results = expected_results.to_a if Object.const_defined?("ActiveTriples::Relation") && expected_results.kind_of?(ActiveTriples::Relation)
+      expected_results = expected_results.to_a if subject.respond_to? 'persistence_strategy'   # >= ActiveTriples 0.8
       expect(expected_results.size).to eq 1
-      expect(expected_results).to include RDFVocabularies::OA.SemanticTag
+      expect(expected_results).to include RDF::Vocab::OA.SemanticTag
     end
   end
 
@@ -96,7 +97,7 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagBody' do
     end
 
     context "when terms exist in the repository" do
-      before(:all) do
+      before do
         # Create inmemory repository
         sta = LD4L::OpenAnnotationRDF::SemanticTagAnnotation.new('http://example.org/sta1')
         sta.setTerm(RDF::URI("http://example.org/EXISTING_term"))
@@ -107,11 +108,6 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagBody' do
         stb = LD4L::OpenAnnotationRDF::SemanticTagBody.new('http://example.org/UNUSED_term')
         stb.persist!
       end
-      after(:all) do
-        LD4L::OpenAnnotationRDF::SemanticTagAnnotation.new('http://example.org/sta1').destroy!
-        LD4L::OpenAnnotationRDF::SemanticTagAnnotation.new('http://example.org/sta2').destroy!
-        LD4L::OpenAnnotationRDF::SemanticTagBody.new('http://example.org/UNUSED_term').destroy!
-      end
 
       context "and term is passed as string URI" do
         it "should find annotations using the term" do
@@ -173,7 +169,7 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagBody' do
     end
 
     context "when terms exist in the repository" do
-      before(:all) do
+      before do
         # Create inmemory repository
         sta = LD4L::OpenAnnotationRDF::SemanticTagAnnotation.new('http://example.org/sta1')
         sta.setTerm(RDF::URI("http://example.org/EXISTING_term"))
@@ -184,11 +180,6 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagBody' do
         stb = LD4L::OpenAnnotationRDF::SemanticTagBody.new('http://example.org/UNUSED_term')
         stb.persist!
       end
-      after(:all) do
-        LD4L::OpenAnnotationRDF::SemanticTagAnnotation.new('http://example.org/sta1').destroy!
-        LD4L::OpenAnnotationRDF::SemanticTagAnnotation.new('http://example.org/sta2').destroy!
-        LD4L::OpenAnnotationRDF::SemanticTagBody.new('http://example.org/UNUSED_term').destroy!
-      end
 
       context "and term is passed as string URI" do
         it "should not destroy if used by any annotations" do
@@ -302,7 +293,7 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagBody' do
 
   describe '#destroy!' do
     before do
-      subject << RDF::Statement(RDF::DC.LicenseDocument, RDF::DC.title, 'LICENSE')
+      subject << RDF::Statement(RDF::Vocab::DC.LicenseDocument, RDF::Vocab::DC.title, 'LICENSE')
     end
 
     subject { LD4L::OpenAnnotationRDF::SemanticTagBody.new('456')}
@@ -341,18 +332,18 @@ describe 'LD4L::OpenAnnotationRDF::SemanticTagBody' do
     before do
       class DummyPerson < ActiveTriples::Resource
         configure :type => RDF::URI('http://example.org/Person')
-        property :foafname, :predicate => RDF::FOAF.name
-        property :publications, :predicate => RDF::FOAF.publications, :class_name => 'DummyDocument'
-        property :knows, :predicate => RDF::FOAF.knows, :class_name => DummyPerson
+        property :foafname, :predicate => RDF::Vocab::FOAF.name
+        property :publications, :predicate => RDF::Vocab::FOAF.publications, :class_name => 'DummyDocument'
+        property :knows, :predicate => RDF::Vocab::FOAF.knows, :class_name => DummyPerson
       end
 
       class DummyDocument < ActiveTriples::Resource
         configure :type => RDF::URI('http://example.org/Document')
-        property :title, :predicate => RDF::DC.title
-        property :creator, :predicate => RDF::DC.creator, :class_name => 'DummyPerson'
+        property :title, :predicate => RDF::Vocab::DC.title
+        property :creator, :predicate => RDF::Vocab::DC.creator, :class_name => 'DummyPerson'
       end
 
-      LD4L::OpenAnnotationRDF::SemanticTagBody.property :item, :predicate => RDF::DC.relation, :class_name => DummyDocument
+      LD4L::OpenAnnotationRDF::SemanticTagBody.property :item, :predicate => RDF::Vocab::DC.relation, :class_name => DummyDocument
     end
 
     subject { LD4L::OpenAnnotationRDF::SemanticTagBody.new }
@@ -405,8 +396,10 @@ END
       document1.creator = [person1, person2]
       document2.creator = person1
       person1.knows = person2
+      person2.knows = person1
       subject.item = [document1]
-      expect(subject.item.first.creator.first.knows.first.foafname).to eq ['Bob']
+      expect(subject.item.first.creator.first.knows.first.foafname)
+          .to satisfy { |names| ['Alice', 'Bob'].include? names.first }
     end
   end
 end

data/spec/ld4l/open_annotation_rdf/tag_annotation_spec.rb

@@ -1,9 +1,11 @@
 require 'spec_helper'
 
-# TODO: Uses CommentBody as the annotation body, which is wrong.  Should be URI into controlled vocabulary.
-
 describe 'LD4L::OpenAnnotationRDF::TagAnnotation' do
 
+  after do
+    ActiveTriples::Repositories.repositories[LD4L::OpenAnnotationRDF::CommentAnnotation.repository].clear!
+  end
+
   subject { LD4L::OpenAnnotationRDF::TagAnnotation.new }
 
   describe 'rdf_subject' do
@@ -23,22 +25,22 @@ describe 'LD4L::OpenAnnotationRDF::TagAnnotation' do
 
     describe 'when changing subject' do
       before do
-        subject << RDF::Statement.new(subject.rdf_subject, RDF::DC.title, RDF::Literal('Comet in Moominland'))
-        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.isPartOf, subject.rdf_subject)
-        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.relation, 'http://example.org/moomin_land')
+        subject << RDF::Statement.new(subject.rdf_subject, RDF::Vocab::DC.title, RDF::Literal('Comet in Moominland'))
+        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.isPartOf, subject.rdf_subject)
+        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.relation, 'http://example.org/moomin_land')
         subject.set_subject! RDF::URI('http://example.org/moomin')
       end
 
       it 'should update graph subjects' do
-        expect(subject.has_statement?(RDF::Statement.new(subject.rdf_subject, RDF::DC.title, RDF::Literal('Comet in Moominland')))).to be true
+        expect(subject.has_statement?(RDF::Statement.new(subject.rdf_subject, RDF::Vocab::DC.title, RDF::Literal('Comet in Moominland')))).to be true
       end
 
       it 'should update graph objects' do
-        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.isPartOf, subject.rdf_subject))).to be true
+        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.isPartOf, subject.rdf_subject))).to be true
       end
 
       it 'should leave other uris alone' do
-        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.relation, 'http://example.org/moomin_land'))).to be true
+        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.relation, 'http://example.org/moomin_land'))).to be true
       end
     end
 
@@ -59,8 +61,8 @@ describe 'LD4L::OpenAnnotationRDF::TagAnnotation' do
   # -------------------------------------------------
 
   describe 'type' do
-    it "should be an RDFVocabularies::OA.Annotation" do
-      expect(subject.type.first.value).to eq RDFVocabularies::OA.Annotation.value
+    it "should be an RDF::Vocab::OA.Annotation" do
+      expect(subject.type.first.value).to eq RDF::Vocab::OA.Annotation.value
     end
   end
 
@@ -273,18 +275,18 @@ describe 'LD4L::OpenAnnotationRDF::TagAnnotation' do
 
   describe 'motivatedBy' do
     it "should be OA.tagging if we haven't set it" do
-      expect(subject.motivatedBy.first).to eq RDFVocabularies::OA.tagging
+      expect(subject.motivatedBy.first).to eq RDF::Vocab::OA.tagging
     end
 
     it "should be settable" do
-      subject.motivatedBy = RDFVocabularies::OA.describing
-      expect(subject.motivatedBy.first).to eq RDFVocabularies::OA.describing
+      subject.motivatedBy = RDF::Vocab::OA.describing
+      expect(subject.motivatedBy.first).to eq RDF::Vocab::OA.describing
     end
 
     it "should be changeable" do
-      subject.motivatedBy = RDFVocabularies::OA.describing
-      subject.motivatedBy = RDFVocabularies::OA.classifying
-      expect(subject.motivatedBy.first).to eq RDFVocabularies::OA.classifying
+      subject.motivatedBy = RDF::Vocab::OA.describing
+      subject.motivatedBy = RDF::Vocab::OA.classifying
+      expect(subject.motivatedBy.first).to eq RDF::Vocab::OA.classifying
     end
   end
 
@@ -316,7 +318,7 @@ describe 'LD4L::OpenAnnotationRDF::TagAnnotation' do
 
       context "when it is saved" do
         before do
-          subject.motivatedBy = RDFVocabularies::OA.commenting
+          subject.motivatedBy = RDF::Vocab::OA.commenting
           subject.persist!
         end
 
@@ -326,7 +328,7 @@ describe 'LD4L::OpenAnnotationRDF::TagAnnotation' do
 
         context "and then modified" do
           before do
-            subject.motivatedBy = RDFVocabularies::OA.tagging
+            subject.motivatedBy = RDF::Vocab::OA.tagging
           end
 
           it "should return true" do
@@ -339,7 +341,7 @@ describe 'LD4L::OpenAnnotationRDF::TagAnnotation' do
           end
 
           it "should reset the motivatedBy" do
-            expect(subject.motivatedBy.first.to_s).to eq RDFVocabularies::OA.commenting.to_s
+            expect(subject.motivatedBy.first.to_s).to eq RDF::Vocab::OA.commenting.to_s
           end
 
           it "should be persisted" do
@@ -361,7 +363,7 @@ describe 'LD4L::OpenAnnotationRDF::TagAnnotation' do
           # Create inmemory repository
           @repo = RDF::Repository.new
           ActiveTriples::Repositories.repositories[:default] = @repo
-          subject.motivatedBy = RDFVocabularies::OA.commenting
+          subject.motivatedBy = RDF::Vocab::OA.commenting
           result
         end
 
@@ -375,7 +377,7 @@ describe 'LD4L::OpenAnnotationRDF::TagAnnotation' do
 
         it "should delete from the repository" do
           subject.reload
-          expect(subject.motivatedBy.first.to_s).to eq RDFVocabularies::OA.commenting.to_s
+          expect(subject.motivatedBy.first.to_s).to eq RDF::Vocab::OA.commenting.to_s
           subject.motivatedBy = []
           expect(subject.motivatedBy).to eq []
           subject.persist!
@@ -403,7 +405,7 @@ describe 'LD4L::OpenAnnotationRDF::TagAnnotation' do
 
   describe '#destroy!' do
     before do
-      subject << RDF::Statement(RDF::DC.LicenseDocument, RDF::DC.title, 'LICENSE')
+      subject << RDF::Statement(RDF::Vocab::DC.LicenseDocument, RDF::Vocab::DC.title, 'LICENSE')
     end
 
     subject { LD4L::OpenAnnotationRDF::TagAnnotation.new('123') }
@@ -494,29 +496,29 @@ describe 'LD4L::OpenAnnotationRDF::TagAnnotation' do
 
     context 'with unmodeled data' do
       before do
-        subject << RDF::Statement(subject.rdf_subject, RDF::DC.contributor, 'Tove Jansson')
-        subject << RDF::Statement(subject.rdf_subject, RDF::DC.relation, RDF::URI('http://example.org/moomi'))
+        subject << RDF::Statement(subject.rdf_subject, RDF::Vocab::DC.contributor, 'Tove Jansson')
+        subject << RDF::Statement(subject.rdf_subject, RDF::Vocab::DC.relation, RDF::URI('http://example.org/moomi'))
         node = RDF::Node.new
-        subject << RDF::Statement(RDF::URI('http://example.org/moomi'), RDF::DC.relation, node)
-        subject << RDF::Statement(node, RDF::DC.title, 'bnode')
+        subject << RDF::Statement(RDF::URI('http://example.org/moomi'), RDF::Vocab::DC.relation, node)
+        subject << RDF::Statement(node, RDF::Vocab::DC.title, 'bnode')
       end
 
       it 'should include data with URIs as attribute names' do
-        expect(subject.attributes[RDF::DC.contributor.to_s]).to eq ['Tove Jansson']
+        expect(subject.attributes[RDF::Vocab::DC.contributor.to_s]).to eq ['Tove Jansson']
       end
 
       it 'should return generic Resources' do
-        expect(subject.attributes[RDF::DC.relation.to_s].first).to be_a ActiveTriples::Resource
+        expect(subject.attributes[RDF::Vocab::DC.relation.to_s].first).to be_a ActiveTriples::Resource
       end
 
       it 'should build deep data for Resources' do
-        expect(subject.attributes[RDF::DC.relation.to_s].first.get_values(RDF::DC.relation).
-                   first.get_values(RDF::DC.title)).to eq ['bnode']
+        expect(subject.attributes[RDF::Vocab::DC.relation.to_s].first.get_values(RDF::Vocab::DC.relation).
+                   first.get_values(RDF::Vocab::DC.title)).to eq ['bnode']
       end
 
       it 'should include deep data in serializable_hash' do
-        expect(subject.serializable_hash[RDF::DC.relation.to_s].first.get_values(RDF::DC.relation).
-                   first.get_values(RDF::DC.title)).to eq ['bnode']
+        expect(subject.serializable_hash[RDF::Vocab::DC.relation.to_s].first.get_values(RDF::Vocab::DC.relation).
+                   first.get_values(RDF::Vocab::DC.title)).to eq ['bnode']
       end
     end
 
@@ -593,13 +595,13 @@ describe 'LD4L::OpenAnnotationRDF::TagAnnotation' do
 
   describe 'editing the graph' do
     it 'should write properties when statements are added' do
-      subject << RDF::Statement.new(subject.rdf_subject, RDFVocabularies::OA.motivatedBy, 'commenting')
+      subject << RDF::Statement.new(subject.rdf_subject, RDF::Vocab::OA.motivatedBy, 'commenting')
       expect(subject.motivatedBy).to include 'commenting'
     end
 
     it 'should delete properties when statements are removed' do
-      subject << RDF::Statement.new(subject.rdf_subject, RDFVocabularies::OA.annotatedBy, 'John Smith')
-      subject.delete RDF::Statement.new(subject.rdf_subject, RDFVocabularies::OA.annotatedBy, 'John Smith')
+      subject << RDF::Statement.new(subject.rdf_subject, RDF::Vocab::OA.annotatedBy, 'John Smith')
+      subject.delete RDF::Statement.new(subject.rdf_subject, RDF::Vocab::OA.annotatedBy, 'John Smith')
       expect(subject.annotatedBy).to eq []
     end
   end
@@ -608,18 +610,18 @@ describe 'LD4L::OpenAnnotationRDF::TagAnnotation' do
     before do
       class DummyPerson < ActiveTriples::Resource
         configure :type => RDF::URI('http://example.org/Person')
-        property :foafname, :predicate => RDF::FOAF.name
-        property :publications, :predicate => RDF::FOAF.publications, :class_name => 'DummyDocument'
-        property :knows, :predicate => RDF::FOAF.knows, :class_name => DummyPerson
+        property :foafname, :predicate => RDF::Vocab::FOAF.name
+        property :publications, :predicate => RDF::Vocab::FOAF.publications, :class_name => 'DummyDocument'
+        property :knows, :predicate => RDF::Vocab::FOAF.knows, :class_name => DummyPerson
       end
 
       class DummyDocument < ActiveTriples::Resource
         configure :type => RDF::URI('http://example.org/Document')
-        property :title, :predicate => RDF::DC.title
-        property :creator, :predicate => RDF::DC.creator, :class_name => 'DummyPerson'
+        property :title, :predicate => RDF::Vocab::DC.title
+        property :creator, :predicate => RDF::Vocab::DC.creator, :class_name => 'DummyPerson'
       end
 
-      LD4L::OpenAnnotationRDF::TagAnnotation.property :item, :predicate => RDF::DC.relation, :class_name => DummyDocument
+      LD4L::OpenAnnotationRDF::TagAnnotation.property :item, :predicate => RDF::Vocab::DC.relation, :class_name => DummyDocument
     end
 
     subject { LD4L::OpenAnnotationRDF::TagAnnotation.new }
@@ -672,8 +674,10 @@ END
       document1.creator = [person1, person2]
       document2.creator = person1
       person1.knows = person2
+      person2.knows = person1
       subject.item = [document1]
-      expect(subject.item.first.creator.first.knows.first.foafname).to eq ['Bob']
+      expect(subject.item.first.creator.first.knows.first.foafname)
+          .to satisfy { |names| ['Alice', 'Bob'].include? names.first }
     end
   end
 end

data/spec/ld4l/open_annotation_rdf/tag_body_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
-require 'ld4l/open_annotation_rdf/vocab/dctypes'
-require 'ld4l/open_annotation_rdf/vocab/oa'
-
 
 describe 'LD4L::OpenAnnotationRDF::TagBody' do
 
+  after do
+    ActiveTriples::Repositories.repositories[LD4L::OpenAnnotationRDF::CommentAnnotation.repository].clear!
+  end
+
   subject { LD4L::OpenAnnotationRDF::TagBody.new }
 
   describe 'rdf_subject' do
@@ -24,22 +25,22 @@ describe 'LD4L::OpenAnnotationRDF::TagBody' do
 
     describe 'when changing subject' do
       before do
-        subject << RDF::Statement.new(subject.rdf_subject, RDF::DC.title, RDF::Literal('Comet in Moominland'))
-        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.isPartOf, subject.rdf_subject)
-        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.relation, 'http://example.org/moomin_land')
+        subject << RDF::Statement.new(subject.rdf_subject, RDF::Vocab::DC.title, RDF::Literal('Comet in Moominland'))
+        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.isPartOf, subject.rdf_subject)
+        subject << RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.relation, 'http://example.org/moomin_land')
         subject.set_subject! RDF::URI('http://example.org/moomin')
       end
 
       it 'should update graph subjects' do
-        expect(subject.has_statement?(RDF::Statement.new(subject.rdf_subject, RDF::DC.title, RDF::Literal('Comet in Moominland')))).to be true
+        expect(subject.has_statement?(RDF::Statement.new(subject.rdf_subject, RDF::Vocab::DC.title, RDF::Literal('Comet in Moominland')))).to be true
       end
 
       it 'should update graph objects' do
-        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.isPartOf, subject.rdf_subject))).to be true
+        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.isPartOf, subject.rdf_subject))).to be true
       end
 
       it 'should leave other uris alone' do
-        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::DC.relation, 'http://example.org/moomin_land'))).to be true
+        expect(subject.has_statement?(RDF::Statement.new(RDF::URI('http://example.org/moomin_comics'), RDF::Vocab::DC.relation, 'http://example.org/moomin_land'))).to be true
       end
     end
 
@@ -62,10 +63,10 @@ describe 'LD4L::OpenAnnotationRDF::TagBody' do
   describe 'type' do
     it "should be set to text and astext from new" do
       expected_results = subject.type
-      expected_results = expected_results.to_a if Object.const_defined?("ActiveTriples::Relation") && expected_results.kind_of?(ActiveTriples::Relation)
+      expected_results = expected_results.to_a if subject.respond_to? 'persistence_strategy'   # >= ActiveTriples 0.8
       expect(expected_results.size).to eq 2
-      expect(expected_results).to include RDFVocabularies::OA.Tag
-      expect(expected_results).to include RDFVocabularies::CNT.ContentAsText
+      expect(expected_results).to include RDF::Vocab::OA.Tag
+      expect(expected_results).to include RDF::Vocab::CNT.ContentAsText
     end
   end
 
@@ -107,7 +108,7 @@ describe 'LD4L::OpenAnnotationRDF::TagBody' do
     end
 
     context "when tags exist in the repository" do
-      before(:all) do
+      before do
         # Create inmemory repository
         ta = LD4L::OpenAnnotationRDF::TagAnnotation.new('http://example.org/ta1')
         ta.setTag('EXISTING_tag')
@@ -119,11 +120,6 @@ describe 'LD4L::OpenAnnotationRDF::TagBody' do
         tb.tag = 'UNUSED_tag'
         tb.persist!
       end
-      after(:all) do
-        LD4L::OpenAnnotationRDF::TagAnnotation.new('http://example.org/ta1').destroy!
-        LD4L::OpenAnnotationRDF::TagAnnotation.new('http://example.org/ta2').destroy!
-        LD4L::OpenAnnotationRDF::TagBody.new('http://example.org/UNUSED_tag').destroy!
-      end
 
       it "should find annotations using a tag" do
         annotations = LD4L::OpenAnnotationRDF::TagBody.annotations_using('EXISTING_tag')
@@ -165,7 +161,7 @@ describe 'LD4L::OpenAnnotationRDF::TagBody' do
     end
 
     context "when tags exist in the repository" do
-      before(:all) do
+      before do
         # Create inmemory repository
         ta = LD4L::OpenAnnotationRDF::TagAnnotation.new('http://example.org/ta1')
         ta.setTag('EXISTING_tag')
@@ -177,11 +173,6 @@ describe 'LD4L::OpenAnnotationRDF::TagBody' do
         tb.tag = 'UNUSED_tag'
         tb.persist!
       end
-      after(:all) do
-        LD4L::OpenAnnotationRDF::TagAnnotation.new('http://example.org/ta1').destroy!
-        LD4L::OpenAnnotationRDF::TagAnnotation.new('http://example.org/ta2').destroy!
-        LD4L::OpenAnnotationRDF::TagBody.new('http://example.org/UNUSED_tag').destroy!
-      end
 
       it "should not find non-existent tag" do
         expect( LD4L::OpenAnnotationRDF::TagBody.fetch_by_tag_value('NONEXISTING_tag') ).to be_nil
@@ -307,7 +298,7 @@ describe 'LD4L::OpenAnnotationRDF::TagBody' do
 
   describe '#destroy!' do
     before do
-      subject << RDF::Statement(RDF::DC.LicenseDocument, RDF::DC.title, 'LICENSE')
+      subject << RDF::Statement(RDF::Vocab::DC.LicenseDocument, RDF::Vocab::DC.title, 'LICENSE')
     end
 
     subject { LD4L::OpenAnnotationRDF::TagBody.new('456')}
@@ -344,13 +335,13 @@ describe 'LD4L::OpenAnnotationRDF::TagBody' do
 
   describe 'editing the graph' do
     it 'should write properties when statements are added' do
-      subject << RDF::Statement.new(subject.rdf_subject, RDFVocabularies::CNT.chars, 'good')
+      subject << RDF::Statement.new(subject.rdf_subject, RDF::Vocab::CNT.chars, 'good')
       expect(subject.tag).to include 'good'
     end
 
     it 'should delete properties when statements are removed' do
-      subject << RDF::Statement.new(subject.rdf_subject, RDFVocabularies::CNT.chars, 'good')
-      subject.delete RDF::Statement.new(subject.rdf_subject, RDFVocabularies::CNT.chars, 'good')
+      subject << RDF::Statement.new(subject.rdf_subject, RDF::Vocab::CNT.chars, 'good')
+      subject.delete RDF::Statement.new(subject.rdf_subject, RDF::Vocab::CNT.chars, 'good')
       expect(subject.tag).to eq []
     end
   end
@@ -359,18 +350,18 @@ describe 'LD4L::OpenAnnotationRDF::TagBody' do
     before do
       class DummyPerson < ActiveTriples::Resource
         configure :type => RDF::URI('http://example.org/Person')
-        property :foafname, :predicate => RDF::FOAF.name
-        property :publications, :predicate => RDF::FOAF.publications, :class_name => 'DummyDocument'
-        property :knows, :predicate => RDF::FOAF.knows, :class_name => DummyPerson
+        property :foafname, :predicate => RDF::Vocab::FOAF.name
+        property :publications, :predicate => RDF::Vocab::FOAF.publications, :class_name => 'DummyDocument'
+        property :knows, :predicate => RDF::Vocab::FOAF.knows, :class_name => DummyPerson
       end
 
       class DummyDocument < ActiveTriples::Resource
         configure :type => RDF::URI('http://example.org/Document')
-        property :title, :predicate => RDF::DC.title
-        property :creator, :predicate => RDF::DC.creator, :class_name => 'DummyPerson'
+        property :title, :predicate => RDF::Vocab::DC.title
+        property :creator, :predicate => RDF::Vocab::DC.creator, :class_name => 'DummyPerson'
       end
 
-      LD4L::OpenAnnotationRDF::TagBody.property :item, :predicate => RDF::DC.relation, :class_name => DummyDocument
+      LD4L::OpenAnnotationRDF::TagBody.property :item, :predicate => RDF::Vocab::DC.relation, :class_name => DummyDocument
     end
 
     subject { LD4L::OpenAnnotationRDF::TagBody.new }
@@ -423,8 +414,10 @@ END
       document1.creator = [person1, person2]
       document2.creator = person1
       person1.knows = person2
+      person2.knows = person1
       subject.item = [document1]
-      expect(subject.item.first.creator.first.knows.first.foafname).to eq ['Bob']
+      expect(subject.item.first.creator.first.knows.first.foafname)
+          .to satisfy { |names| ['Alice', 'Bob'].include? names.first }
     end
   end
 end