active-fedora 3.3.2 → 4.0.0.rc1

data/spec/unit/config_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe ActiveFedora::Config do
+  describe "with a single fedora instance" do
+    subject { ActiveFedora::Config.new('spec/fixtures/rails_root/config/fedora.yml', 'test') }
+    its(:path) { should == 'spec/fixtures/rails_root/config/fedora.yml'}
+    its(:credentials) { should == {:url => 'http://testhost.com:8983/fedora', :user=> 'fedoraAdmin', :password=> 'fedoraAdmin'}}
+    it { should_not be_sharded }
+  end
+  describe "with several fedora shards" do
+    subject { ActiveFedora::Config.new('spec/fixtures/sharded_fedora.yml', 'test') }
+    its(:path) { should == 'spec/fixtures/sharded_fedora.yml'}
+    its(:credentials) { should == [{:url => 'http://127.0.0.1:8983/fedora1', :user=> 'fedoraAdmin', :password=> 'fedoraAdmin'},
+                              {:url => 'http://127.0.0.1:8983/fedora2', :user=> 'fedoraAdmin', :password=> 'fedoraAdmin'},
+                              {:url => 'http://127.0.0.1:8983/fedora3', :user=> 'fedoraAdmin', :password=> 'fedoraAdmin'}]}
+    it { should be_sharded }
+  end
+
+end

data/spec/unit/content_model_spec.rb

@@ -1,9 +1,5 @@
 require 'spec_helper'
 
-require 'active_fedora'
-require 'mocha'
-
-
 describe ActiveFedora::ContentModel do
   
   before(:all) do
@@ -24,7 +20,7 @@ describe ActiveFedora::ContentModel do
   
   before(:each) do
     stub_get('__nextid__')
-    ActiveFedora::RubydoraConnection.instance.stubs(:nextid).returns("__nextid__")
+    ActiveFedora::Base.stubs(:assign_pid).returns("__nextid__")
     Rubydora::Repository.any_instance.stubs(:client).returns(@mock_client)
     @test_cmodel = ActiveFedora::ContentModel.new
   end
@@ -55,25 +51,6 @@ describe ActiveFedora::ContentModel do
   end
   
   
-  describe "#pid_from_ruby_class" do
-    before do
-      ActiveSupport::Deprecation.stubs(:warn)
-    end
-  
-    it "should construct pids" do
-      ActiveFedora::ContentModel.pid_from_ruby_class(@test_cmodel.class).should == "info:fedora/afmodel:ActiveFedora_ContentModel"
-      ActiveFedora::ContentModel.pid_from_ruby_class(@test_cmodel.class, :namespace => "foo", :pid_suffix => "BarBar").should == "info:fedora/foo:ActiveFedora_ContentModelBarBar"
-    end
-    it "should construct pids with the namespace declared in the model" do
-      ActiveFedora::ContentModel.stubs(:pid_namespace).returns("test-cModel")
-      ActiveFedora::ContentModel.pid_from_ruby_class(@test_cmodel.class).should == "info:fedora/test-cModel:ActiveFedora_ContentModel"
-    end
-    it "should construct pids with the suffix declared in the model" do
-      ActiveFedora::ContentModel.stubs(:pid_suffix).returns("-TEST-SUFFIX")
-      ActiveFedora::ContentModel.pid_from_ruby_class(@test_cmodel.class).should == 'info:fedora/afmodel:ActiveFedora_ContentModel-TEST-SUFFIX'
-    end
-  end
-  
   describe "models_asserted_by" do
     it "should return an array of all of the content models asserted by the given object" do
       mock_object = mock("ActiveFedora Object")

data/spec/unit/datastream_collections_spec.rb

@@ -1,14 +1,11 @@
 require 'spec_helper'
 
-
-DEPRECATION_MSG = "Deprecation: DatastreamCollections will not be included by default in the next version.   To use has_datastream add 'include ActiveFedora::DatastreamCollections' to your model"
-
 describe ActiveFedora::DatastreamCollections do
   describe '.has_datastream' do
     before(:all) do
-      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
       
       class MockHasDatastream < ActiveFedora::Base
+        include ActiveFedora::DatastreamCollections
         has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
         has_datastream :name=>"EAD", :type=>ActiveFedora::Datastream, :mimeType=>"application/xml", :controlGroup=>'M' 
         has_datastream :name=>"external", :type=>ActiveFedora::Datastream, :controlGroup=>'E'
@@ -40,8 +37,8 @@ describe ActiveFedora::DatastreamCollections do
   end
   describe '#datastream_names' do
     before(:all) do
-      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
       class MockDatastreamNames < ActiveFedora::Base
+        include ActiveFedora::DatastreamCollections
         has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
         has_datastream :name=>"EAD", :type=>ActiveFedora::Datastream, :mimeType=>"application/xml", :controlGroup=>'M' 
       end
@@ -55,8 +52,8 @@ describe ActiveFedora::DatastreamCollections do
   
   describe '#add_named_datastream' do
     before(:all) do
-      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
       class MockAddNamedDatastream < ActiveFedora::Base
+        include ActiveFedora::DatastreamCollections
         has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
         has_datastream :name=>"high", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M' 
         has_datastream :name=>"anymime", :type=>ActiveFedora::Datastream, :controlGroup=>'M' 
@@ -146,8 +143,8 @@ describe ActiveFedora::DatastreamCollections do
   
   describe '#add_named_file_datastream' do
     before do
-      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
       class MockAddNamedFileDatastream < ActiveFedora::Base
+        include ActiveFedora::DatastreamCollections
         has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
         has_datastream :name=>"high", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M' 
         has_datastream :name=>"anymime", :type=>ActiveFedora::Datastream, :controlGroup=>'M' 
@@ -176,8 +173,8 @@ describe ActiveFedora::DatastreamCollections do
 
   describe '#update_named_datastream' do
     before do
-      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
       class MockUpdateNamedDatastream < ActiveFedora::Base
+        include ActiveFedora::DatastreamCollections
         has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
       end
     end
@@ -236,8 +233,8 @@ describe ActiveFedora::DatastreamCollections do
   describe '#named_datastreams_desc' do
       
     before do
-      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
       class MockNamedDatastreamsDesc < ActiveFedora::Base
+        include ActiveFedora::DatastreamCollections
         has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
       end
     end
@@ -252,8 +249,8 @@ describe ActiveFedora::DatastreamCollections do
 
   describe '#is_named_datastream?' do
     before do
-      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
       class MockIsNamedDatastream < ActiveFedora::Base
+        include ActiveFedora::DatastreamCollections
         has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
       end
     end
@@ -268,8 +265,8 @@ describe ActiveFedora::DatastreamCollections do
   
   describe '#named_datastreams' do
     before do
-      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
       class MockNamedDatastreams < ActiveFedora::Base
+        include ActiveFedora::DatastreamCollections
         has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
         has_datastream :name=>"high", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M' 
         has_datastream :name=>"external", :type=>ActiveFedora::Datastream, :controlGroup=>'E' 
@@ -318,8 +315,8 @@ describe ActiveFedora::DatastreamCollections do
     
   describe '#named_datastreams_ids' do
     before do
-      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
       class MockNamedDatastreamsIds < ActiveFedora::Base
+        include ActiveFedora::DatastreamCollections
         has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
         has_datastream :name=>"high", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M' 
         has_datastream :name=>"external", :type=>ActiveFedora::Datastream, :controlGroup=>'E' 
@@ -344,8 +341,8 @@ describe ActiveFedora::DatastreamCollections do
     
   describe '#create_named_datastream_finders' do
     before do
-      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
       class MockCreateNamedDatastreamFinder < ActiveFedora::Base
+        include ActiveFedora::DatastreamCollections
         has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
         has_datastream :name=>"high", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M' 
       end
@@ -384,8 +381,8 @@ describe ActiveFedora::DatastreamCollections do
     
   describe '#create_named_datastream_update_methods' do
     before do
-      ActiveSupport::Deprecation.expects(:warn).with(DEPRECATION_MSG)
       class MockCreateNamedDatastreamUpdateMethods < ActiveFedora::Base
+        include ActiveFedora::DatastreamCollections
         has_datastream :name=>"thumbnail",:prefix => "THUMB", :type=>ActiveFedora::Datastream, :mimeType=>"image/jpeg", :controlGroup=>'M'
         has_datastream :name=>"EAD", :type=>ActiveFedora::Datastream, :mimeType=>"application/xml", :controlGroup=>'M' 
         has_datastream :name=>"external", :type=>ActiveFedora::Datastream, :controlGroup=>'E' 

data/spec/unit/datastreams_spec.rb

@@ -29,7 +29,8 @@ describe ActiveFedora::Datastreams do
       @this_pid = increment_pid.to_s
       stub_get(@this_pid)
       Rubydora::Repository.any_instance.stubs(:client).returns(@mock_client)
-      ActiveFedora::RubydoraConnection.instance.stubs(:nextid).returns(@this_pid)
+      ActiveFedora::Base.stubs(:assign_pid).returns(@this_pid)
+      #ActiveFedora::RubydoraConnection.instance.stubs(:nextid).returns(@this_pid)
     end
 
     describe "creates datastreams" do
@@ -52,6 +53,7 @@ describe ActiveFedora::Datastreams do
         stub_add_ds(@this_pid, ['RELS-EXT', 'someData', 'withText', 'withText2'])
 
         @n = FooHistory.new()
+        FooHistory.stubs(:assign_pid).returns(@this_pid)
         @n.datastreams['RELS-EXT'].expects(:changed?).returns(true).at_least_once
         @n.expects(:update_index)
         @n.save
@@ -71,7 +73,7 @@ describe ActiveFedora::Datastreams do
 
 
     it "should create specified datastreams with appropriate control group" do
-      ActiveFedora.fedora_config.stubs(:[]).returns({:url=>'sub_url'})
+      ActiveFedora.stubs(:config_for_environment).returns(:url=>'sub_url')
       stub_ingest(@this_pid)
       stub_add_ds(@this_pid, ['RELS-EXT', 'DC', 'rightsMetadata', 'properties', 'descMetadata', 'UKETD_DC'])
       stub_get(@this_pid, ['RELS-EXT', 'DC', 'rightsMetadata', 'properties', 'descMetadata', 'UKETD_DC'])
@@ -94,6 +96,7 @@ describe ActiveFedora::Datastreams do
 
       end
       @n = UketdObject.new()
+      UketdObject.stubs(:assign_pid).returns(@this_pid)
       @n.save
       @n.datastreams["DC"].controlGroup.should eql("X")
       @n.datastreams["rightsMetadata"].controlGroup.should eql("X")
@@ -120,39 +123,35 @@ describe ActiveFedora::Datastreams do
         end
         stub_ingest(@this_pid)
         @n = MoreFooHistory.new
+        MoreFooHistory.stubs(:assign_pid).returns(@this_pid)
         @n.save
         @n.datastreams['externalDisseminator'].dsLocation.should == "http://exampl.com/mypic.jpg"
       end
       
-      it "should allow :control_group => 'E' without a :url option" do
-        class MoreFooHistory < ActiveFedora::Base
-          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "E"
+      describe "control_group E without a url" do
+        before do
+          class MoreFooHistory < ActiveFedora::Base
+            has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "E"
+          end
+          stub_ingest(@this_pid)
+          @n = MoreFooHistory.new
+          MoreFooHistory.stubs(:assign_pid).returns(@this_pid)
         end
-        stub_ingest(@this_pid)
-        @n = MoreFooHistory.new
-        @n.datastreams['externalDisseminator'].dsLocation.present?.should == false
-        @n.save
-      end
-      
-      it "should fail validation if a :url is not added before save" do
-        class MoreFooHistory < ActiveFedora::Base
-          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "E"
+        it "should allow :control_group => 'E' without a :url option" do
+          @n.datastreams['externalDisseminator'].dsLocation.present?.should == false
+          @n.save
         end
-        stub_ingest(@this_pid)
-        @n = MoreFooHistory.new
-        @n.datastreams['externalDisseminator'].validate_content_present.should == false
-        @n.save
-      end
-      
-      it "should pass validation if a :url is added before save" do
-        class MoreFooHistory < ActiveFedora::Base
-          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "E"
+        
+        it "should fail validation if a :url is not added before save" do
+          @n.datastreams['externalDisseminator'].validate_content_present.should == false
+          @n.save
+        end
+        
+        it "should pass validation if a :url is added before save" do
+          @n.datastreams['externalDisseminator'].dsLocation = "http://exampl.com/mypic.jpg"
+          @n.datastreams['externalDisseminator'].validate_content_present.should == true
+          @n.save
         end
-        stub_ingest(@this_pid)
-        @n = MoreFooHistory.new
-        @n.datastreams['externalDisseminator'].dsLocation = "http://exampl.com/mypic.jpg"
-        @n.datastreams['externalDisseminator'].validate_content_present.should == true
-        @n.save
       end
     end
 
@@ -172,38 +171,34 @@ describe ActiveFedora::Datastreams do
           has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "R", :url => "http://exampl.com/mypic.jpg"
         end
         @n = MoreFooHistory.new
+        MoreFooHistory.stubs(:assign_pid).returns(@this_pid)
         @n.save
       end
     
-      it "should allow :control_group => 'R' without a :url option" do
-        class MoreFooHistory < ActiveFedora::Base
-          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "R"
+      describe "control_group R without url" do
+        before do
+          class MoreFooHistory < ActiveFedora::Base
+            has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "R"
+          end
+          MoreFooHistory.stubs(:assign_pid).returns(@this_pid)
+          stub_ingest(@this_pid)
+          @n = MoreFooHistory.new
         end
-        stub_ingest(@this_pid)
-        @n = MoreFooHistory.new
-        @n.datastreams['externalDisseminator'].dsLocation.present?.should == false
-        @n.save
-      end
-    
-      it "should fail validation if a :url is not added before save" do
-        class MoreFooHistory < ActiveFedora::Base
-          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "R"
+        it "should allow :control_group => 'R' without a :url option" do
+          @n.datastreams['externalDisseminator'].dsLocation.present?.should == false
+          @n.save
         end
-        stub_ingest(@this_pid)
-        @n = MoreFooHistory.new
-        @n.datastreams['externalDisseminator'].validate_content_present.should == false
-        @n.save
-      end
-    
-      it "should pass validation if a :url is added before save" do
-        class MoreFooHistory < ActiveFedora::Base
-          has_metadata :type=>ActiveFedora::MetadataDatastream, :name=>"externalDisseminator",:control_group => "R"
+      
+        it "should fail validation if a :url is not added before save" do
+          @n.datastreams['externalDisseminator'].validate_content_present.should == false
+          @n.save
+        end
+      
+        it "should pass validation if a :url is added before save" do
+          @n.datastreams['externalDisseminator'].dsLocation = "http://exampl.com/mypic.jpg"
+          @n.datastreams['externalDisseminator'].validate_content_present.should == true
+          @n.save
         end
-        stub_ingest(@this_pid)
-        @n = MoreFooHistory.new
-        @n.datastreams['externalDisseminator'].dsLocation = "http://exampl.com/mypic.jpg"
-        @n.datastreams['externalDisseminator'].validate_content_present.should == true
-        @n.save
       end
     end
   end

data/spec/unit/model_spec.rb

@@ -1,11 +1,5 @@
 require 'spec_helper'
 
-require 'active_fedora'
-require 'active_fedora/model'
-require "rexml/document"
-require 'mocha'
-
-
 describe ActiveFedora::Model do
   
   before(:all) do
@@ -18,7 +12,7 @@ describe ActiveFedora::Model do
   end
   
   before(:each) do 
-    ActiveFedora::RubydoraConnection.instance.stubs(:nextid).returns('_nextid_')
+    ActiveFedora::Base.stubs(:assign_pid).returns('_nextid_')
     @test_instance = SpecModel::Basic.new
     @property = stub("myproperty", :name => "mock_prop", :instance_variable_name => "@mock_prop")
     SpecModel::Basic.extend(ActiveFedora::Model)
@@ -27,7 +21,7 @@ describe ActiveFedora::Model do
   end
   
   after(:all) do
-    #Object.send(:remove_const, :SpecModel)
+    Object.send(:remove_const, :SpecModel)
   end
   
   it 'should provide #attribute_set and #attribute_get' do
@@ -35,24 +29,6 @@ describe ActiveFedora::Model do
     SpecModel::Basic.should respond_to(:attribute_get) 
   end
   
-  describe "#attribute_set" do
-    it "should look up the property's ivar name from properties hash" do
-      pending
-      SpecModel::Basic.expects(:properties).with(@test_property.name)
-      SpecModel::Basic.expects(:set_instance_variable).with(@test_property.instance_variable_name, "new value")
-      SpecModel::Basic.attribute_set(@test_property.name, "new value")
-    end
-  end
-  
-  describe "#attribute_get" do
-    it "should look up the property's ivar name from properties hash" do
-      pending
-      SpecModel::Basic.expects(:properties).with(@test_property.name)
-      SpecModel::Basic.expects(:get_instance_variable).with(@test_property.instance_variable_name)
-      SpecModel::Basic.attribute_get(@test_property.name, "new value")
-    end
-  end
-  
   it 'should provide #create_property_getter' do
     SpecModel::Basic.should respond_to(:create_property_getter)
   end
@@ -104,33 +80,15 @@ describe ActiveFedora::Model do
       mock_result.expects(:hits).returns([{"id" => "changeme:30"}, {"id" => "changeme:22"}])
       mock_solr.expects(:query).with('has_model_s:info\\:fedora/afmodel\\:SpecModel_Basic', :rows=>1001).returns(mock_result)
       ActiveFedora::SolrService.expects(:instance).returns(mock("SolrService", :conn => mock_solr))
-      ActiveFedora::RubydoraConnection.instance.expects(:find_model).with("changeme:30", SpecModel::Basic).returns("Fake Object1")
-      ActiveFedora::RubydoraConnection.instance.expects(:find_model).with("changeme:22", SpecModel::Basic).returns("Fake Object2")
+      SpecModel::Basic.expects(:load_instance).with("changeme:30").returns("Fake Object1")
+      SpecModel::Basic.expects(:load_instance).with("changeme:22").returns("Fake Object2")
       SpecModel::Basic.find(:all, :rows=>1001).should == ["Fake Object1", "Fake Object2"]
     end
     
     it "(String) should query solr for an object with the given id and return that object" do
-      ActiveFedora::RubydoraConnection.instance.expects(:find_model).with("changeme:30", SpecModel::Basic).returns("Fake Object")
-    
+      SpecModel::Basic.expects(:load_instance).with("changeme:30").returns("Fake Object")
       SpecModel::Basic.find("changeme:30").should == "Fake Object"
     end
-    
-    describe"(:pid => xxx)" do 
-      it "should pull the inner object from fedora if it already exists in fedora" do
-        pending
-        ActiveFedora::RubydoraConnection.instance.expects(:save).never
-        mock_obj = mock("Fedora Object")
-        ActiveFedora::RubydoraConnection.instance.expects(:find_objects).returns([mock_obj])
-        ActiveFedora::Base.new(:pid=>"test:1").inner_object.should equal(mock_obj)
-      end
-      it "should save the inner_object to fedora if it does not already exist" do
-        pending
-        ActiveFedora::RubydoraConnection.instance.expects(:save)
-        ActiveFedora::RubydoraConnection.instance.expects(:find_objects).returns([])
-        ActiveFedora::Base.new(:pid=>"test:1")
-      end
-    end
-    
   end
 
   describe '#count' do
@@ -178,10 +136,9 @@ describe ActiveFedora::Model do
   end
   
   describe "load_instance" do
-    it "should use Repository.find_model to instantiate an object" do
-      mock_repo = mock("repo")
-      mock_repo.expects(:find_model).with("_PID_", SpecModel::Basic)
-      ActiveFedora::RubydoraConnection.expects(:instance).returns(mock_repo) 
+    it "should use SpecModel::Basic.allocate.init_with to instantiate an object" do
+      SpecModel::Basic.any_instance.expects(:init_with)
+      SpecModel::Basic.expects(:connection_for_pid).with("_PID_")
       SpecModel::Basic.load_instance("_PID_")
     end
   end
@@ -193,15 +150,29 @@ describe ActiveFedora::Model do
           include ActiveFedora::Model
         end
       end
+
     end
     
     after :all do
       SpecModel.send(:remove_const, :CamelCased)
     end
+    subject {SpecModel::CamelCased}
     
-    it "should turn a Model class name into an afmodel URI" do
-      SpecModel::CamelCased.to_class_uri.should == 'info:fedora/afmodel:SpecModel_CamelCased'
+    its(:to_class_uri) {should == 'info:fedora/afmodel:SpecModel_CamelCased' }
+  
+    context "with the namespace declared in the model" do
+      before do
+        subject.stubs(:pid_namespace).returns("test-cModel")
+      end
+      its(:to_class_uri) {should == 'info:fedora/test-cModel:SpecModel_CamelCased' }
     end
+    context "with the suffix declared in the model" do
+      before do
+        subject.stubs(:pid_suffix).returns("-TEST-SUFFIX")
+      end
+      its(:to_class_uri) {should == 'info:fedora/afmodel:SpecModel_CamelCased-TEST-SUFFIX' }
+    end
+  
     
     it "should turn an afmodel URI into a Model class name" do
       ActiveFedora::Model.classname_from_uri('info:fedora/afmodel:SpecModel_CamelCased').should == ['SpecModel::CamelCased', 'afmodel']