From 03413ef56a2c56131da520ea4ea1697814433943 Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Mon, 31 May 2010 09:36:23 +0000
Subject: [PATCH] Fix issue #4083. Handle correctly the Byte Count in Replication Server monitor when the same update message is received twice
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
index d4c3e05..9eb01bf 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/MonitorTest.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.server.replication.server;
@@ -52,6 +52,7 @@
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.replication.common.ChangeNumberGenerator;
+import org.opends.server.replication.common.ChangeNumber;
import org.opends.server.replication.plugin.LDAPReplicationDomain;
import org.opends.server.replication.protocol.AddMsg;
import org.opends.server.replication.protocol.ReplicationMsg;
@@ -319,19 +320,14 @@
+ "userPassword: password\n" + "initials: AA\n");
}
- static protected ReplicationMsg createAddMsg(int serverId)
+ static protected ReplicationMsg createAddMsg(ChangeNumber cn,
+ int serverId)
{
Entry personWithUUIDEntry = null;
String user1entryUUID;
String baseUUID = null;
String user1dn;
- /*
- * Create a Change number generator to generate new changenumbers
- * when we need to send operation messages to the replicationServer.
- */
- ChangeNumberGenerator gen = new ChangeNumberGenerator(serverId, 0);
-
user1entryUUID = "33333333-3333-3333-3333-333333333333";
user1dn = "uid=user1,ou=People," + baseDnStr;
String entryWithUUIDldif = "dn: "+ user1dn + "\n"
@@ -360,7 +356,7 @@
}
// Create and publish an update message to add an entry.
- AddMsg addMsg = new AddMsg(gen.newChangeNumber(),
+ AddMsg addMsg = new AddMsg(cn,
personWithUUIDEntry.getDN().toString(),
user1entryUUID,
baseUUID,
@@ -438,9 +434,15 @@
this.addTestEntriesToDB(ent1);
}
+ /*
+ * Create a Change number generator to generate new changenumbers
+ * when we need to send operation messages to the replicationServer.
+ */
+ ChangeNumberGenerator gen = new ChangeNumberGenerator(server3ID, 0);
+
for (int i = 0; i < 10; i++)
{
- broker3.publish(createAddMsg(server3ID));
+ broker3.publish(createAddMsg(gen.newChangeNumber(), server3ID));
}
searchMonitor();
--
Gitblit v1.10.0