From dfbe880eb338a1d752ce790f689b5133761d7079 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 26 Sep 2013 07:35:55 +0000
Subject: [PATCH] OPENDJ-1116 Introduce abstraction for the changelog DB
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 936dc0d..4bd1af6 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
@@ -27,8 +27,10 @@
*/
package org.opends.server.replication.plugin;
-import static org.opends.server.TestCaseUtils.*;
-import static org.testng.Assert.*;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.UUID;
import org.opends.server.TestCaseUtils;
import org.opends.server.core.DirectoryServer;
@@ -46,10 +48,8 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.UUID;
+import static org.opends.server.TestCaseUtils.*;
+import static org.testng.Assert.*;
/**
* Tests the Historical class.
@@ -234,7 +234,7 @@
{
final DN dn1 = DN.decode("cn=test1," + TEST_ROOT_DN_STRING);
final DN dn2 = DN.decode("cn=test2," + TEST_ROOT_DN_STRING);
- final DN baseDn = DN.decode(TEST_ROOT_DN_STRING);
+ final DN baseDN = DN.decode(TEST_ROOT_DN_STRING);
final AttributeType attrType =
DirectoryServer.getAttributeType("displayname");
final AttributeType entryuuidType =
@@ -245,7 +245,7 @@
* This must use a different serverId to that of the directory server.
*/
ReplicationBroker broker =
- openReplicationSession(baseDn, 2, 100, replServerPort, 1000, true);
+ openReplicationSession(baseDN, 2, 100, replServerPort, 1000, true);
// Clear the backend and create top entrye
@@ -475,10 +475,10 @@
FakeAddOperation addOp = (FakeAddOperation) op;
assertTrue(addOp.getCSN() != null);
AddMsg addmsg = addOp.generateMessage();
- assertTrue(dn1.equals(DN.decode(addmsg.getDn())));
- assertTrue(addmsg.getEntryUUID().equals(EntryHistorical.getEntryUUID(entry)));
+ assertEquals(dn1, addmsg.getDN());
+ assertEquals(addmsg.getEntryUUID(), EntryHistorical.getEntryUUID(entry));
String parentId = LDAPReplicationDomain.findEntryUUID(dn1.getParent());
- assertTrue(addmsg.getParentEntryUUID().equals(parentId));
+ assertEquals(addmsg.getParentEntryUUID(), parentId);
addmsg.createOperation(InternalClientConnection.getRootConnection());
}
else if (count == 1)
--
Gitblit v1.10.0