From 8771c9d697fa40e5655be9516204d91b99c119e3 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 15 Sep 2015 15:29:46 +0000
Subject: [PATCH] Fixed build failure
---
opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java
index 5920959..2f9d1f5 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/GenerationIdTest.java
@@ -468,9 +468,9 @@
return replServerPort[replServerId - replServerId1];
}
- private long readGenIdFromSuffixRootEntry() throws Exception
+ private long readGenIdFromSuffixRootEntry(boolean shouldExist) throws Exception
{
- Entry resultEntry = getEntry(baseDN, 1000, true);
+ Entry resultEntry = getEntry(baseDN, 1000, shouldExist);
if (resultEntry == null)
{
debugInfo("Entry not found <" + baseDN + ">");
@@ -611,7 +611,7 @@
debugInfo(testCase
+ " Expect genId to be not retrievable from suffix root entry");
- dsGenId = readGenIdFromSuffixRootEntry();
+ dsGenId = readGenIdFromSuffixRootEntry(false);
assertEquals(dsGenId,-1);
debugInfo(testCase
@@ -634,7 +634,7 @@
debugInfo(testCase
+ " Test that the generationId is written in the DB in the root entry on DS1");
- dsGenId = readGenIdFromSuffixRootEntry();
+ dsGenId = readGenIdFromSuffixRootEntry(true);
assertTrue(dsGenId != -1);
assertTrue(dsGenId != EMPTY_DN_GENID);
@@ -747,7 +747,7 @@
+ " to enter the bad gen id status" + csMsg);
debugInfo("DS1 root entry must contain the new gen ID");
- dsGenId = readGenIdFromSuffixRootEntry();
+ dsGenId = readGenIdFromSuffixRootEntry(true);
assertTrue(dsGenId != -1, "DS is expected to have a new genID computed " +
" after on-line import but genId=" + dsGenId);
assertTrue(dsGenId != oldGenId, "The new genID after import and reset of genID "
@@ -955,7 +955,7 @@
connectServer1ToReplServer(replServer2);
debugInfo("Expect genIds to be set in all servers based on the added entries.");
- genId = readGenIdFromSuffixRootEntry();
+ genId = readGenIdFromSuffixRootEntry(true);
Assertions.assertThat(genId).isNotEqualTo(-1);
waitForStableGenerationId(genId);
@@ -991,7 +991,7 @@
executeTask(createSetGenerationIdTask(null, ""), 20000);
debugInfo("Verifying that all replservers genIds have been reset.");
- genId = readGenIdFromSuffixRootEntry();
+ genId = readGenIdFromSuffixRootEntry(true);
assertGenIdEquals(genId);
debugInfo("Adding reset task to DS." + genId);
@@ -1084,12 +1084,12 @@
* Check : nothing is broken - no generationId generated
*/
connectServer1ToReplServer(replServer1);
- assertEquals(readGenIdFromSuffixRootEntry(), -1,
+ assertEquals(readGenIdFromSuffixRootEntry(false), -1,
"genId attribute should not be retrievable since there are NO entry in the backend");
waitConnectionToReplicationDomain(baseDN, 1000);
addTestEntriesToDB(updatedEntries);
- assertEquals(readGenIdFromSuffixRootEntry(), EMPTY_DN_GENID,
+ assertEquals(readGenIdFromSuffixRootEntry(true), EMPTY_DN_GENID,
"genId attribute should be retrievable since there IS one entry in the backend");
disconnectFromReplServer(replServer1);
@@ -1142,5 +1142,4 @@
debugInfo("Successfully ending " + testCase);
}
}
-
}
--
Gitblit v1.10.0