From cbf6bfd149ce305652be0aac68d210778b5cbba6 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 03 Oct 2013 11:59:25 +0000
Subject: [PATCH] ReplicationTestCase.java: Change entryList and configEntryList from LinkedList to Set and renamed them to entriesToCleanup and configEntriesToCleanup. Extracted method connect() and waitForSpecificMsg() + Changed the return type of the existing waitForSpecificMsg() methods. In configureReplication(), added 2 String parameters + extracted method addSynchroServerEntry() and addConfigEntry(). Simplified code a lot.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
index e84cbcc..8c69ca3 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/StressTest.java
@@ -58,15 +58,16 @@
@SuppressWarnings("javadoc")
public class StressTest extends ReplicationTestCase
{
+
private static final String REPLICATION_STRESS_TEST =
"Replication Stress Test";
- private BrokerReader reader = null;
+ private BrokerReader reader;
/**
* A "person" entry
*/
- protected Entry personEntry;
+ private Entry personEntry;
private int replServerPort;
@@ -143,14 +144,7 @@
thread.join();
}
- int rcvCount = reader.getCount();
-
- if (rcvCount != TOTAL_MESSAGES)
- {
- fail("some messages were lost : expected : " +TOTAL_MESSAGES +
- " received : " + rcvCount);
- }
-
+ assertEquals(reader.getCount(), TOTAL_MESSAGES, "some messages were lost");
}
finally {
DirectoryServer.deregisterMonitorProvider(monitor);
@@ -193,7 +187,6 @@
+ "ds-cfg-replication-port: " + replServerPort + "\n"
+ "ds-cfg-replication-db-directory: StressTest\n"
+ "ds-cfg-replication-server-id: 106\n";
- replServerEntry = TestCaseUtils.entryFromLdifString(replServerLdif);
// suffix synchronized
String testName = "stressTest";
@@ -205,7 +198,6 @@
+ "ds-cfg-base-dn: ou=People," + TEST_ROOT_DN_STRING + "\n"
+ "ds-cfg-replication-server: localhost:" + replServerPort + "\n"
+ "ds-cfg-server-id: 1\n" + "ds-cfg-receive-status: true\n";
- synchroServerEntry = TestCaseUtils.entryFromLdifString(synchroServerLdif);
String personLdif = "dn: uid=user.1,ou=People," + TEST_ROOT_DN_STRING + "\n"
+ "objectClass: top\n" + "objectClass: person\n"
@@ -223,7 +215,7 @@
+ "userPassword: password\n" + "initials: AA\n";
personEntry = TestCaseUtils.entryFromLdifString(personLdif);
- configureReplication();
+ configureReplication(replServerLdif, synchroServerLdif);
}
private class BrokerWriter extends Thread
--
Gitblit v1.10.0