directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1708534 - in /directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn: DIRSERVER_1974_IT.java ModifyRdnIT.java
Date Tue, 13 Oct 2015 22:34:15 GMT
Author: elecharny
Date: Tue Oct 13 22:34:14 2015
New Revision: 1708534

URL: http://svn.apache.org/viewvc?rev=1708534&view=rev
Log:
Fixed two failing tests

Modified:
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/DIRSERVER_1974_IT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/DIRSERVER_1974_IT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/DIRSERVER_1974_IT.java?rev=1708534&r1=1708533&r2=1708534&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/DIRSERVER_1974_IT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/DIRSERVER_1974_IT.java
Tue Oct 13 22:34:14 2015
@@ -205,7 +205,7 @@ public class DIRSERVER_1974_IT extends A
             assertNotNull( found );
             Rdn foundRdn = found.getDn().getRdn();
             assertEquals( "uid", foundRdn.getType() );
-            assertEquals( oldUid, foundRdn.getValue().getString() );
+            assertEquals( oldUid, foundRdn.getValue() );
 
             template.execute(
                     new ConnectionCallback<Void>() {
@@ -225,7 +225,7 @@ public class DIRSERVER_1974_IT extends A
             assertNotNull( found );
             foundRdn = found.getDn().getRdn();
             assertEquals( "uid", foundRdn.getType() );
-            assertEquals( newUid, foundRdn.getValue().getString() );
+            assertEquals( newUid, foundRdn.getValue() );
 
             template.delete( newDn );
         }
@@ -328,7 +328,7 @@ public class DIRSERVER_1974_IT extends A
                 assertNotNull( found );
                 Rdn foundRdn = found.getDn().getRdn();
                 assertEquals( "uid", foundRdn.getType() );
-                assertEquals( newUid, foundRdn.getValue().getString() );
+                assertEquals( newUid, foundRdn.getValue() );
         
                 // Remove entry (use new rdn)
                 connection.delete( newDn );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java?rev=1708534&r1=1708533&r2=1708534&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java
Tue Oct 13 22:34:14 2015
@@ -41,6 +41,8 @@ import javax.naming.directory.SearchResu
 import org.apache.directory.api.ldap.model.entry.DefaultEntry;
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.ldif.LdifUtils;
+import org.apache.directory.api.ldap.model.message.SearchScope;
+import org.apache.directory.api.ldap.model.name.Rdn;
 import org.apache.directory.api.util.Strings;
 import org.apache.directory.ldap.client.api.LdapConnection;
 import org.apache.directory.server.annotations.CreateLdapServer;
@@ -177,13 +179,11 @@ public class ModifyRdnIT extends Abstrac
 
 
     /**
-<<<<<<<
-     * Modify Rdn of an entry, without deleting its old rdn value.
-=======
      * Modify Rdn of an entry, delete its old rdn value and search before and
      * after rename.
      */
-    @Ignore
+    //@Ignore
+    @Test
     public void testModifyRdnAndDeleteOldWithSearchInBetween() throws Exception
     {
         LdapConnection connection = ServerIntegrationUtils.getAdminConnection( getLdapServer()
);
@@ -262,7 +262,7 @@ public class ModifyRdnIT extends Abstrac
         assertNotNull( found );
         foundRdn = found.getDn().getRdn();
         assertEquals( "cn", foundRdn.getType() );
-        assertEquals( oldCn, foundRdn.getValue() );
+        assertEquals( newCn, foundRdn.getValue() );
 
         // Remove entry (use new rdn)
         connection.delete( newDn );
@@ -270,7 +270,6 @@ public class ModifyRdnIT extends Abstrac
 
 
     /**
->>>>>>>
      * Modify Rdn of an entry, without deleting its old rdn value.
      * 
      * The JNDI property is set with 'False'



Mime
View raw message