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/SchemaReplicationTest.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
index 28e5971..ff51088 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/SchemaReplicationTest.java
@@ -121,10 +121,10 @@
 
     cleanUpReplicationServersDB();
 
-    final DN baseDn = DN.decode("cn=schema");
+    final DN baseDN = DN.decode("cn=schema");
 
     ReplicationBroker broker =
-      openReplicationSession(baseDn,  2, 100, replServerPort, 5000, true);
+      openReplicationSession(baseDN, 2, 100, replServerPort, 5000, true);
 
     try
     {
@@ -136,7 +136,7 @@
       mods.add(mod);
       ModifyOperationBasis modOp = new ModifyOperationBasis(connection,
           InternalClientConnection.nextOperationID(), InternalClientConnection
-          .nextMessageID(), null, baseDn, mods);
+          .nextMessageID(), null, baseDN, mods);
       modOp.setInternalOperation(true);
       modOp.run();
 
@@ -152,7 +152,7 @@
       ModifyMsg modMsg = (ModifyMsg) msg;
 
       Operation receivedOp = modMsg.createOperation(connection);
-      assertTrue(DN.decode(modMsg.getDn()).compareTo(baseDn) == 0,
+      assertEquals(modMsg.getDN(), baseDN,
                  "The received message is not for cn=schema");
 
       assertTrue(receivedOp instanceof ModifyOperation,
@@ -179,7 +179,7 @@
       mods.add(mod);
       modOp = new ModifyOperationBasis(connection,
           InternalClientConnection.nextOperationID(), InternalClientConnection
-          .nextMessageID(), null, baseDn, mods);
+          .nextMessageID(), null, baseDN, mods);
       modOp.setInternalOperation(true);
       modOp.run();
 
@@ -211,20 +211,20 @@
 
     cleanUpReplicationServersDB();
 
-    final DN baseDn = DN.decode("cn=schema");
+    final DN baseDN = DN.decode("cn=schema");
 
     ReplicationBroker broker =
-      openReplicationSession(baseDn,  2, 100, replServerPort, 5000, true);
+      openReplicationSession(baseDN,  2, 100, replServerPort, 5000, true);
 
     try
     {
       CSNGenerator gen = new CSNGenerator( 2, 0);
 
-      ModifyMsg modMsg = new ModifyMsg(gen.newCSN(), baseDn, rcvdMods,
-          EntryHistorical.getEntryUUID(DirectoryServer.getEntry(baseDn)));
+      ModifyMsg modMsg = new ModifyMsg(gen.newCSN(), baseDN, rcvdMods,
+          EntryHistorical.getEntryUUID(DirectoryServer.getEntry(baseDN)));
       broker.publish(modMsg);
 
-      boolean found = checkEntryHasAttribute(baseDn, "attributetypes",
+      boolean found = checkEntryHasAttribute(baseDN, "attributetypes",
         "( 2.5.44.77.33 NAME 'dummy' )",
         10000, true);
 
@@ -250,10 +250,10 @@
 
     cleanUpReplicationServersDB();
 
-    final DN baseDn = DN.decode("cn=schema");
+    final DN baseDN = DN.decode("cn=schema");
 
     ReplicationBroker broker =
-      openReplicationSession(baseDn,  3, 100, replServerPort, 5000, true);
+      openReplicationSession(baseDN,  3, 100, replServerPort, 5000, true);
 
     try
     {
@@ -278,7 +278,7 @@
       ModifyMsg modMsg = (ModifyMsg) msg;
 
       Operation receivedOp = modMsg.createOperation(connection);
-      assertTrue(DN.decode(modMsg.getDn()).compareTo(baseDn) == 0,
+      assertEquals(modMsg.getDN(), baseDN,
         "The received message is not for cn=schema");
 
       assertTrue(receivedOp instanceof ModifyOperation,

--
Gitblit v1.10.0