From 693421b38b25cf570415fbb205a78948c32afeb9 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 26 Mar 2013 16:57:29 +0000
Subject: [PATCH] OPENDJ-832 Leverage the work queue for processing requests received on the HTTP connection handler 

---
 opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java |   37 +++++++++++++++++--------------------
 1 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
index 571a109..81d17a7 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java
@@ -23,47 +23,45 @@
  *
  *
  *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2012 ForgeRock AS
+ *      Portions Copyright 2011-2013 ForgeRock AS
  */
 
 package org.opends.server.replication.plugin;
 
-import org.opends.server.replication.protocol.LDAPUpdateMsg;
 
-import org.opends.server.replication.ReplicationTestCase;
-import org.opends.server.replication.service.ReplicationBroker;
-import org.opends.server.replication.common.ChangeNumber;
-import org.opends.server.replication.protocol.AddMsg;
-import org.opends.server.replication.protocol.ModifyMsg;
 import org.opends.server.TestCaseUtils;
+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.ReplicationTestCase;
+import org.opends.server.replication.common.ChangeNumber;
+import org.opends.server.replication.protocol.AddMsg;
+import org.opends.server.replication.protocol.LDAPUpdateMsg;
+import org.opends.server.replication.protocol.ModifyMsg;
+import org.opends.server.replication.service.ReplicationBroker;
 import org.opends.server.tools.LDAPModify;
-import org.opends.server.types.AbstractOperation;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.AttributeType;
 import org.opends.server.types.Attributes;
 import org.opends.server.types.ByteString;
 import org.opends.server.types.DN;
 import org.opends.server.types.Entry;
-import org.opends.server.types.Attribute;
 import org.opends.server.types.Modification;
 import org.opends.server.types.ModificationType;
-import org.opends.server.types.AttributeType;
+import org.opends.server.types.Operation;
 import org.opends.server.types.ResultCode;
 import org.opends.server.types.SearchResultEntry;
 import org.opends.server.types.SearchScope;
-import org.opends.server.core.DirectoryServer;
-import org.testng.annotations.Test;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
 
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertTrue;
-import static org.testng.Assert.fail;
+import static org.testng.Assert.*;
 import static org.opends.server.TestCaseUtils.*;
 import java.net.ServerSocket;
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.ArrayList;
 import java.util.UUID;
 
 /**
@@ -239,7 +237,6 @@
     after = hist.encodeAndPurge();
     assertTrue(after.isEmpty());
     assertEquals(hist.getLastPurgedValuesCount(),11);
-
   }
 
   /**
@@ -470,7 +467,7 @@
     for (FakeOperation fake : ops)
     {
       LDAPUpdateMsg msg = (LDAPUpdateMsg) fake.generateMessage();
-      AbstractOperation op =
+      Operation op =
         msg.createOperation(InternalClientConnection.getRootConnection());
       op.setInternalOperation(true);
       op.setSynchronizationOperation(true);
@@ -488,7 +485,7 @@
    */
   private void assertFakeOperations(final DN dn1, Entry entry,
       Iterable<FakeOperation> ops, int assertCount) throws Exception
-      {
+  {
     int count = 0;
     for (FakeOperation op : ops)
     {
@@ -512,7 +509,7 @@
         if (count == 1)
         {
           // The first operation should be an ADD operation.
-          assertTrue(false, "FakeAddOperation was not correctly generated"
+          fail("FakeAddOperation was not correctly generated"
               + " from historical information");
         }
       }

--
Gitblit v1.10.0