active-fedora 5.7.1 → 6.0.0.pre1

data/solr/conf/schema.xml

@@ -168,13 +168,20 @@
              enablePositionIncrements=true ensures that a 'gap' is left to
              allow for accurate phrase queries.
         -->
+        <filter class="solr.StopFilterFactory"
+                ignoreCase="true"
+                words="stopwords.txt"
+                enablePositionIncrements="true"
+                />
         <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.SnowballPorterFilterFactory" language="English"/>
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
       </analyzer>
       <analyzer type="query">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>      
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
         <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.SnowballPorterFilterFactory" language="English"/>
@@ -188,6 +195,8 @@
     <fieldType name="textTight" class="solr.TextField" positionIncrementGap="100" >
       <analyzer>
         <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
         <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.SnowballPorterFilterFactory" language="English"/>

data/spec/integration/base_spec.rb

@@ -20,7 +20,7 @@ describe "A base object with metadata" do
       obj = ActiveFedora::Base.find(@obj.pid, :cast=>true)
       obj.foo.should_not be_new
       obj.foo.person.should == ['bob']
-      person_field = ActiveFedora::SolrService.solr_name('person', :string, :searchable)
+      person_field = ActiveFedora::SolrService.solr_name('person', :searchable, type: :string)
       ActiveFedora::SolrService.query("id:#{@obj.pid.gsub(":", "\\:")}", :fl=>"id #{person_field}").first.should == {"id"=>@obj.pid, person_field =>['bob']}
     end
   end
@@ -40,7 +40,7 @@ describe "A base object with metadata" do
       end
       it "should save the datastream." do
         MockAFBaseRelationship.find(@release.pid).foo.person.should == ['frank']
-        person_field = ActiveFedora::SolrService.solr_name('person', :string, :searchable)
+        person_field = ActiveFedora::SolrService.solr_name('person', :searchable, type: :string)
         ActiveFedora::SolrService.query("id:#{@release.pid.gsub(":", "\\:")}", :fl=>"id #{person_field}").first.should == {"id"=>@release.pid, person_field =>['frank']}
       end
     end
@@ -146,38 +146,11 @@ end
 
 
 describe ActiveFedora::Base do
-  before(:all) do
-    @behavior = ActiveFedora::Relationships.deprecation_behavior
-    @c_behavior = ActiveFedora::Relationships::ClassMethods.deprecation_behavior
-    ActiveFedora::Relationships.deprecation_behavior = :silence
-    ActiveFedora::Relationships::ClassMethods.deprecation_behavior = :silence
-  end
-  
-  after :all do
-    ActiveFedora::Relationships.deprecation_behavior = @behavior
-    ActiveFedora::Relationships::ClassMethods.deprecation_behavior = @c_behavior
-  end
-  
   before :all do
     class MockAFBaseRelationship < ActiveFedora::Base
-      include ActiveFedora::FileManagement
-      has_relationship "testing", :has_part, :type=>MockAFBaseRelationship
-      has_relationship "testing2", :has_member, :type=>MockAFBaseRelationship
-      has_relationship "testing_inbound", :has_part, :type=>MockAFBaseRelationship, :inbound=>true
-      has_relationship "testing_inbound2", :has_member, :type=>MockAFBaseRelationship, :inbound=>true
-      has_bidirectional_relationship "testing_bidirectional", :has_collection_member, :is_member_of_collection
-      #next 2 used to test objects on opposite end of bidirectional relationship
-      has_relationship "testing_inbound3", :has_collection_member, :inbound=>true
-      has_relationship "testing3", :is_member_of_collection
     end
 
     class MockAFBaseFromSolr < ActiveFedora::Base
-      include ActiveFedora::Relationships
-      has_relationship "testing", :has_part, :type=>MockAFBaseFromSolr
-      has_relationship "testing2", :has_member, :type=>MockAFBaseFromSolr
-      has_relationship "testing_inbound", :has_part, :type=>MockAFBaseFromSolr, :inbound=>true
-      has_relationship "testing_inbound2", :has_member, :type=>MockAFBaseFromSolr, :inbound=>true
-      
       has_metadata :name => "properties", :type => ActiveFedora::SimpleDatastream do |m|
         m.field "holding_id", :string
       end
@@ -387,16 +360,12 @@ describe ActiveFedora::Base do
   
     it "should be able to add datastreams" do
       ds = ActiveFedora::Datastream.new(@test_object.inner_object, 'DS1')
-      # ds = ActiveFedora::Datastream.new(:dsID => 'DS1', :dsLabel => 'hello', :altIDs => '3333', 
-      #   :controlGroup => 'M', :blob => fixture('dino.jpg'))
       @test_object.add_datastream(ds).should be_true
     end
       
     it "adding and saving should add the datastream to the datastreams array" do
       ds = ActiveFedora::Datastream.new(@test_object.inner_object, 'DS1') 
       ds.content = fixture('dino.jpg').read
-      # ds = ActiveFedora::Datastream.new(:dsid => 'DS1', :dsLabel => 'hello', :altIDs => '3333', 
-      #   :controlGroup => 'M', :blob => fixture('dino.jpg'))
       @test_object.datastreams.should_not have_key("DS1")
       @test_object.add_datastream(ds)
       ds.save
@@ -434,47 +403,6 @@ describe ActiveFedora::Base do
       @test_object.delete
       ActiveFedora::Base.find_with_conditions(:id=>pid).should be_empty
     end
-
-    describe '#delete' do
-      before do
-        @test_object2 = MockAFBaseRelationship.create
-        @test_object3 = MockAFBaseRelationship.create
-        @test_object4 = MockAFBaseRelationship.create
-        @test_object5 = MockAFBaseRelationship.create
-        Deprecation.stub(:warn)
-        #append to relationship by 'testing'
-        @test_object2.add_relationship_by_name("testing",@test_object3)
-        @test_object2.add_relationship_by_name("testing2",@test_object4)
-        @test_object5.add_relationship_by_name("testing",@test_object2)
-        #@test_object5.add_relationship_by_name("testing2",@test_object3)
-        @test_object2.save
-        @test_object5.save
-        #check that the inbound relationships on test_object3 and test_object4 were eliminated
-        #testing goes to :has_part and testing2 goes to :has_member
-        @test_object2.relationships_by_name(false)[:inbound]["testing_inbound"].should == [@test_object5.internal_uri]
-        @test_object2.relationships_by_name(false)[:self]["parts_outbound"].should == [@test_object3.internal_uri]
-        @test_object2.relationships_by_name(false)[:self]["testing"].should == [@test_object3.internal_uri]
-
-        @test_object3.relationships_by_name(false)[:inbound]["testing_inbound"].should == [@test_object2.internal_uri]
-        @test_object4.relationships_by_name(false)[:inbound]["testing_inbound2"].should == [@test_object2.internal_uri]
-
-        @test_object5.relationships_by_name(false)[:self]["testing"].should == [@test_object2.internal_uri]
-    end
-
-    it 'if inbound relationships exist should remove relationships from those inbound targets as well when deleting this object' do
-
-        @test_object2.delete
-        #need to reload since removed from rels_ext in memory
-        @test_object5 = MockAFBaseRelationship.find(@test_object5.pid)
-      
-        #check any test_object2 inbound rels gone from source
-        @test_object3.relationships_by_name(false)[:inbound]["testing_inbound"].should == []
-
-        @test_object4.relationships_by_name(false)[:inbound]["testing_inbound2"].should == []
-        @test_object5.relationships_by_name(false)[:self]["testing"].should == []
-    end
-  end
-    
   end
 
   describe '#remove_relationship' do
@@ -498,280 +426,7 @@ describe ActiveFedora::Base do
     end
   end
 
-  describe '#relationships' do
-    it 'should return internal relationships with no parameters and include inbound if false passed in' do
-      @test_object2 = MockAFBaseRelationship.new
-      @test_object2.save
-      @test_object3 = MockAFBaseRelationship.new
-      @test_object3.save
-      @test_object4 = MockAFBaseRelationship.new
-      @test_object4.save
-      @test_object5 = MockAFBaseRelationship.new
-      @test_object5.save
-      #append to named relationship 'testing'
-      @test_object2.testing_append(@test_object3)
-      @test_object2.testing2_append(@test_object4)
-      @test_object2.testing3_append(@test_object5)
-      @test_object5.testing_append(@test_object2)
-      @test_object5.testing2_append(@test_object3)
-      @test_object5.testing_bidirectional_append(@test_object4)
-      @test_object2.save
-      @test_object5.save
-      model_rel = MockAFBaseRelationship.to_class_uri
-      #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      @test_object2.object_relations[:has_model].should include model_rel
-      @test_object2.object_relations[:has_part].should include @test_object3
-
-      @test_object2.object_relations[:has_member].should include @test_object4 
-      @test_object2.object_relations[:is_member_of_collection].should include @test_object5
-      @test_object2.inbound_relationships.should == {:has_part=>[@test_object5.internal_uri]}
-
-      @test_object3.object_relations[:has_model].should include model_rel
-      @test_object3.inbound_relationships.should == {:has_part=>[@test_object2.internal_uri],
-                                                               :has_member=>[@test_object5.internal_uri]}
-      @test_object4.object_relations[:has_model].should include model_rel
-      @test_object4.inbound_relationships.should == {:has_member=>[@test_object2.internal_uri],:has_collection_member=>[@test_object5.internal_uri]}
-
-      @test_object5.object_relations[:has_model].should include model_rel
-      @test_object5.object_relations[:has_part].should include @test_object2
-      @test_object5.object_relations[:has_member].should include @test_object3 
-      @test_object5.object_relations[:has_collection_member].should include @test_object4 
-      @test_object5.inbound_relationships.should == {:is_member_of_collection=>[@test_object2.internal_uri]}
-    end
-  end
-  
-  describe '#inbound_relationships' do
-    it 'should return a hash of inbound relationships' do
-      @test_object2 = MockAFBaseRelationship.new
-      @test_object2.save
-      @test_object3 = MockAFBaseRelationship.new
-      @test_object3.save
-      @test_object4 = MockAFBaseRelationship.new
-      @test_object4.save
-      @test_object5 = MockAFBaseRelationship.new
-      @test_object5.save
-      #append to named relationship 'testing'
-      @test_object2.testing_append(@test_object3)
-      @test_object2.testing2_append(@test_object4)
-      @test_object5.testing_append(@test_object2)
-      @test_object5.testing2_append(@test_object3)
-      #@test_object5.testing_bidirectional_append(@test_object4)
-      @test_object2.save
-      @test_object5.save
-      #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      @test_object2.inbound_relationships.should == {:has_part=>[@test_object5.internal_uri]}
-      @test_object3.inbound_relationships.should == {:has_part=>[@test_object2.internal_uri],:has_member=>[@test_object5.internal_uri]}
-      @test_object4.inbound_relationships.should == {:has_member=>[@test_object2.internal_uri]}
-      @test_object5.inbound_relationships.should == {}
-    end
-  end
   
-  describe '#inbound_relationships_by_name' do
-    it 'should return a hash of inbound relationship names to array of objects' do
-      @test_object2 = MockAFBaseRelationship.new
-      @test_object2.save
-      @test_object3 = MockAFBaseRelationship.new
-      @test_object3.save
-      @test_object4 = MockAFBaseRelationship.new
-      @test_object4.save
-      @test_object5 = MockAFBaseRelationship.new
-      @test_object5.save
-      #append to named relationship 'testing'
-      @test_object2.testing_append(@test_object3)
-      @test_object2.testing2_append(@test_object4)
-      @test_object5.testing_append(@test_object2)
-      @test_object5.testing2_append(@test_object3)
-      @test_object2.save
-      @test_object5.save
-      #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      @test_object2.inbound_relationships_by_name.should == {"testing_inbound"=>[@test_object5.internal_uri],"testing_inbound2"=>[],
-                                                           "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[], "parts_inbound" => []}
-      @test_object3.inbound_relationships_by_name.should == {"testing_inbound"=>[@test_object2.internal_uri],"testing_inbound2"=>[@test_object5.internal_uri],
-                                                           "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[], "parts_inbound" => []}
-      @test_object4.inbound_relationships_by_name.should == {"testing_inbound"=>[],"testing_inbound2"=>[@test_object2.internal_uri],
-                                                           "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[], "parts_inbound" => []}
-      @test_object5.inbound_relationships_by_name.should == {"testing_inbound"=>[],"testing_inbound2"=>[],
-                                                           "testing_bidirectional_inbound"=>[],"testing_inbound3"=>[], "parts_inbound" => []}
-    end
-  end
-  
-  describe '#relationships_by_name' do
-    it '' do
-      @test_object2 = MockAFBaseRelationship.new
-      @test_object2.save
-      @test_object3 = MockAFBaseRelationship.new
-      @test_object3.save
-      @test_object4 = MockAFBaseRelationship.new
-      @test_object4.save
-      @test_object5 = MockAFBaseRelationship.new
-      @test_object5.save
-      #append to named relationship 'testing'
-      @test_object2.testing_append(@test_object3)
-      @test_object2.testing2_append(@test_object4)
-      @test_object5.testing_append(@test_object2)
-      @test_object5.testing2_append(@test_object3)
-      @test_object2.save
-      @test_object5.save
-      #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      @test_object2.relationships_by_name(false)[:self]["testing"].should == [@test_object3.internal_uri]
-      @test_object2.relationships_by_name(false)[:self]["testing2"].should == [@test_object4.internal_uri]
-      @test_object2.relationships_by_name(false)[:self]["parts_outbound"].should == [@test_object3.internal_uri]
-      @test_object2.relationships_by_name(false)[:inbound]["testing_inbound"].should == [@test_object5.internal_uri]
-
-      @test_object3.relationships_by_name(false)[:inbound]["testing_inbound"].should == [@test_object2.internal_uri]
-      @test_object3.relationships_by_name(false)[:inbound]["testing_inbound2"].should == [@test_object5.internal_uri]
-
-      @test_object4.relationships_by_name(false)[:inbound]["testing_inbound2"].should == [@test_object2.internal_uri]
-
-      @test_object5.relationships_by_name(false)[:self]["testing"].should == [@test_object2.internal_uri]
-      @test_object5.relationships_by_name(false)[:self]["testing2"].should == [@test_object3.internal_uri]
-      @test_object5.relationships_by_name(false)[:self]["parts_outbound"].should == [@test_object2.internal_uri]
-
-      #all inbound should now be empty if no parameter supplied to relationships
-      @test_object2.relationships_by_name[:self]["testing"].should == [@test_object3.internal_uri]
-      @test_object2.relationships_by_name[:self]["testing2"].should == [@test_object4.internal_uri]
-      @test_object2.relationships_by_name[:self]["parts_outbound"].should == [@test_object3.internal_uri]
-      @test_object2.relationships_by_name.should_not have_key :inbound
-
-      @test_object3.relationships_by_name.should_not have_key :inbound
-      @test_object4.relationships_by_name.should_not have_key :inbound
-
-
-      @test_object5.relationships_by_name[:self]["testing"].should == [@test_object2.internal_uri]
-      @test_object5.relationships_by_name[:self]["testing2"].should == [@test_object3.internal_uri]
-      @test_object5.relationships_by_name[:self]["parts_outbound"].should == [@test_object2.internal_uri]
-      @test_object5.relationships_by_name.should_not have_key :inbound
-      # @test_object2.relationships_by_name.should == {:self=>{"testing2"=>[@test_object4.internal_uri], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[@test_object3.internal_uri], "parts_outbound"=>[@test_object3.internal_uri], "testing_bidirectional_outbound"=>[]}}
-      # @test_object3.relationships_by_name.should == {:self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
-      # @test_object4.relationships_by_name.should == {:self=>{"testing2"=>[], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[], "parts_outbound"=>[], "testing_bidirectional_outbound"=>[]}}
-      # @test_object5.relationships_by_name.should == {:self=>{"testing2"=>[@test_object3.internal_uri], "collection_members"=>[], "testing3"=>[], "part_of"=>[], "testing"=>[@test_object2.internal_uri], "parts_outbound"=>[@test_object2.internal_uri], "testing_bidirectional_outbound"=>[]}}
-    end
-  end
-  
-  describe '#add_relationship_by_name' do
-    it 'should add a named relationship to an object' do
-      @test_object2 = MockAFBaseRelationship.new
-      #@test_object2.new_object = true
-      @test_object2.save
-      @test_object3 = MockAFBaseRelationship.new
-      #@test_object3.new_object = true
-      @test_object3.save
-      @test_object4 = MockAFBaseRelationship.new
-      #@test_object4.new_object = true
-      @test_object4.save
-      @test_object5 = MockAFBaseRelationship.new
-      #@test_object5.new_object = true
-      @test_object5.save
-      #append to named relationship 'testing'
-      @test_object2.add_relationship_by_name("testing",@test_object3)
-      @test_object2.add_relationship_by_name("testing2",@test_object4)
-      @test_object5.add_relationship_by_name("testing",@test_object2)
-      @test_object5.add_relationship_by_name("testing2",@test_object3)
-      @test_object2.save
-      @test_object5.save
-      #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      @test_object2.relationships_by_name(false)[:self]["testing"].should == [@test_object3.internal_uri]
-      @test_object2.relationships_by_name(false)[:self]["testing2"].should == [@test_object4.internal_uri]
-      @test_object2.relationships_by_name(false)[:self]["parts_outbound"].should == [@test_object3.internal_uri]
-      @test_object2.relationships_by_name(false)[:inbound]["testing_inbound"].should == [@test_object5.internal_uri]
-
-      @test_object3.relationships_by_name(false)[:inbound]["testing_inbound"].should == [@test_object2.internal_uri]
-      @test_object3.relationships_by_name(false)[:inbound]["testing_inbound2"].should == [@test_object5.internal_uri]
-
-      @test_object4.relationships_by_name(false)[:inbound]["testing_inbound2"].should == [@test_object2.internal_uri]
-
-      @test_object5.relationships_by_name(false)[:self]["testing"].should == [@test_object2.internal_uri]
-      @test_object5.relationships_by_name(false)[:self]["testing2"].should == [@test_object3.internal_uri]
-      @test_object5.relationships_by_name(false)[:self]["parts_outbound"].should == [@test_object2.internal_uri]
-    end
-  end
-  
-  describe '#remove_named_relationship' do
-    it 'should remove an existing relationship from an object' do
-      @test_object2 = MockAFBaseRelationship.new
-      #@test_object2.new_object = true
-      @test_object2.save
-      @test_object3 = MockAFBaseRelationship.new
-      #@test_object3.new_object = true
-      @test_object3.save
-      @test_object4 = MockAFBaseRelationship.new
-      #@test_object4.new_object = true
-      @test_object4.save
-      @test_object5 = MockAFBaseRelationship.new
-      #@test_object5.new_object = true
-      @test_object5.save
-      #append to named relationship 'testing'
-      @test_object2.add_relationship_by_name("testing",@test_object3)
-      @test_object2.add_relationship_by_name("testing2",@test_object4)
-      @test_object5.add_relationship_by_name("testing",@test_object2)
-      @test_object5.add_relationship_by_name("testing2",@test_object3)
-      @test_object2.save
-      @test_object5.save
-      #check inbound correct, testing goes to :has_part and testing2 goes to :has_member
-      @test_object2.relationships_by_name(false)[:self]["testing"].should == [@test_object3.internal_uri]
-      @test_object2.relationships_by_name(false)[:self]["testing2"].should == [@test_object4.internal_uri]
-      @test_object2.relationships_by_name(false)[:self]["parts_outbound"].should == [@test_object3.internal_uri]
-      @test_object2.relationships_by_name(false)[:inbound]["testing_inbound"].should == [@test_object5.internal_uri]
-
-      @test_object3.relationships_by_name(false)[:inbound]["testing_inbound"].should == [@test_object2.internal_uri]
-      @test_object3.relationships_by_name(false)[:inbound]["testing_inbound2"].should == [@test_object5.internal_uri]
-
-      @test_object4.relationships_by_name(false)[:inbound]["testing_inbound2"].should == [@test_object2.internal_uri]
-
-      @test_object5.relationships_by_name(false)[:self]["testing"].should == [@test_object2.internal_uri]
-      @test_object5.relationships_by_name(false)[:self]["testing2"].should == [@test_object3.internal_uri]
-      @test_object5.relationships_by_name(false)[:self]["parts_outbound"].should == [@test_object2.internal_uri]
-
-      @test_object2.remove_relationship_by_name("testing",@test_object3.internal_uri)
-      @test_object2.save
-      #check now removed for both outbound and inbound
-      @test_object2.relationships_by_name(false)[:self]["testing"].should == []
-      @test_object2.relationships_by_name(false)[:self]["testing2"].should == [@test_object4.internal_uri]
-      @test_object2.relationships_by_name(false)[:self]["parts_outbound"].should == []
-      @test_object2.relationships_by_name(false)[:inbound]["testing_inbound"].should == [@test_object5.internal_uri]
-
-      @test_object3.relationships_by_name(false)[:inbound]["testing_inbound"].should == []
-      @test_object3.relationships_by_name(false)[:inbound]["testing_inbound2"].should == [@test_object5.internal_uri]
-    end
-  end
-
-  describe '#find_relationship_by_name' do
-    it 'should find relationships based on name passed in for inbound or outbound' do
-      @test_object2 = MockAFBaseRelationship.new
-      @test_object2.save
-      @test_object3 = MockAFBaseRelationship.new
-      @test_object3.save
-      @test_object4 = MockAFBaseRelationship.new
-      @test_object4.save
-      @test_object5 = MockAFBaseRelationship.new
-      @test_object5.save
-      #append to named relationship 'testing'
-      @test_object2.add_relationship_by_name("testing",@test_object3)
-      @test_object2.add_relationship_by_name("testing2",@test_object4)
-      @test_object5.add_relationship_by_name("testing",@test_object2)
-      @test_object5.add_relationship_by_name("testing2",@test_object3)
-      @test_object2.save
-      @test_object5.save
-      @test_object2.find_relationship_by_name("testing").should == [@test_object3.internal_uri]
-      @test_object2.find_relationship_by_name("testing2").should == [@test_object4.internal_uri]
-      @test_object2.find_relationship_by_name("testing_inbound").should == [@test_object5.internal_uri]
-      @test_object2.find_relationship_by_name("testing_inbound2").should == []
-      @test_object3.find_relationship_by_name("testing").should == []
-      @test_object3.find_relationship_by_name("testing2").should == []
-      @test_object3.find_relationship_by_name("testing_inbound").should == [@test_object2.internal_uri]
-      @test_object3.find_relationship_by_name("testing_inbound2").should == [@test_object5.internal_uri]
-      @test_object4.find_relationship_by_name("testing").should == []
-      @test_object4.find_relationship_by_name("testing2").should == []
-      @test_object4.find_relationship_by_name("testing_inbound").should == []
-      @test_object4.find_relationship_by_name("testing_inbound2").should == [@test_object2.internal_uri]
-      @test_object5.find_relationship_by_name("testing").should == [@test_object2.internal_uri]
-      @test_object5.find_relationship_by_name("testing2").should == [@test_object3.internal_uri]
-      @test_object5.find_relationship_by_name("testing_inbound").should == []
-      @test_object5.find_relationship_by_name("testing_inbound2").should == []
-      
-    end
-  end
-
   describe "#exists?" do
     it "should return true for objects that exist" do
       ActiveFedora::Base.exists?('hydrangea:fixture_mods_article1').should be_true

data/spec/integration/complex_rdf_datastream_spec.rb

@@ -89,7 +89,7 @@ END
 
         class MediatorUser
           include ActiveFedora::RdfObject
-          rdf_type RDF::DC.AgentClass
+          rdf_type "http://purl.org/dc/terms/AgentClass"
           map_predicates do |map|
             map.title(:in=> RDF::DC)
           end

data/spec/integration/full_featured_model_spec.rb

@@ -7,11 +7,6 @@ describe ActiveFedora::Base do
 
   before(:all) do
     class OralHistory < ActiveFedora::Base
-        include ActiveFedora::Relationships
-
-        Deprecation.silence(ActiveFedora::Relationships::ClassMethods) do
-          has_relationship "parts", :is_part_of, :inbound => true
-        end
         # These are all the properties that don't quite fit into Qualified DC
         # Put them on the object itself (in the properties datastream) for now.
         has_metadata :name => "properties", :type => ActiveFedora::SimpleDatastream do |m|
@@ -28,9 +23,6 @@ describe ActiveFedora::Base do
           m.field "location", :string
         end
         
-        # has_metadata :name=>"arbitrary_xml", :type=> ActiveFedora::OmDatastream do |m|
-        #   m.root_property :myxml, "my_xml", "http://www.example.gov/schema/v3"
-        # end
         
         has_metadata :name=>"mods_article", :type=> Hydra::ModsArticleDatastream 
         
@@ -151,7 +143,7 @@ describe ActiveFedora::Base do
     @properties_sample_values.each_pair do |field, value|
       next if field == :hard_copy_availability #FIXME HYDRA-824
       next if field == :location #FIXME HYDRA-825 
-      (@solr_result[ActiveFedora::SolrService.solr_name(field, :string, :searchable)] || @solr_result[ActiveFedora::SolrService.solr_name(field, :date)]).should == [::Solrizer::Extractor.format_node_value(value)] 
+      (@solr_result[ActiveFedora::SolrService.solr_name(field, type: :string)] || @solr_result[ActiveFedora::SolrService.solr_name(field, type: :date)]).should == [::Solrizer::Extractor.format_node_value(value)] 
     end
     
     @dublin_core_sample_values.each_pair do |field, value|