treequel 1.2.2 → 1.3.0pre384

data/spec/lib/helpers.rb

@@ -12,7 +12,6 @@ BEGIN {
 
 require 'rspec'
 
-require 'yaml'
 require 'treequel'
 
 require 'spec/lib/constants'
@@ -23,10 +22,6 @@ require 'spec/lib/matchers'
 module Treequel::SpecHelpers
 	include Treequel::TestConstants
 
-	SCHEMA_DUMPFILE = Pathname( __FILE__ ).dirname.parent + 'data' + 'schema.yml'
-	SCHEMAHASH      = LDAP::Schema.new( YAML.load_file(SCHEMA_DUMPFILE) )
-	SCHEMA          = Treequel::Schema.new( SCHEMAHASH )
-
 	class ArrayLogger
 		### Create a new ArrayLogger that will append content to +array+.
 		def initialize( array )
@@ -74,8 +69,8 @@ module Treequel::SpecHelpers
 	def setup_logging( level=Logger::FATAL )
 
 		# Turn symbol-style level config into Logger's expected Fixnum level
-		if Treequel::Loggable::LEVEL.key?( level )
-			level = Treequel::Loggable::LEVEL[ level ]
+		if Treequel::LOG_LEVELS.key?( level.to_s )
+			level = Treequel::LOG_LEVELS[ level.to_s ]
 		end
 
 		logger = Logger.new( $stderr )
@@ -98,14 +93,36 @@ module Treequel::SpecHelpers
 	### external data.
 	def get_fixtured_directory( conn )
 		LDAP::SSLConn.stub( :new ).and_return( @conn )
-		conn.stub( :root_dse ).and_return( nil )
+		conn.stub( :search_ext2 ).
+			with( "", 0, "(objectClass=*)", ["+"], false, nil, nil, 0, 0, 0, "", nil ).
+			and_return( TEST_DSE )
 		conn.stub( :set_option )
+
+		# Avoid parsing the whole schema with every example
 		directory = Treequel.directory( TEST_LDAPURI )
 		directory.stub( :schema ).and_return( SCHEMA )
 
 		return directory
 	end
 
+	### Shorthand method for creating LDAP::Mod DELETE objects 
+	def ldap_mod_delete( attribute, *values )
+		return LDAP::Mod.new( LDAP::LDAP_MOD_DELETE, attribute.to_s, values.flatten )
+	end
+
+
+	### Shorthand method for creating LDAP::Mod REPLACE objects 
+	def ldap_mod_replace( attribute, *values )
+		return LDAP::Mod.new( LDAP::LDAP_MOD_REPLACE, attribute.to_s, values.flatten )
+	end
+
+
+	### Shorthand method for creating LDAP::Mod ADD objects 
+	def ldap_mod_add( attribute, *values )
+		return LDAP::Mod.new( LDAP::LDAP_MOD_ADD, attribute.to_s, values.flatten )
+	end
+
+
 end
 
 

data/spec/treequel/branch_spec.rb

@@ -41,7 +41,7 @@ describe Treequel::Branch do
 	end
 
 	before( :each ) do
-		@conn = mock( "ldap connection object" )
+		@conn = mock( "ldap connection object", :bound? => false )
 		@directory = get_fixtured_directory( @conn )
 	end
 
@@ -69,7 +69,8 @@ describe Treequel::Branch do
 		branch = Treequel::Branch.new_from_entry( entry, @directory )
 
 		branch.rdn_attributes.should == { TEST_PERSON_DN_ATTR => [TEST_PERSON_DN_VALUE] }
-		branch.entry.should == entry
+		branch.entry.should == { TEST_PERSON_DN_ATTR => TEST_PERSON_DN_VALUE }
+		branch.dn.should == entry['dn'].first
 	end
 
 	it "can be constructed from an entry with Symbol keys"	do
@@ -81,9 +82,9 @@ describe Treequel::Branch do
 
 		branch.rdn_attributes.should == { TEST_PERSON_DN_ATTR => [TEST_PERSON_DN_VALUE] }
 		branch.entry.should == {
-			'dn'				=> [TEST_PERSON_DN],
 			TEST_PERSON_DN_ATTR => TEST_PERSON_DN_VALUE,
 		}
+		branch.dn.should == entry[:dn].first
 	end
 
 	it "can be instantiated with a Hash with Symbol keys"  do
@@ -232,7 +233,10 @@ describe Treequel::Branch do
 				yielded_val = val
 			end
 			yielded_val.should be_a( Treequel::Branch )
-			yielded_val.entry.should == subentry
+			yielded_val.entry.should == {
+				'objectClass' => ['ipHost'],
+				TEST_HOST_DN_ATTR => [TEST_HOST_DN_VALUE],
+			}
 		end
 
 		it "clears any cached values if its include_operational_attrs attribute is changed" do
@@ -313,6 +317,11 @@ describe Treequel::Branch do
 		end
 
 
+		it "returns nil if a Branch for the base DN is asked for its parent" do
+			@branch.parent.parent.should be_nil()
+		end
+
+
 		it "can construct a Treequel::Branchset that uses it as its base" do
 			@branch.branchset.should be_a( Treequel::Branchset )
 			@branch.branchset.base_dn.should == @branch.dn
@@ -325,6 +334,14 @@ describe Treequel::Branch do
 			branchset.filter_string.should =~ /\(cn=acme\)/
 		end
 
+		it "can create a Treequel::Branchset from itself that returns instances of another class" do
+			otherclass = Class.new( Treequel::Branch )
+			branchset = @branch.as( otherclass )
+
+			branchset.should be_a( Treequel::Branchset )
+			branchset.branch.should be_a( otherclass )
+		end
+
 		it "doesn't restrict the number of arguments passed to #filter (bugfix)" do
 			branchset = @branch.filter( :uid => [:rev, :grumpy, :glee] )
 
@@ -399,7 +416,7 @@ describe Treequel::Branch do
 				and_return([ {'objectClass' => %w[ipHost device ieee802device]} ])
 
 			@branch.must_attributes_hash.
-				should include({ :cn => [''], :ipHostNumber => [''], :objectClass => [:top] })
+				should include({ :cn => [''], :ipHostNumber => [''], :objectClass => ['top'] })
 		end
 
 
@@ -457,7 +474,7 @@ describe Treequel::Branch do
 		it "can return a Hash pre-populated with pairs that correspond to all of its valid " +
 		   "attributes" do
 			@branch.valid_attributes_hash.should == {
-				:objectClass				=> [:top],
+				:objectClass				=> ['top'],
 				:ou							=> [''],
 				:userPassword				=> [],
 				:searchGuide				=> [],
@@ -535,8 +552,7 @@ describe Treequel::Branch do
 			@conn.should_receive( :add ).
 				with( "cn=chillyt,#{TEST_HOSTS_DN}",
 				      "ipHostNumber"=>["127.0.0.1"],
-				      "objectClass"=>["ipHost", "device"],
-				      "cn"=>["chillyt"] )
+				      "objectClass"=>["ipHost", "device"] )
 
 			res = @branch.cn( :chillyt ).create( newattrs )
 			res.should be_a( Treequel::Branch )
@@ -596,6 +612,13 @@ describe Treequel::Branch do
 			@branch.delete( :objectClass => 'apple-user' )
 		end
 
+		it "can delete one particular non-String value of its entry's individual attributes" do
+			mod = LDAP::Mod.new( LDAP::LDAP_MOD_DELETE, 'pwdChangedTime', ['20000101201501Z'] )
+			@conn.should_receive( :modify ).with( TEST_HOSTS_DN, [mod] )
+
+			@branch.delete( :pwdChangedTime => Time.gm(2000,"jan",1,20,15,1) )
+		end
+
 		it "can delete particular values of more than one of its entry's individual attributes" do
 			mod1 = LDAP::Mod.new( LDAP::LDAP_MOD_DELETE, 'objectClass',
 			                      ['apple-user', 'inetOrgPerson'] )
@@ -732,6 +755,17 @@ describe Treequel::Branch do
 				@branch[ :l ].should include( 'Galapagos', 'Antartica' )
 			end
 
+			it "fetches an empty Array if a record doesn't have an attribute set" do
+				@branch[ :cn ].should == []
+			end
+
+			it "fetches an empty Array for an attribute if the entry doesn't exist" do
+				@conn.stub( :search_ext2 ).
+					with( TEST_HOSTS_DN, LDAP::LDAP_SCOPE_BASE, "(objectClass=*)" ).
+					and_return( [] )
+				@branch[ :cn ].should == []
+			end
+
 			it "fetches a single-value attribute as a scalar String" do
 				test_dn = "cn=ssh,cn=www,#{TEST_HOSTS_DN}"
 				entry = {
@@ -754,8 +788,8 @@ describe Treequel::Branch do
 				@branch[ :rev ].should == [ '03eca02ba232' ]
 			end
 
-			it "returns nil if record doesn't have the attribute set" do
-				@branch[ :cn ].should == nil
+			it "returns nil if a record doesn't have a SINGLE-type attribute set" do
+				@branch[ :displayName ].should == nil
 			end
 
 			it "caches the value fetched from its entry" do
@@ -767,6 +801,35 @@ describe Treequel::Branch do
 				2.times { @branch[ :description ] }
 			end
 
+			it "freezes the values fetched from its entry by default to prevent accidental " +
+			   "in-place modification" do
+				@conn.should_receive( :search_ext2 ).
+					with( TEST_HOSTS_DN, LDAP::LDAP_SCOPE_BASE, "(objectClass=*)" ).
+					exactly( :once ).
+					and_return([ @entry ])
+
+				expect {
+					@branch[ :description ] << "Another description"
+				}.to raise_error( /can't modify frozen/i )
+			end
+
+			it "doesn't freeze the values fetched from its entry if it's told not to" do
+				@conn.should_receive( :search_ext2 ).
+					with( TEST_HOSTS_DN, LDAP::LDAP_SCOPE_BASE, "(objectClass=*)" ).
+					exactly( :once ).
+					and_return([ @entry ])
+
+				begin
+					Treequel::Branch.freeze_converted_values = false
+
+					expect {
+						@branch[ :description ] << "Another description"
+					}.to_not raise_error()
+				ensure
+					Treequel::Branch.freeze_converted_values = true
+				end
+			end
+
 			it "converts objects via the conversions set in its directory" do
 				test_dn = "cn=ssh,cn=www,#{TEST_HOSTS_DN}"
 				entry = {

data/spec/treequel/controls/contentsync_spec.rb

@@ -2,7 +2,7 @@
 
 BEGIN {
 	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
+	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
 
 	libdir = basedir + "lib"
 
@@ -12,26 +12,17 @@ BEGIN {
 
 require 'rspec'
 
-require 'spec/lib/constants'
 require 'spec/lib/helpers'
-require 'spec/lib/control_behavior'
 
 require 'treequel'
+require 'treequel/behavior/control'
 require 'treequel/controls/contentsync'
 
-include Treequel::TestConstants
-include Treequel::Constants
 
 #####################################################################
 ###	C O N T E X T S
 #####################################################################
 describe Treequel::ContentSyncControl do
-	include Treequel::SpecHelpers
-
-	before( :each ) do
-		# Used by the shared behavior
-		@control = Treequel::ContentSyncControl
-	end
 
 	it_should_behave_like "A Treequel::Control"
 

data/spec/treequel/controls/pagedresults_spec.rb

@@ -2,7 +2,7 @@
 
 BEGIN {
 	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
+	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
 
 	libdir = basedir + "lib"
 
@@ -12,11 +12,10 @@ BEGIN {
 
 require 'rspec'
 
-require 'spec/lib/constants'
 require 'spec/lib/helpers'
-require 'spec/lib/control_behavior'
 
 require 'treequel'
+require 'treequel/behavior/control'
 require 'treequel/controls/pagedresults'
 
 
@@ -24,19 +23,19 @@ require 'treequel/controls/pagedresults'
 ###	C O N T E X T S
 #####################################################################
 describe Treequel::PagedResultsControl do
-	include Treequel::SpecHelpers
 
 	before( :all ) do
 		setup_logging( :fatal )
 	end
 
 	before( :each ) do
-		@branch = mock( "Branch", :dn => 'cn=example,dc=acme,dc=com' )
-		@directory = mock( "Directory" )
+		@conn = mock( "ldap connection object" )
+		@conn.stub( :bound? ).and_return( false )
+		@directory = get_fixtured_directory( @conn )
+		@directory.register_controls( Treequel::PagedResultsControl )
 
-		@branch.stub( :directory ).and_return( @directory )
-		@directory.stub( :registered_controls ).and_return([ Treequel::PagedResultsControl ])
-		@branchset = Treequel::Branchset.new( @branch )
+		@branch = Treequel::Branch.new( @directory, TEST_PEOPLE_DN )
+		@branchset = @branch.branchset
 	end
 
 	after( :all ) do
@@ -80,6 +79,23 @@ describe Treequel::PagedResultsControl do
 		paged_branchset.paged_results_setsize.should == nil
 	end
 
+	it "knows that there are (potentially) more paged results if the cookie isn't set" do
+		paged_branchset = @branchset.with_paged_results( 25 )
+		paged_branchset.should_not be_done_paging()
+	end
+
+	it "knows that there are more paged results if the cookie is set" do
+		paged_branchset = @branchset.with_paged_results( 25 )
+		paged_branchset.paged_results_cookie = "\230\t\000\000\000\000\000\000"
+		paged_branchset.should_not be_done_paging()
+	end
+
+	it "knows that there are no more paged results if the cookie is blank" do
+		paged_branchset = @branchset.with_paged_results( 25 )
+		paged_branchset.paged_results_cookie = ''
+		paged_branchset.should be_done_paging()
+	end
+
 	it "injects the correct server-control structure into the search when iterating" do
 		oid = Treequel::PagedResultsControl::OID
 		expected_asn1_string = "0\005\002\001\031\004\000"

data/spec/treequel/controls/sortedresults_spec.rb

@@ -2,7 +2,7 @@
 
 BEGIN {
 	require 'pathname'
-	basedir = Pathname.new( __FILE__ ).dirname.parent.parent
+	basedir = Pathname.new( __FILE__ ).dirname.parent.parent.parent
 
 	libdir = basedir + "lib"
 
@@ -12,12 +12,11 @@ BEGIN {
 
 require 'rspec'
 
-require 'spec/lib/constants'
 require 'spec/lib/helpers'
-require 'spec/lib/control_behavior'
 
 require 'treequel'
 require 'treequel/branchset'
+require 'treequel/behavior/control'
 require 'treequel/controls/sortedresults'
 
 
@@ -25,20 +24,19 @@ require 'treequel/controls/sortedresults'
 ###	C O N T E X T S
 #####################################################################
 describe Treequel::SortedResultsControl do
-	include Treequel::SpecHelpers
 
 	before( :all ) do
 		setup_logging( :fatal )
 	end
 
 	before( :each ) do
-		@branch = mock( "Branch", :dn => 'cn=example,dc=acme,dc=com' )
-		@directory = mock( "Directory" )
-
-		@branch.stub( :directory ).and_return( @directory )
-		@directory.stub( :registered_controls ).and_return([ Treequel::SortedResultsControl ])
-		@branchset = Treequel::Branchset.new( @branch )
+		@conn = mock( "ldap connection object" )
+		@conn.stub( :bound? ).and_return( false )
+		@directory = get_fixtured_directory( @conn )
+		@directory.register_controls( Treequel::SortedResultsControl )
 
+		@branch = Treequel::Branch.new( @directory, TEST_PEOPLE_DN )
+		@branchset = @branch.branchset
 	end
 
 	after( :all ) do

data/spec/treequel/directory_spec.rb

@@ -46,17 +46,22 @@ describe Treequel::Directory do
 		}
 		@conn = mock( "LDAP connection", :set_option => true, :bound? => false )
 		LDAP::SSLConn.stub( :new ).and_return( @conn )
-		@conn.stub( :root_dse ).and_return( nil )
+
+		@conn.stub( :schema ).and_return( SCHEMAHASH )
 	end
 
 
 	it "is created with reasonable default options if none are specified" do
+		@conn.stub( :search_ext2 ).
+			with( "", 0, "(objectClass=*)", ["+"], false, nil, nil, 0, 0, 0, "", nil ).
+			and_return( TEST_DSE )
+
 		dir = Treequel::Directory.new
 
 		dir.host.should == 'localhost'
 		dir.port.should == 389
 		dir.connect_type.should == :tls
-		dir.base_dn.should == ''
+		dir.base_dn.should == 'dc=acme,dc=com'
 	end
 
 	it "is created with the specified options if options are specified" do
@@ -80,36 +85,37 @@ describe Treequel::Directory do
 	end
 
 	it "uses the first namingContext from the Root DSE if no base is specified" do
-		conn = mock( "LDAP connection", :set_option => true )
-		LDAP::Conn.stub( :new ).and_return( conn )
-		conn.should_receive( :root_dse ).and_return( TEST_DSE )
+		LDAP::Conn.stub( :new ).and_return( @conn )
+		@conn.stub( :search_ext2 ).
+			with( "", 0, "(objectClass=*)", ["+"], false, nil, nil, 0, 0, 0, "", nil ).
+			and_return( TEST_DSE )
 
-		@dir = Treequel::Directory.new( @options.merge(:base_dn => nil) )
-		@dir.base_dn.should == TEST_BASE_DN
+		dir = Treequel::Directory.new( @options.merge(:base_dn => nil) )
+		dir.base_dn.should == TEST_BASE_DN
 	end
 
 	it "can return its root element as a Branch instance" do
-		@dir = Treequel::Directory.new( @options )
-		@dir.base.should be_a( Treequel::Branch )
-		@dir.base.dn.should == TEST_BASE_DN
+		dir = Treequel::Directory.new( @options )
+		dir.base.should be_a( Treequel::Branch )
+		dir.base.dn.should == TEST_BASE_DN
 	end
 
 	it "can return its root element as an instance of its results class if it's been set" do
 		subtype = Class.new( Treequel::Branch )
-		@dir = Treequel::Directory.new( @options )
+		dir = Treequel::Directory.new( @options )
 
-		@dir.results_class = subtype
+		dir.results_class = subtype
 
-		@dir.base.should be_a( subtype )
-		@dir.base.dn.should == TEST_BASE_DN
+		dir.base.should be_a( subtype )
+		dir.base.dn.should == TEST_BASE_DN
 	end
 
 
 	describe "instances without existing connections" do
 
 		before( :each ) do
+			@conn = mock( "ldap connection", :bound? => false, :set_option => true )
 			@dir = Treequel::Directory.new( @options )
-			@conn = mock( "ldap connection", :set_option => true )
 		end
 
 
@@ -344,6 +350,35 @@ describe Treequel::Directory do
 			}.to raise_error( LDAP::ResultError, /can't contact/i )
 		end
 
+
+		it "can reconnect if its underlying connection goes away" do
+			@conn.stub( :search_ext2 ).and_raise( LDAP::ResultError.new("Can't contact LDAP server") )
+
+			second_conn = mock( "LDAP connection", :set_option => true, :bound? => false )
+			LDAP::Conn.should_receive( :new ).and_return( second_conn )
+			second_conn.should_receive( :search_ext2 ).and_return([])
+
+			already_tried_reconnect = false
+			begin
+				@dir.search( TEST_PEOPLE_DN, :base, '(objectClass=*)' )
+			rescue
+				unless already_tried_reconnect
+					already_tried_reconnect = true
+					@dir.reconnect and retry
+				end
+			end
+		end
+
+		it "re-raises an exception rescued during a reconnect as a RuntimeError" do
+			LDAP::Conn.should_receive( :new ).
+				and_raise( LDAP::ResultError.new("Can't contact LDAP server") )
+
+			expect {
+				@dir.reconnect
+			}.to raise_exception( RuntimeError, /couldn't reconnect/i )
+		end
+
+
 		describe "and a custom search results class" do
 
 			before( :each ) do
@@ -482,63 +517,31 @@ describe Treequel::Directory do
 				:desc => 'Audi like Jetta',
 				:objectClass => :room,
 			}
-			rdn_attrs = {
-				TEST_PERSON_DN_ATTR => [TEST_PERSON_DN_VALUE]
-			}
-			addattrs = {
+
+			branch = Treequel::Branch.new( @directory, TEST_PERSON_DN, newattrs )
+
+			@conn.should_receive( :add ).with( TEST_PERSON_DN, {
 				'cn' => ['Chilly T'],
 				'desc' => ['Audi like Jetta'],
 				'objectClass' => ['room'],
-				TEST_PERSON_DN_ATTR => [TEST_PERSON_DN_VALUE],
-			}
-
-			branch = mock( "new person branch" )
-			branch.should_receive( :dn ).and_return( TEST_PERSON_DN )
-			branch.should_receive( :rdn_attributes ).at_least( :once ).and_return( rdn_attrs )
-
-			room_objectclass = stub( 'room objectClass', :structural? => true )
-			@schema.should_receive( :object_classes ).at_least( :once ).and_return({ 
-				:room => room_objectclass,
 			})
 
-			@conn.should_receive( :add ).with( TEST_PERSON_DN, addattrs )
-
 			@dir.create( branch, newattrs )
 		end
 
 
-		it "doesn't include duplicates when smushing RDN attributes" do
-			newattrs = {
-				TEST_PERSON_DN_ATTR => [TEST_PERSON_DN_VALUE],
-				:cn => 'Chilly T',
-				:desc => 'Audi like Jetta',
-				:objectClass => :room,
-			}
-			rdn_attrs = {
-				TEST_PERSON_DN_ATTR => [TEST_PERSON_DN_VALUE]
-			}
-			addattrs = {
-				'cn' => ['Chilly T'],
-				'desc' => ['Audi like Jetta'],
-				'objectClass' => ['room'],
-				TEST_PERSON_DN_ATTR => [TEST_PERSON_DN_VALUE],
-			}
-
-			branch = mock( "new person branch" )
-			branch.should_receive( :dn ).and_return( TEST_PERSON_DN )
-			branch.should_receive( :rdn_attributes ).at_least( :once ).and_return( rdn_attrs )
-
-			room_objectclass = stub( 'room objectClass', :structural? => true )
-			@schema.should_receive( :object_classes ).at_least( :once ).and_return({ 
-				:room => room_objectclass,
-			})
+		it "can create an entry with a DN and LDAP::Mod objects instead of an attribute hash" do
+			mods = [
+				ldap_mod_add( :cn, 'Chilly T' ),
+				ldap_mod_add( :desc, 'Audi like Jetta' ),
+				ldap_mod_add( :objectClass, 'room' ),
+			]
 
-			@conn.should_receive( :add ).with( TEST_PERSON_DN, addattrs )
+			@conn.should_receive( :add ).with( TEST_PERSON_DN, mods )
 
-			@dir.create( branch, newattrs )
+			@dir.create( TEST_PERSON_DN, mods )
 		end
 
-
 		it "can move a record to a new dn within the same branch" do
 			@dir.stub( :bound? ).and_return( false )
 			branch = mock( "sibling branch obj" )
@@ -596,7 +599,9 @@ describe Treequel::Directory do
 		describe "to a server that supports controls introspection" do
 			before( :each ) do
 				@control = Module.new { include Treequel::Control }
-				@conn.should_receive( :root_dse ).and_return( TEST_DSE )
+				@conn.stub( :search_ext2 ).
+					with( "", 0, "(objectClass=*)", ["+"], false, nil, nil, 0, 0, 0, "", nil ).
+					and_return( TEST_DSE )
 			end
 
 
@@ -635,7 +640,9 @@ describe Treequel::Directory do
 
 		describe "to a server that supports extensions introspection" do
 			before( :each ) do
-				@conn.should_receive( :root_dse ).and_return( TEST_DSE )
+				@conn.stub( :search_ext2 ).
+					with( "", 0, "(objectClass=*)", ["+"], false, nil, nil, 0, 0, 0, "", nil ).
+					and_return( TEST_DSE )
 			end
 
 
@@ -653,7 +660,9 @@ describe Treequel::Directory do
 
 		describe "to a server that supports features introspection" do
 			before( :each ) do
-				@conn.should_receive( :root_dse ).and_return( TEST_DSE )
+				@conn.stub( :search_ext2 ).
+					with( "", 0, "(objectClass=*)", ["+"], false, nil, nil, 0, 0, 0, "", nil ).
+					and_return( TEST_DSE )
 			end
 
 
@@ -670,7 +679,9 @@ describe Treequel::Directory do
 
 		describe "to a server that doesn't support features introspection" do
 			before( :each ) do
-				@conn.should_receive( :root_dse ).and_return( TEST_DSE )
+				@conn.stub( :search_ext2 ).
+					with( "", 0, "(objectClass=*)", ["+"], false, nil, nil, 0, 0, 0, "", nil ).
+					and_return( TEST_DSE )
 			end