From 7b0c543e99d6a93ec8ea3472eb0eb9fd8fac460e Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 09 Jun 2011 07:37:50 +0000
Subject: [PATCH] Partial fix OPENDJ-194: Minor improvements to change log content and configuration
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java
index 6489aa5..c5fb180 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java
@@ -251,7 +251,7 @@
// First and last should be ok whenever a request has been done or not
// in compat mode.
ECLCompatTestLimits(1,4,true);replicationServer.clearDb();
-
+
// Test with a mix of domains, a mix of DSes
ECLTwoDomains(); replicationServer.clearDb();
@@ -263,7 +263,7 @@
int ts = ECLCompatWriteReadAllOps(1);
ECLCompatNoControl(1);
-
+
// Write additional changes and read ECL from a provided draft change number
ts = ECLCompatWriteReadAllOps(5);replicationServer.clearDb();
@@ -353,8 +353,8 @@
// Test request from a provided change number - read 6
ECLCompatReadFrom(6);
-
- // Test request from change number 1, just check that Cookie controls
+
+ // Test request from change number 1, just check that Cookie controls
// are not returned with entries, when not requested.
ECLCompatNoControl(1);
@@ -2894,7 +2894,7 @@
+ stackTraceToSingleLineString(e));
}
}
-
+
private int ECLCompatWriteReadAllOps(int firstDraftChangeNumber)
{
String tn = "ECLCompatWriteReadAllOps/" + String.valueOf(firstDraftChangeNumber);
@@ -3015,7 +3015,7 @@
checkValue(resultEntry,"changelogcookie","o=test:"+cn1.toString()+";");
checkValue(resultEntry,"targetentryuuid",user1entryUUID);
checkValue(resultEntry,"changenumber",String.valueOf(firstDraftChangeNumber+0));
- checkValue(resultEntry,"targetuniqueid","11111111-11121113-11141111-11111115");
+ checkValue(resultEntry,"targetuniqueid",user1entryUUID);
} else if (i==2)
{
// check the ADD entry has the right content
@@ -3108,7 +3108,7 @@
checkValue(resultEntry,"changelogcookie","o=test:"+cn1.toString()+";");
checkValue(resultEntry,"targetentryuuid",user1entryUUID);
checkValue(resultEntry,"changenumber",String.valueOf(firstDraftChangeNumber+0));
- checkValue(resultEntry,"targetuniqueid","11111111-11121113-11141111-11111115");
+ checkValue(resultEntry,"targetuniqueid",user1entryUUID);
} else if (i==2)
{
// check the ADD entry has the right content
@@ -3296,7 +3296,7 @@
+ stackTraceToSingleLineString(e));
}
debugInfo(tn, "Ending test with success");
-
+
}
@@ -3588,7 +3588,7 @@
}
debugInfo(tn, "Ending test with success");
}
-
+
private void ECLOperationalAttributesFailTest()
{
String tn = "ECLOperationalAttributesFailTest";
@@ -3598,7 +3598,7 @@
try
{
LinkedHashSet<String> attributes = new LinkedHashSet<String>();
-
+
attributes.add("firstchangenumber");
attributes.add("lastchangenumber");
attributes.add("changelog");
@@ -3619,7 +3619,7 @@
null);
waitOpResult(searchOp, ResultCode.SUCCESS);
assertEquals(searchOp.getSearchEntries().size(), 1);
-
+
LinkedList<SearchResultEntry> entries = searchOp.getSearchEntries();
assertEquals(entries.size(), 1);
for (SearchResultEntry resultEntry : entries)
@@ -3634,7 +3634,7 @@
assertEquals(getAttributeValue(resultEntry, "lastExternalChangelogCookie"),
null);
}
-
+
debugInfo(tn, "Ending test with success");
}
catch(Exception e)
--
Gitblit v1.10.0