directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r499511 - in /directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server: AddITest.java BinarySearchTest.java ReferralTest.java SearchTest.java
Date Wed, 24 Jan 2007 18:31:09 GMT
Author: elecharny
Date: Wed Jan 24 10:31:09 2007
New Revision: 499511

URL: http://svn.apache.org/viewvc?view=rev&rev=499511
Log:
Porting fix from ADS 1.0.1 to 1.5 : fixing DIRSERVER-758 and some problems with referrals.

Modified:
    directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/AddITest.java
    directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/BinarySearchTest.java
    directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/ReferralTest.java
    directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/SearchTest.java

Modified: directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/AddITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/AddITest.java?view=diff&rev=499511&r1=499510&r2=499511
==============================================================================
--- directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/AddITest.java
(original)
+++ directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/AddITest.java
Wed Jan 24 10:31:09 2007
@@ -389,6 +389,7 @@
         Attributes alias = new AttributesImpl();
         Attribute aliasOcls = new AttributeImpl( "objectclass" );
         aliasOcls.add( "top" );
+        aliasOcls.add( "organizationalUnit" );
         aliasOcls.add( "alias" );
         alias.put( aliasOcls );
         alias.put( "ou", "bestFruit" );
@@ -434,6 +435,7 @@
         Attributes alias = new AttributesImpl();
         Attribute aliasOcls = new AttributeImpl( "objectclass" );
         aliasOcls.add( "top" );
+        aliasOcls.add( "organizationalUnit" );
         aliasOcls.add( "alias" );
         alias.put( aliasOcls );
         alias.put( "ou", "bestFruit" );

Modified: directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/BinarySearchTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/BinarySearchTest.java?view=diff&rev=499511&r1=499510&r2=499511
==============================================================================
--- directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/BinarySearchTest.java
(original)
+++ directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/BinarySearchTest.java
Wed Jan 24 10:31:09 2007
@@ -105,6 +105,9 @@
         
         // First let's add a some binary data representing a userCertificate
         Attributes attrs = getPersonAttributes( "Bush", "Kate Bush" );
+        Attribute objectClasses = attrs.get( "objectClass" );
+        objectClasses.add( "strongAuthenticationUser" );
+
         attrs.put( "userCertificate", certData );
         ctx.createSubcontext( "cn=Kate Bush", attrs );
         

Modified: directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/ReferralTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/ReferralTest.java?view=diff&rev=499511&r1=499510&r2=499511
==============================================================================
--- directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/ReferralTest.java
(original)
+++ directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/ReferralTest.java
Wed Jan 24 10:31:09 2007
@@ -173,7 +173,7 @@
     {
         assertEquals( "ldap://fermi:10389", e.getReferralInfo() );
         assertTrue( e.skipReferral() );
-        assertEquals( "ldap://hertz:10389/cn=alex karasulu,ou=apache,ou=users,dc=example,dc=com",
e.getReferralInfo() );
+        assertEquals( "ldap://hertz:10389/cn=alex%20karasulu,ou=apache,ou=users,dc=example,dc=com",
e.getReferralInfo() );
         assertTrue( e.skipReferral() );
         assertEquals( "ldap://maxwell:10389", e.getReferralInfo() );
         assertFalse( e.skipReferral() );
@@ -184,7 +184,7 @@
     {
         assertEquals( "ldap://fermi:10389", e.getReferralInfo() );
         assertTrue( e.skipReferral() );
-        assertEquals( "ldap://hertz:10389/cn=alex karasulu,ou=users,dc=example,dc=com", e.getReferralInfo()
);
+        assertEquals( "ldap://hertz:10389/cn=alex%20karasulu,ou=users,dc=example,dc=com",
e.getReferralInfo() );
         assertTrue( e.skipReferral() );
         assertEquals( "ldap://maxwell:10389", e.getReferralInfo() );
         assertFalse( e.skipReferral() );
@@ -827,11 +827,11 @@
         }
         catch ( ReferralException e )
         {
-            assertEquals( "ldap://fermi:10389/cn=alex karasulu,ou=users,ou=system??base",
e.getReferralInfo() );
+            assertEquals( "ldap://fermi:10389/cn=alex%20karasulu,ou=users,ou=system??base",
e.getReferralInfo() );
             assertTrue( e.skipReferral() );
-            assertEquals( "ldap://hertz:10389/cn=alex karasulu,ou=users,dc=example,dc=com??base",
e.getReferralInfo() );
+            assertEquals( "ldap://hertz:10389/cn=alex%20karasulu,ou=users,dc=example,dc=com??base",
e.getReferralInfo() );
             assertTrue( e.skipReferral() );
-            assertEquals( "ldap://maxwell:10389/cn=alex karasulu,ou=users,ou=system??base",
e.getReferralInfo() );
+            assertEquals( "ldap://maxwell:10389/cn=alex%20karasulu,ou=users,ou=system??base",
e.getReferralInfo() );
             assertFalse( e.skipReferral() );
         }
     }
@@ -848,12 +848,12 @@
         }
         catch ( ReferralException e )
         {
-            assertEquals( "ldap://fermi:10389/cn=alex karasulu,ou=apache,ou=users,ou=system??base",
e.getReferralInfo() );
+            assertEquals( "ldap://fermi:10389/cn=alex%20karasulu,ou=apache,ou=users,ou=system??base",
e.getReferralInfo() );
             assertTrue( e.skipReferral() );
-            assertEquals( "ldap://hertz:10389/cn=alex karasulu,ou=apache,ou=users,dc=example,dc=com??base",
e
+            assertEquals( "ldap://hertz:10389/cn=alex%20karasulu,ou=apache,ou=users,dc=example,dc=com??base",
e
                 .getReferralInfo() );
             assertTrue( e.skipReferral() );
-            assertEquals( "ldap://maxwell:10389/cn=alex karasulu,ou=apache,ou=users,ou=system??base",
e
+            assertEquals( "ldap://maxwell:10389/cn=alex%20karasulu,ou=apache,ou=users,ou=system??base",
e
                 .getReferralInfo() );
             assertFalse( e.skipReferral() );
         }

Modified: directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/SearchTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/SearchTest.java?view=diff&rev=499511&r1=499510&r2=499511
==============================================================================
--- directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/SearchTest.java
(original)
+++ directory/apacheds/trunk/server-unit/src/test/java/org/apache/directory/server/SearchTest.java
Wed Jan 24 10:31:09 2007
@@ -116,6 +116,8 @@
         Attribute attribute = new AttributeImpl( "objectClass" );
         attribute.add( "top" );
         attribute.add( "person" );
+        attribute.add( "organizationalPerson" );
+        attribute.add( "inetOrgPerson" );
         attributes.put( attribute );
         attributes.put( "cn", cn );
         attributes.put( "sn", sn );
@@ -567,7 +569,7 @@
             assertNotNull( loadedOcls );
             assertTrue( loadedOcls.contains( "top" ) );
             assertTrue( loadedOcls.contains( "person" ) );
-            assertTrue( loadedOcls.contains( "organizationalperson" ) );
+            assertTrue( loadedOcls.contains( "organizationalPerson" ) );
 
         }
         else



Mime
View raw message