From d04fb0f282e0fd9a4bc80d3f9d5ee15506a3b83b Mon Sep 17 00:00:00 2001
From: gbellato <gbellato@localhost>
Date: Mon, 08 Dec 2008 08:03:33 +0000
Subject: [PATCH] Merge the replication-service branch with the OpenDS trunk
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/plugin/HistoricalTest.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 b756b5a..8f0d85f 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,11 +27,13 @@
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.replication.protocol.UpdateMsg;
import org.opends.server.TestCaseUtils;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.tools.LDAPModify;
@@ -335,7 +337,7 @@
ModifyMsg modMsg = new ModifyMsg(changeNum, dn, mods, entryuuid);
broker.publish(modMsg);
}
-
+
/**
* Test that historical information is correctly added when performaing ADD,
* MOD and MODDN operations.
@@ -416,7 +418,7 @@
for (FakeOperation fake : ops)
{
- UpdateMsg msg = (UpdateMsg) fake.generateMessage();
+ LDAPUpdateMsg msg = (LDAPUpdateMsg) fake.generateMessage();
AbstractOperation op =
msg.createOperation(InternalClientConnection.getRootConnection());
op.setInternalOperation(true);
@@ -449,7 +451,7 @@
AddMsg addmsg = addOp.generateMessage();
assertTrue(dn1.equals(DN.decode(addmsg.getDn())));
assertTrue(addmsg.getUniqueId().equals(Historical.getEntryUuid(entry)));
- String parentId = ReplicationDomain.findEntryId(dn1.getParent());
+ String parentId = LDAPReplicationDomain.findEntryId(dn1.getParent());
assertTrue(addmsg.getParentUid().equals(parentId));
addmsg.createOperation(InternalClientConnection.getRootConnection());
} else
@@ -462,7 +464,7 @@
}
}
}
-
+
assertEquals(count, assertCount);
}
}
--
Gitblit v1.10.0