From fbda6e0892dcfcc8dd43d21f6fb134aabb8d0cac Mon Sep 17 00:00:00 2001
From: jarnou <jarnou@localhost>
Date: Tue, 03 Jul 2007 09:29:17 +0000
Subject: [PATCH] Commits the refactoring of the core server to provide support for proxy/distribution/virtual functionnalities. This includes the new set of local operations, as well as the workflow and networkgroup support.

---
 opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java |   41 +++++++++++++++++++----------------------
 1 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
index dfaa5eb..7ab93ba 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
@@ -31,52 +31,50 @@
 import static org.opends.server.loggers.ErrorLogger.logError;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.fail;
 import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
 
 import java.net.SocketException;
 import java.util.ArrayList;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
-import java.util.NoSuchElementException;
 import java.util.List;
+import java.util.NoSuchElementException;
 import java.util.concurrent.locks.Lock;
 
 import org.opends.server.DirectoryServerTestCase;
 import org.opends.server.TestCaseUtils;
-import org.opends.server.replication.common.ServerState;
-import org.opends.server.replication.plugin.ReplicationBroker;
-import org.opends.server.replication.plugin.ReplicationDomain;
-import org.opends.server.replication.plugin.PersistentServerState;
-import org.opends.server.schema.DirectoryStringSyntax;
-import org.opends.server.schema.IntegerSyntax;
 import org.opends.server.backends.task.TaskState;
 import org.opends.server.core.AddOperation;
-import org.opends.server.core.DeleteOperation;
+import org.opends.server.core.DeleteOperationBasis;
 import org.opends.server.core.DirectoryServer;
 import org.opends.server.protocols.internal.InternalClientConnection;
 import org.opends.server.protocols.internal.InternalSearchOperation;
 import org.opends.server.protocols.ldap.LDAPFilter;
+import org.opends.server.replication.common.ServerState;
+import org.opends.server.replication.plugin.PersistentServerState;
+import org.opends.server.replication.plugin.ReplicationBroker;
+import org.opends.server.schema.DirectoryStringSyntax;
+import org.opends.server.schema.IntegerSyntax;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeType;
+import org.opends.server.types.AttributeValue;
+import org.opends.server.types.ByteStringFactory;
 import org.opends.server.types.DN;
 import org.opends.server.types.Entry;
-import org.opends.server.types.ByteStringFactory;
 import org.opends.server.types.ErrorLogCategory;
 import org.opends.server.types.ErrorLogSeverity;
+import org.opends.server.types.LockManager;
 import org.opends.server.types.Modification;
 import org.opends.server.types.ModificationType;
 import org.opends.server.types.ResultCode;
 import org.opends.server.types.SearchFilter;
-import org.opends.server.types.SearchScope;
 import org.opends.server.types.SearchResultEntry;
-import org.opends.server.types.AttributeType;
-import org.opends.server.types.LockManager;
-import org.opends.server.types.Attribute;
-import org.opends.server.types.AttributeValue;
+import org.opends.server.types.SearchScope;
 import org.opends.server.util.TimeThread;
 import org.testng.annotations.AfterClass;
-import org.testng.annotations.Test;
-
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
 
 /**
  * An abstract class that all Replication unit test should extend.
@@ -254,7 +252,7 @@
         ErrorLogSeverity.NOTICE,
         "ReplicationTestCase/Cleaning config entries" , 1);
 
-    DeleteOperation op;
+    DeleteOperationBasis op;
     // Delete entries
     try
     {
@@ -265,10 +263,9 @@
             ErrorLogSeverity.NOTICE,
             "cleaning config entry " + dn, 1);
 
-        op = new DeleteOperation(connection, InternalClientConnection
+        op = new DeleteOperationBasis(connection, InternalClientConnection
             .nextOperationID(), InternalClientConnection.nextMessageID(), null,
             dn);
-
         op.run();
       }
     }
@@ -286,7 +283,7 @@
         ErrorLogSeverity.NOTICE,
         "ReplicationTestCase/Cleaning entries" , 1);
 
-    DeleteOperation op;
+    DeleteOperationBasis op;
     // Delete entries
     try
     {
@@ -297,7 +294,7 @@
             ErrorLogSeverity.NOTICE,
             "cleaning entry " + dn, 1);
 
-        op = new DeleteOperation(connection, InternalClientConnection
+        op = new DeleteOperationBasis(connection, InternalClientConnection
             .nextOperationID(), InternalClientConnection.nextMessageID(), null,
             dn);
 

--
Gitblit v1.10.0