From 4290bf7c48e9d681ead7484abe54fea53e08c1e6 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 30 Sep 2013 09:42:02 +0000
Subject: [PATCH] Ludo prefer to not have CSNGenerator.newCSNs() in the production code because it should never be called this way in production, so I moved it back to tests.
---
opends/src/server/org/opends/server/replication/common/CSNGenerator.java | 17 -----------------
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/DbHandlerTest.java | 19 +++++++++++++++----
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNGeneratorTest.java | 10 ++++++++--
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/DraftCNDbHandlerTest.java | 6 +++---
4 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/opends/src/server/org/opends/server/replication/common/CSNGenerator.java b/opends/src/server/org/opends/server/replication/common/CSNGenerator.java
index 84bd933..559d621 100644
--- a/opends/src/server/org/opends/server/replication/common/CSNGenerator.java
+++ b/opends/src/server/org/opends/server/replication/common/CSNGenerator.java
@@ -109,23 +109,6 @@
}
/**
- * Generate an array of new {@link CSN}s.
- *
- * @param number
- * the total number of {@link CSN}s to generate
- * @return the array of generated {@link CSN}s
- */
- public CSN[] newCSNs(int number)
- {
- final CSN[] csns = new CSN[number];
- for (int i = 0; i < number; i++)
- {
- csns[i] = newCSN();
- }
- return csns;
- }
-
- /**
* Adjust the lastTime of this {@link CSNGenerator} with a {@link CSN} that we
* have received from another server.
* <p>
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNGeneratorTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNGeneratorTest.java
index b6fce32..00b8c50 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNGeneratorTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/common/CSNGeneratorTest.java
@@ -86,10 +86,16 @@
}
@Test
- public void newCSNs()
+ public void newCSN()
{
CSNGenerator generator = new CSNGenerator(5, TimeThread.getTime());
- CSN[] csns = generator.newCSNs(5);
+ CSN[] csns = new CSN[] {
+ generator.newCSN(),
+ generator.newCSN(),
+ generator.newCSN(),
+ generator.newCSN(),
+ generator.newCSN()
+ };
assertNotNull(csns);
for (int i = 0; i + 1 < csns.length; i++)
{
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/DbHandlerTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/DbHandlerTest.java
index 2b76a41..8f9221c 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/DbHandlerTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/DbHandlerTest.java
@@ -89,7 +89,7 @@
replicationServer = configureReplicationServer(100, 5000);
DbHandler handler = newDbHandler(replicationServer);
- CSN[] csns = new CSNGenerator(1, 0).newCSNs(5);
+ CSN[] csns = newCSNs(1, 0, 5);
handler.add(new DeleteMsg(TEST_ROOT_DN, csns[0], "uid"));
handler.add(new DeleteMsg(TEST_ROOT_DN, csns[1], "uid"));
@@ -156,6 +156,17 @@
}
}
+ static CSN[] newCSNs(int serverId, long timestamp, int number)
+ {
+ CSNGenerator gen = new CSNGenerator(serverId, timestamp);
+ CSN[] csns = new CSN[number];
+ for (int i = 0; i < csns.length; i++)
+ {
+ csns[i] = gen.newCSN();
+ }
+ return csns;
+ }
+
private ReplicationServer configureReplicationServer(int windowSize, int queueSize)
throws IOException, ConfigException
{
@@ -242,7 +253,7 @@
replicationServer = configureReplicationServer(100, 5000);
DbHandler handler = newDbHandler(replicationServer);
- CSN[] csns = new CSNGenerator(1, 0).newCSNs(3);
+ CSN[] csns = newCSNs(1, 0, 3);
// Add the changes
handler.add(new DeleteMsg(TEST_ROOT_DN, csns[0], "uid"));
@@ -278,7 +289,7 @@
replicationServer = configureReplicationServer(100000, 10);
DbHandler handler = newDbHandler(replicationServer);
- CSN[] csns = new CSNGenerator(1, System.currentTimeMillis()).newCSNs(6);
+ CSN[] csns = newCSNs(1, System.currentTimeMillis(), 6);
for (int i = 0; i < 5; i++)
{
if (i != 3)
@@ -319,7 +330,7 @@
replicationServer = configureReplicationServer(100000, 10);
DbHandler handler = newDbHandler(replicationServer);
- CSN[] csns = new CSNGenerator(1, System.currentTimeMillis()).newCSNs(5);
+ CSN[] csns = newCSNs(1, System.currentTimeMillis(), 5);
for (CSN csn : csns)
{
handler.add(new DeleteMsg(TEST_ROOT_DN, csn, "uid"));
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/DraftCNDbHandlerTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/DraftCNDbHandlerTest.java
index 5e445d6..b17fe66 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/DraftCNDbHandlerTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/changelog/je/DraftCNDbHandlerTest.java
@@ -33,7 +33,6 @@
import org.opends.server.TestCaseUtils;
import org.opends.server.replication.ReplicationTestCase;
import org.opends.server.replication.common.CSN;
-import org.opends.server.replication.common.CSNGenerator;
import org.opends.server.replication.server.ReplServerFakeConfiguration;
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.replication.server.changelog.api.CNIndexRecord;
@@ -44,6 +43,7 @@
import org.opends.server.util.StaticUtils;
import org.testng.annotations.Test;
+import static org.opends.server.replication.server.changelog.je.DbHandlerTest.*;
import static org.testng.Assert.*;
/**
@@ -92,7 +92,7 @@
DN baseDN2 = DN.decode("o=baseDN2");
DN baseDN3 = DN.decode("o=baseDN3");
- CSN[] csns = new CSNGenerator(1, 0).newCSNs(3);
+ CSN[] csns = newCSNs(1, 0, 3);
// Add records
handler.addRecord(new CNIndexRecord(cn1, value1, baseDN1, csns[0]));
@@ -213,7 +213,7 @@
DN baseDN2 = DN.decode("o=baseDN2");
DN baseDN3 = DN.decode("o=baseDN3");
- CSN[] csns = new CSNGenerator(1, 0).newCSNs(3);
+ CSN[] csns = newCSNs(1, 0, 3);
// Add records
handler.addRecord(new CNIndexRecord(cn1, value1, baseDN1, csns[0]));
--
Gitblit v1.10.0