From fc88d3c3e7c4a879ba74bebd04771e4771ffde3a Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 02 Jan 2014 13:32:06 +0000
Subject: [PATCH] Fixed ExternalChangeLogTest.ECLReplicationServerTest(), broken after r10049. Created a fake domain for it, so it participates in the external changelog.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java
index 04e843d..770b4c3 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java
@@ -169,9 +169,7 @@
public void ECLReplicationServerTest() throws Exception
{
getCNIndexDB().setPurgeDelay(0);
- // Following test does not create RSDomain (only broker) but want to test
- // ECL .. so let's enable ECl manually
- // Now that we tested that ECl is not available
+ // let's enable ECl manually now that we tested that ECl is not available
ECLWorkflowElement wfe =
(ECLWorkflowElement) DirectoryServer
.getWorkflowElement(ECLWorkflowElement.ECL_WORKFLOW_ELEMENT);
@@ -1008,6 +1006,7 @@
debugInfo(tn, "Starting test\n\n");
ReplicationBroker server01 = null;
ReplicationBroker server02 = null;
+ LDAPReplicationDomain domain = null;
try
{
// Creates brokers on o=test and o=test2
@@ -1016,6 +1015,9 @@
server02 = openReplicationSession(TEST_ROOT_DN2, SERVER_ID_2,
100, replicationServerPort, brokerSessionTimeout);
+ DomainFakeCfg domainConf = newFakeCfg(TEST_ROOT_DN, SERVER_ID_1, replicationServerPort);
+ domain = startNewDomain(domainConf, null, null);
+
String user1entryUUID = "11111111-1111-1111-1111-111111111111";
String baseUUID = "22222222-2222-2222-2222-222222222222";
@@ -1125,7 +1127,9 @@
debugInfo(tn, "Entries:" + result);
assertThat(getControls(result)).containsExactly(cookies);
}
- finally {
+ finally
+ {
+ remove(domain);
stop(server01, server02);
}
debugInfo(tn, "Ending test with success");
@@ -2490,10 +2494,10 @@
debugAndWriteEntries(null, entries, tn);
for (SearchResultEntry resultEntry : entries)
{
- assertEquals(getAttributeValue(resultEntry, "firstchangenumber"), null);
- assertEquals(getAttributeValue(resultEntry, "lastchangenumber"), null);
- assertEquals(getAttributeValue(resultEntry, "changelog"), null);
- assertEquals(getAttributeValue(resultEntry, "lastExternalChangelogCookie"), null);
+ assertNull(getAttributeValue(resultEntry, "firstchangenumber"));
+ assertNull(getAttributeValue(resultEntry, "lastchangenumber"));
+ assertNull(getAttributeValue(resultEntry, "changelog"));
+ assertNull(getAttributeValue(resultEntry, "lastExternalChangelogCookie"));
}
debugInfo(tn, "Ending test with success");
@@ -2528,14 +2532,15 @@
checkValue(resultEntry, "firstchangenumber", String.valueOf(expectedFirst));
checkValue(resultEntry, "lastchangenumber", String.valueOf(expectedLast));
checkValue(resultEntry, "changelog", String.valueOf("cn=changelog"));
+ assertNotNull(getAttributeValue(resultEntry, "lastExternalChangelogCookie"));
}
else
{
if (expectedFirst > 0)
- assertEquals(getAttributeValue(resultEntry, "firstchangenumber"), null);
- assertEquals(getAttributeValue(resultEntry, "lastchangenumber"), null);
- assertEquals(getAttributeValue(resultEntry, "changelog"), null);
- assertEquals(getAttributeValue(resultEntry, "lastExternalChangelogCookie"), null);
+ assertNull(getAttributeValue(resultEntry, "firstchangenumber"));
+ assertNull(getAttributeValue(resultEntry, "lastchangenumber"));
+ assertNull(getAttributeValue(resultEntry, "changelog"));
+ assertNull(getAttributeValue(resultEntry, "lastExternalChangelogCookie"));
}
debugInfo(tn, "Ending test with success");
--
Gitblit v1.10.0