--- t/10-ldap.t	2008/04/12 10:33:35	84
+++ t/10-ldap.t	2008/05/14 16:50:49	112
@@ -8,7 +8,8 @@
 
 =cut
 
-use Jifty::Test tests => 27;
+use Jifty::Test tests => 29;
+use Data::Dump qw/dump/;
 
 use_ok('A3C::LDAP');
 
@@ -16,6 +17,12 @@
 
 isa_ok( $ldap, 'A3C::LDAP' );
 
+isa_ok( $ldap->objectClass, 'HASH', 'have objectClass' );
+isa_ok( $ldap->link, 'HASH', 'have link' );
+
+diag "objectClass = ",dump( $ldap->objectClass );
+diag "link = ",dump( $ldap->link );
+
 ok(
 	$ldap->search(
 		base	=> 'dc=skole,dc=hr',
@@ -33,11 +40,15 @@
 #	$entry->dump;
 }
 
+my $org_oc = $ldap->objectClass->{organization};
+
 foreach my $limit ( 3, 7, 14 ) {
-	ok( my $collection = $ldap->collection('Organization', limit => $limit), "collection Organization limit = $limit" );
-	isa_ok( $collection, 'A3C::Model::OrganizationCollection' );
+	ok( my $collection = $ldap->collection( $org_oc, limit => $limit), "collection $org_oc limit = $limit" );
+	isa_ok( $collection, "A3C::Model::${org_oc}Collection" );
 	is( $collection->count, $limit, 'count' );
 }
 
-ok( my $coll = $ldap->collection('Person', filter => '(HrEduPersonHomeOrg=aa-test-zz)'), 'collection with filter' );
+my $person_oc = $ldap->objectClass->{person};
+
+ok( my $coll = $ldap->collection( $person_oc, filter => '(HrEduPersonHomeOrg=aa-test-zz)'), 'collection with filter' );
 is( $coll->count, 0, 'no results' );