hydra-head 3.3.0 → 4.0.0.rc2

data/test_support/spec/controllers/file_assets_controller_spec.rb

@@ -1,33 +1,27 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe FileAssetsController do
+describe Hydra::FileAssetsController do
   include Devise::TestHelpers
 
   before do
     session[:user]='bob'
   end
 
-  ## Plugin Tests
-  it "should use FileAssetsController" do
-    controller.should be_an_instance_of(FileAssetsController)
-  end
   it "should be restful" do
-    { :get => "/file_assets" }.should route_to(:controller=>'file_assets', :action=>'index')
-    { :get => "/file_assets/3" }.should route_to(:controller=>'file_assets', :action=>'show', :id=>"3")
-    { :delete=> "/file_assets/3" }.should route_to(:controller=>'file_assets', :action=>'destroy', :id=>"3")
-    { :put=>"/file_assets/3" }.should route_to(:controller=>'file_assets', :action=>'update', :id=>"3")
-    { :get => "/file_assets/3/edit" }.should route_to(:controller=>'file_assets', :action=>'edit', :id=>"3")
-    { :get =>"/file_assets/new" }.should route_to(:controller=>'file_assets', :action=>'new')
-    { :post => "/file_assets" }.should route_to(:controller=>'file_assets', :action=>'create')
+    { :get => "/hydra/file_assets" }.should route_to(:controller=>'hydra/file_assets', :action=>'index')
+    { :get => "/hydra/file_assets/3" }.should route_to(:controller=>'hydra/file_assets', :action=>'show', :id=>"3")
+    { :delete=> "/hydra/file_assets/3" }.should route_to(:controller=>'hydra/file_assets', :action=>'destroy', :id=>"3")
+    { :put=>"/hydra/file_assets/3" }.should route_to(:controller=>'hydra/file_assets', :action=>'update', :id=>"3")
+    { :get => "/hydra/file_assets/3/edit" }.should route_to(:controller=>'hydra/file_assets', :action=>'edit', :id=>"3")
+    { :get =>"/hydra/file_assets/new" }.should route_to(:controller=>'hydra/file_assets', :action=>'new')
+    { :post => "/hydra/file_assets" }.should route_to(:controller=>'hydra/file_assets', :action=>'create')
     
   end
   
   describe "index" do
     
     it "should find all file assets in the repo if no container_id is provided" do
-      #FileAsset.expects(:find_by_solr).with(:all, {}).returns("solr result")
-      # Solr::Connection.any_instance.expects(:query).with('conforms_to_field:info\:fedora/afmodel\:FileAsset', {}).returns("solr result")
-      Solr::Connection.any_instance.expects(:query).with('active_fedora_model_s:FileAsset', {}).returns("solr result")
+      ActiveFedora::SolrService.expects(:query).with('active_fedora_model_s:FileAsset', {}).returns("solr result")
       controller.stubs(:load_permissions_from_solr)
       ActiveFedora::Base.expects(:new).never
       xhr :get, :index
@@ -40,7 +34,7 @@ describe FileAssetsController do
       controller.expects(:get_solr_response_for_doc_id).with('_PID_').returns(["container solr response","container solr doc"])
       controller.stubs(:load_permissions_from_solr)
       
-      ActiveFedora::Base.expects(:load_instance).with("_PID_").returns(mock_container)
+      ActiveFedora::Base.expects(:find).with("_PID_").returns(mock_container)
       xhr :get, :index, :asset_id=>"_PID_"
       assigns[:response].should == "assets solr response"
       assigns[:document_list].should == "assets solr list"
@@ -57,7 +51,7 @@ describe FileAssetsController do
       mock_solr_hash = {"has_collection_member_field"=>["info:fedora/foo:id"]}
       mock_container = mock("container")
       mock_container.expects(:collection_members).with(:response_format=>:solr).returns("solr result")
-      ActiveFedora::Base.expects(:load_instance).with("_PID_").returns(mock_container)
+      ActiveFedora::Base.expects(:find).with("_PID_").returns(mock_container)
       xhr :get, :index, :asset_id=>"_PID_"
       assigns[:solr_result].should == "solr result"
       assigns[:container].should == mock_container
@@ -106,7 +100,7 @@ describe FileAssetsController do
     it "should redirect back to edit view if no Filedata is provided but container_id is provided" do
       controller.expects(:model_config).at_least_once.returns(controller.workflow_config[:mods_assets])
       xhr :post, :create, :container_id=>"_PID_", :wf_step=>"files"
-      response.should redirect_to(:controller=>"catalog", :id=>"_PID_", :action => 'edit', :wf_step=>"permissions")
+      response.should redirect_to edit_catalog_path("_PID_", :wf_step=>"permissions")
       request.flash[:notice].should == "You must specify a file to upload."
     end
     it "should display a message that you need to select a file to upload if no Filedata is provided" do
@@ -119,7 +113,7 @@ describe FileAssetsController do
   describe "destroy" do
     it "should delete the asset identified by pid" do
       mock_obj = mock("asset", :delete)
-      ActiveFedora::Base.expects(:load_instance).with("__PID__").returns(mock_obj)
+      ActiveFedora::Base.expects(:find).with("__PID__").returns(mock_obj)
       delete(:destroy, :id => "__PID__")
     end
     it "should remove container relationship and perform proper garbage collection" do
@@ -127,15 +121,19 @@ describe FileAssetsController do
       mock_container = mock("asset")
       mock_container.expects(:file_objects_remove).with("_file_asset_pid_")
       FileAsset.expects(:garbage_collect).with("_file_asset_pid_")
-      ActiveFedora::Base.expects(:load_instance).with("_container_pid_").returns(mock_container)
+      ActiveFedora::Base.expects(:find).with("_container_pid_").returns(mock_container)
       delete(:destroy, :id => "_file_asset_pid_", :asset_id=>"_container_pid_")
     end
   end
   
   describe "integration tests - " do
     before(:all) do
+      class TestObj < ActiveFedora::Base
+        include ActiveFedora::FileManagement
+      end
+
       ActiveFedora::SolrService.register(ActiveFedora.solr_config[:url])
-      @test_container = ActiveFedora::Base.new
+      @test_container = TestObj.new
       @test_container.add_relationship(:is_member_of, "info:fedora/foo:1")
       @test_container.add_relationship(:has_collection_member, "info:fedora/foo:2")
       @test_container.save
@@ -148,6 +146,7 @@ describe FileAssetsController do
     after(:all) do
      @test_container.delete
      @test_fa.delete
+     Object.send(:remove_const, :TestObj)
     end
 
     describe "index" do
@@ -172,12 +171,11 @@ describe FileAssetsController do
       end
 
       it "should set is_part_of relationship on the new File Asset pointing back at the container" do
-        test_file = fixture("small_file.txt")
+        test_file = fixture_file_upload('/small_file.txt', 'text/plain')
         filename = "My File Name"
-        test_file.expects(:original_filename).twice.returns("My File Name")
         post :create, {:Filedata=>[test_file], :Filename=>filename, :container_id=>@test_container.pid}
         assigns(:file_asset).ids_for_outbound(:is_part_of).should == [@test_container.pid] 
-        retrieved_fa = FileAsset.load_instance(@test_fa.pid).ids_for_outbound(:is_part_of).should == [@test_container.pid]
+        retrieved_fa = FileAsset.find(@test_fa.pid).ids_for_outbound(:is_part_of).should == [@test_container.pid]
       end
     end
   end

data/test_support/spec/controllers/{assets_controller_spec.rb → hydra-assets_controller_spec.rb}

@@ -8,19 +8,34 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 # or
 # rake cucumber
 
-describe AssetsController do
+describe Hydra::AssetsController do
   
   before do
     request.env['WEBAUTH_USER']='bob'
   end
   
   it "should use DocumentController" do
-    controller.should be_an_instance_of(AssetsController)
+    controller.should be_an_instance_of(Hydra::AssetsController)
+  end
+
+  describe "new" do
+    before do
+      @user = FactoryGirl.create(:user)
+      sign_in @user
+      @asset = ModsAsset.new
+      ModsAsset.stubs(:new).returns(@asset)
+    end
+    it "should create and redirect with a flash message" do
+      get :new, :content_type=>'mods_asset'
+      response.should redirect_to edit_catalog_path(@asset, :new_asset=>true)
+      flash[:notice].should == "Created a Mods Asset with pid #{@asset.pid}. Now it's ready to be edited."
+    end
   end
   
   describe "update" do
     it "should update the object with the attributes provided" do
-      mock_document = mock("document")
+      mock_document = ModsAsset.new
+      mock_document.stubs(:pid => '_PID_')
       mock_document.stubs(:update_from_computing_id).returns(nil)
       controller.expects(:check_embargo_date_format).returns(nil)
 
@@ -37,10 +52,14 @@ describe AssetsController do
       mock_document.expects(:save)
       controller.stubs(:display_release_status_notice)
       put :update, {:id=>"_PID_"}.merge(simple_request_params)
+
+      response.should redirect_to catalog_path(mock_document.pid, :viewing_context=>"browse")
+
     end
     
     it "should support updating OM::XML datastreams" do
-      mock_document = mock("document")
+      mock_document = ModsAsset.new
+      mock_document.stubs(:pid => '_PID_')
       mock_document.stubs(:update_from_computing_id).returns(nil)
       ModsAsset.expects(:find).with("_PID_").returns(mock_document)
       
@@ -66,6 +85,7 @@ describe AssetsController do
       controller.stubs(:display_release_status_notice)
       put :update, nokogiri_request_params
       # put :update, :id=>"_PID_", "content_type"=>"mods_asset", "datastream"=>"descMetadata", "field_name"=>"person_0_last_name","parent_select"=>[{":person"=>"0"}, ":last_name"], "child_index"=>"0", "value"=>"Sample New Value"
+      response.should redirect_to edit_catalog_path(mock_document.pid, :wf_step=>"publication")
     end
     
     it "should handle complete updates of many fields in many datastreams" do
@@ -88,9 +108,7 @@ describe AssetsController do
     it "should delete the asset identified by pid" do
       mock_obj = mock("asset", :delete)
       mock_obj.expects(:destroy_child_assets).returns([])
-      ActiveFedora::Base.expects(:load_instance_from_solr).at_least_once.with("__PID__").returns(mock_obj)
-      ActiveFedora::ContentModel.expects(:known_models_for).at_least_once.with(mock_obj).returns([ModsAsset])
-      ModsAsset.expects(:load_instance_from_solr).with("__PID__").returns(mock_obj)
+      ActiveFedora::Base.expects(:find).with("__PID__").returns(mock_obj)
       delete(:destroy, :id => "__PID__")
     end
   end
@@ -101,10 +119,7 @@ describe AssetsController do
     it "should withdraw the asset identified by pid" do
       mock_obj = mock("asset", :delete)
       mock_obj.expects(:destroy_child_assets).returns([])
-      ActiveFedora::Base.expects(:load_instance_from_solr).at_least_once.with("__PID__").returns(mock_obj)
-      ActiveFedora::Base
-      ActiveFedora::ContentModel.expects(:known_models_for).at_least_once.with(mock_obj).returns([ModsAsset])
-      ModsAsset.expects(:load_instance_from_solr).with("__PID__").returns(mock_obj)
+      ActiveFedora::Base.expects(:find).with("__PID__").returns(mock_obj)
       delete(:withdraw, :id => "__PID__")
     end
   end

data/test_support/spec/controllers/hydra_controller_spec.rb

@@ -25,9 +25,8 @@ describe HydraControllerTest do
       
       assigns[:document_fedora].class.should == ModsAsset 
       assigns[:document_fedora].pid.should == 'hydrangea:fixture_mods_article1' 
-      assigns[:file_assets].class.should == Solr::Response::Standard
-      assigns[:file_assets].hits.size.should == 1
-      assigns[:file_assets].hits.first["id"].should == "hydrangea:fixture_uploaded_svg1"
+      assigns[:file_assets].size.should == 1
+      assigns[:file_assets].first["id"].should == "hydrangea:fixture_uploaded_svg1"
     end
   end
 end

data/test_support/spec/controllers/permissions_controller_spec.rb

@@ -1,64 +1,20 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-
-# See cucumber tests (ie. /features/edit_document.feature) for more tests, including ones that test the edit method & view
-# You can run the cucumber tests with 
-#
-# cucumber --tags @edit
-# or
-# rake cucumber
-
-describe PermissionsController do
+describe Hydra::PermissionsController do
   describe "create" do
     it "should create a new permissions entry" do
-      stub_solrizer = stub("solrizer", :solrize)
-      Solrizer::Fedora::Solrizer.stubs(:new).returns(stub_solrizer)
-      mock_ds = mock("Datastream")
-      Hydra::RightsMetadata.stubs(:from_xml)
-      Hydra::RightsMetadata.stubs(:new).returns(mock_ds)
-      mock_ds.expects(:permissions).with({"person" => "_person_id_"}, "read")
-      mock_ds.stubs(:content)
-      mock_ds.stubs(:pid=)
-      mock_ds.stubs(:dsid=)
-      mock_ds.stubs(:save)
-      mock_ds.stubs(:serialize!)
-      mock_object = mock("object")
-      mock_object.stubs(:datastreams).returns({"rightsMetadata"=>mock_ds})
-      mock_inner = mock('Mock Inner')
-      mock_object.stubs(:inner_object).returns(mock_inner)
-      
-      ActiveFedora::Base.expects(:load_instance).with("_pid_").returns(mock_object)
-
-      post :create, :asset_id=>"_pid_", :permission => {"actor_id"=>"_person_id_","actor_type"=>"person","access_level"=>"read"}      
+      @asset = ModsAsset.create
+      post :create, :asset_id=>@asset.pid, :permission => {"actor_id"=>"_person_id_","actor_type"=>"person","access_level"=>"read"}      
+      ModsAsset.find(@asset.pid).rightsMetadata.individuals.should == {"_person_id_" => "read"}
     end
   end
   describe "update" do
     it "should call Hydra::RightsMetadata properties setter" do
-      stub_solrizer = stub("solrizer", :solrize)
-      Solrizer::Fedora::Solrizer.stubs(:new).returns(stub_solrizer)
-      mock_ds = mock("Datastream")
-      Hydra::RightsMetadata.stubs(:from_xml)
-      Hydra::RightsMetadata.stubs(:new).returns(mock_ds)
-      mock_ds.expects(:update_permissions).with({"group" => {"_group_id_"=>"discover"}})
-      mock_ds.stubs(:content)
-      mock_ds.stubs(:pid=)
-      mock_ds.stubs(:dsid=)
-      mock_ds.stubs(:serialize!)
-      mock_ds.stubs(:save)
-      mock_object = mock("object")
-      mock_object.stubs(:datastreams).returns({"rightsMetadata"=>mock_ds})
-      mock_inner = mock('Mock Inner')
-      mock_object.stubs(:inner_object).returns(mock_inner)
-      
-      ActiveFedora::Base.expects(:load_instance).with("_pid_").returns(mock_object)
-      # must define new routes that can handle url like this
-      # /assets/_pid_/permissions/group/_group_id_
-      # /assets/:asset_id/permissions/:actor_type/:actor_id
-      
-      # this is what currently works 
-      # post :update, :asset_id=>"_pid_", :actor_type=>"group", :actor_id=>"_group_id_", :permission => {"group"=>"_group_id_","level"=>"discover"}
-      
-      post :update, :asset_id=>"_pid_", :permission => {"group"=>{"_group_id_"=>"discover"}}
+      @asset = ModsAsset.new
+      @asset.rightsMetadata.permissions({:group=>"students"})
+      @asset.save
+      post :update, :asset_id=>@asset.pid, :permission => {"group"=>{"_group_id_"=>"discover"}}
+      ModsAsset.find(@asset.pid).rightsMetadata.groups.should == {"_group_id_" => "discover"}
     end
   end
 end

data/test_support/spec/controllers/user_sessions_controller_spec.rb

@@ -27,9 +27,9 @@ describe UserSessionsController do
   
   it "should redirect to the referer" do
     controller.stubs(:current_user).returns(@user)
-    request.env["HTTP_REFERER"] = file_assets_path
+    request.env["HTTP_REFERER"] = hydra_file_assets_path
     get :superuser
-    response.should redirect_to(file_assets_path)
+    response.should redirect_to(hydra_file_assets_path)
   end
   
-end
+end

data/test_support/spec/factories.rb

@@ -0,0 +1,11 @@
+FactoryGirl.define do
+  sequence :email do |n|
+    "person#{n}@example.com"
+  end
+
+  factory :user do
+    email
+    password 'password'
+  end
+
+end

data/test_support/spec/helpers/blacklight_helper_spec.rb

@@ -13,7 +13,12 @@ describe BlacklightHelper do
   
   describe "Overridden blacklight methods" do
     describe "document_partial_name" do
+
       it "Should lop off everything before the first colin after the slash" do
+    @config = Blacklight::Configuration.new.configure do |config|
+      config.show.display_type = 'has_model_s'
+    end
+        helper.stubs(:blacklight_config).returns(@config)
         helper.document_partial_name('has_model_s' => ["info:fedora/afmodel:Presentation"]).should == "presentations"
         helper.document_partial_name('has_model_s' => ["info:fedora/hull-cModel:genericContent"]).should == "generic_contents" 
       end
@@ -23,7 +28,7 @@ describe BlacklightHelper do
         item = stub("item", :value=>'two', :hits=>9)
 
         ret_val = helper.render_selected_facet_value("one", item)
-        ret_val.should == "<span class=\"selected\">two (9)</span>"
+        ret_val.should == "<span class=\"selected label\">two <span class=\"count\">(9)</span></span>"
         ret_val.should be_html_safe
       end
     end
@@ -37,18 +42,6 @@ describe BlacklightHelper do
         helper.render_head_content.should == "Something extraMy added content"
       end
     end
-    describe "link_to_document" do
-      before(:each)do
-        @mock_doc = mock('mock doc')
-        @mock_doc.expects(:[]).with(:id).returns("123456")
-      end
-      it "passes on the title attribute to the link_to_with_data method" do
-        helper.link_to_document(@mock_doc,:label=>"Some crazy long label...",:title=>"Some crazy longer label").should match(/title=\"Some crazy longer label\"/)
-      end
-      it "doesn't add an erroneous title attribute if one isn't provided" do
-        helper.link_to_document(@mock_doc,:label=>"Some crazy long label...").should_not match(/title=/)
-      end
-    end
     
     describe "link back to catalog" do
       it "should return the view parameter in the link back to catalog method if there is one in the users previous search session" do

data/test_support/spec/helpers/hydra-repository_controller_spec.rb

@@ -27,6 +27,42 @@ describe Hydra::RepositoryController do
     end 
   end
   
+  describe "retrieve_af_model" do
+    it "should return a Model class if the named model has been defined" do
+      result = helper.retrieve_af_model("file_asset")
+      result.should == FileAsset
+      result.superclass.should == ActiveFedora::Base
+      result.included_modules.should include(ActiveFedora::Model) 
+    end
+    
+    it "should accept camel cased OR underscored model name" do
+       result = helper.retrieve_af_model("generic_content")
+       result.should == GenericContent
+        
+       result = helper.retrieve_af_model("GenericContent")
+       result.should == GenericContent
+    
+    end
+    
+    it "should return false if the name is not a real class" do
+       result = helper.retrieve_af_model("foo_foo_class_class")
+       result.should be_false
+    end
+    
+  end
+
+  describe "load_af_instance_from_solr" do
+    it "should return an ActiveFedora object given a valid solr doc same as loading from Fedora" do
+      pid = "hydrangea:fixture_mods_article1"
+      result = ActiveFedora::Base.find_by_solr(pid)
+      solr_doc = result.first 
+      solr_af_obj = helper.load_af_instance_from_solr(solr_doc)
+      fed_af_obj = ActiveFedora::Base.find(pid)
+      #check both inbound and outbound match
+      fed_af_obj.outbound_relationships.to_hash.should == solr_af_obj.outbound_relationships.to_hash
+      fed_af_obj.inbound_relationships.should == solr_af_obj.inbound_relationships
+    end
+  end
   
   
-end
+end

data/test_support/spec/helpers/hydra_assets_helper_spec.rb

@@ -6,14 +6,14 @@ describe HydraAssetsHelper do
   describe "link_to_create_asset" do
     it "should generate login links with redirect params if user is not logged in" do
       helper.expects(:current_user).returns User.new
-      helper.link_to_create_asset("Create a foo", "foo_model").should == "<a href=\"/assets/new?content_type=foo_model\" class=\"create_asset\">Create a foo</a>"
+      helper.link_to_create_asset("Create a foo", "foo_model").should == "<a href=\"/hydra/assets/new?content_type=foo_model\" class=\"create_asset\">Create a foo</a>"
     end
     it "should generate login links with redirect params if user is not logged in" do
       helper.expects(:current_user).returns false
       # rails 3.1.x
       # helper.link_to_create_asset("Create a foo", "foo_model").should == "<a href=\"/users/sign_in?redirect_params%5Baction%5D=new&amp;redirect_params%5Bcontent_type%5D=foo_model&amp;redirect_params%5Bcontroller%5D=assets\" class=\"create_asset\">Create a foo</a>"      
       # rails 3.0.x
-      helper.link_to_create_asset("Create a foo", "foo_model").should == "<a href=\"/users/sign_in?redirect_params[action]=new&amp;redirect_params[content_type]=foo_model&amp;redirect_params[controller]=assets\" class=\"create_asset\">Create a foo</a>"      
+      helper.link_to_create_asset("Create a foo", "foo_model").should == "<a href=\"/users/sign_in?redirect_params%5Baction%5D=new&amp;redirect_params%5Bcontent_type%5D=foo_model&amp;redirect_params%5Bcontroller%5D=assets\" class=\"create_asset\">Create a foo</a>"      
     end
   end
   
@@ -61,86 +61,74 @@ describe HydraAssetsHelper do
   end
 
   describe "get_file_asset_count" do
-    before(:each) do
-      #setup objects for following cases
-      #
-      #outbound has_part
-      #outbound has_part + inbound is_part_of
-      #inbound is_part_of
-      #none      
-      @asset_object4 = ActiveFedora::Base.new
-      @asset_object5 = ActiveFedora::Base.new
-      @asset_object6 = ActiveFedora::Base.new
-      @asset_object7 = ActiveFedora::Base.new
-      @file_object1 = ActiveFedora::Base.new
-      @file_object2 = ActiveFedora::Base.new
-
-
-
-      @asset_object4.add_relationship(:has_part,@file_object1)
-      @asset_object5.save
-      @asset_object5.add_relationship(:has_part,@file_object1)
-      @file_object2.part_of_append(@asset_object5)
-      @asset_object6.save
-      @file_object1.part_of_append(@asset_object6)
-     
-      @file_object1.save
-      @file_object2.save
-      @asset_object4.save
-      @asset_object5.save
-      @asset_object6.save
-      @asset_object7.save
+    describe "with outbound has_part" do
+      before do
+        @asset_object4 =ActiveFedora::Base.new
+        @file_object1 = ActiveFedora::Base.create
+        @asset_object4.add_relationship(:has_part,@file_object1)
+        @asset_object4.save
+      end
+      after do
+        @asset_object4.delete
+        @file_object1.delete
+      end
+      it "should find one" do
+        #outbound has_part
+        doc = ActiveFedora::Base.find_by_solr(@asset_object4.pid).first
+        get_file_asset_count(doc).should == 1
+      end
     end
 
-    after(:each) do
-      begin
-        @asset_object4.delete
-      rescue
+    describe "with has_part and inbound is_part_of" do
+      before do
+        @asset_object5 =ActiveFedora::Base.create
+        @file_object1 = ActiveFedora::Base.create
+        @file_object2 = ActiveFedora::Base.create
+        @file_object2.part_of_append(@asset_object5)
+        @asset_object5.add_relationship(:has_part,@file_object1)
+        @asset_object5.save
+        @file_object2.save
       end
-      begin
+      after do
         @asset_object5.delete
-      rescue
+        @file_object1.delete
+        @file_object2.delete
       end
-      begin
-        @asset_object6.delete
-      rescue
+      it "should find two" do
+        doc = ActiveFedora::Base.find_by_solr(@asset_object5.pid).first
+        get_file_asset_count(doc).should == 2
       end
-      begin
-        @asset_object7.delete
-      rescue
+    end
+
+    describe "with inbound is_part_of" do
+      before do
+        @asset_object6 =ActiveFedora::Base.create
+        @file_object1 = ActiveFedora::Base.create
+        @file_object1.part_of_append(@asset_object6)
+        @asset_object6.save
+        @file_object1.save
       end
-      begin
+      after do
+        @asset_object6.delete
         @file_object1.delete
-      rescue
       end
-      begin
-        @file_object2.delete
-      rescue
+      it "should find one" do
+        doc = ActiveFedora::Base.find_by_solr(@asset_object6.pid).first
+        get_file_asset_count(doc).should == 1
       end
     end
 
-    it "should return the correct number of assets with either has_collection_member file assets or parts" do
-      
-      #cases are
-      #outbound has_part
-      #outbound has_part + inbound is_part_of
-      #inbound is_part_of
-      #none      
-
-
-      result = ActiveFedora::Base.find_by_solr(@asset_object4.pid)
-      doc = result.hits.first
-      get_file_asset_count(doc).should == 1
-      result = ActiveFedora::Base.find_by_solr(@asset_object5.pid)
-      doc = result.hits.first
-      get_file_asset_count(doc).should == 2
-      result = ActiveFedora::Base.find_by_solr(@asset_object6.pid)
-      doc = result.hits.first
-      get_file_asset_count(doc).should == 1
-
-      result = ActiveFedora::Base.find_by_solr(@asset_object7.pid)
-      doc = result.hits.first
-      get_file_asset_count(doc).should == 0
+    describe "with inbound is_part_of" do
+      before do
+        @asset_object7 =ActiveFedora::Base.create
+      end
+      after do
+        @asset_object7.delete
+      end
+      it "should find zero" do
+        doc = ActiveFedora::Base.find_by_solr(@asset_object7.pid).first
+        get_file_asset_count(doc).should == 0
+      end
     end
   end