From 8aaa16f43f88550cbe7a8a2ddad12a917e845488 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Thu, 05 Jul 2007 05:56:48 +0000
Subject: [PATCH] Update the server processing for the LDAP no-op control so that it uses a nonzero result code.  For now, we're using a result code of 16654 (0x410e, which is what OpenLDAP uses).  If a new specification is released with an official OID and result code, then we'll use them.

---
 opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
index 9ccb68d..94368c0 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/tools/LDAPModifyTestCase.java
@@ -40,6 +40,7 @@
 import org.opends.server.core.AddOperation;
 import org.opends.server.core.DirectoryServer;
 import org.opends.server.protocols.internal.InternalClientConnection;
+import org.opends.server.protocols.ldap.LDAPResultCode;
 import org.opends.server.types.Entry;
 import org.opends.server.types.ResultCode;
 
@@ -988,7 +989,8 @@
       "-f", modifyFilePath
     };
 
-    assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
+    assertEquals(LDAPModify.mainModify(args, false, null, System.err),
+                 LDAPResultCode.NO_OPERATION);
   }
 
 
@@ -1015,7 +1017,8 @@
       "-f", modifyFilePath
     };
 
-    assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
+    assertEquals(LDAPModify.mainModify(args, false, null, System.err),
+                 LDAPResultCode.NO_OPERATION);
   }
 
 
@@ -1048,7 +1051,8 @@
       "-f", path
     };
 
-    assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
+    assertEquals(LDAPModify.mainModify(args, false, null, System.err),
+                 LDAPResultCode.NO_OPERATION);
   }
 
 
@@ -1082,7 +1086,8 @@
       "-f", path
     };
 
-    assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
+    assertEquals(LDAPModify.mainModify(args, false, null, System.err),
+                 LDAPResultCode.NO_OPERATION);
   }
 
 
@@ -1112,7 +1117,8 @@
       "-f", path
     };
 
-    assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
+    assertEquals(LDAPModify.mainModify(args, false, null, System.err),
+                 LDAPResultCode.NO_OPERATION);
   }
 
 
@@ -1143,7 +1149,8 @@
       "-f", path
     };
 
-    assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
+    assertEquals(LDAPModify.mainModify(args, false, null, System.err),
+                 LDAPResultCode.NO_OPERATION);
   }
 
 
@@ -1188,7 +1195,8 @@
       "-f", path
     };
 
-    assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
+    assertEquals(LDAPModify.mainModify(args, false, null, System.err),
+                 LDAPResultCode.NO_OPERATION);
   }
 
 
@@ -1234,7 +1242,8 @@
       "-f", path
     };
 
-    assertEquals(LDAPModify.mainModify(args, false, null, System.err), 0);
+    assertEquals(LDAPModify.mainModify(args, false, null, System.err),
+                 LDAPResultCode.NO_OPERATION);
   }
 
 

--
Gitblit v1.10.0