From 284e064fb0ab370e63b79e400439fb1d104e268c Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Fri, 25 Jun 2010 10:29:11 +0000
Subject: [PATCH] Fixes unit-tests for External Changelog that were using hardcoded messages and were failing in non-english locale
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ExternalChangeLogTest.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 3c5d96b..dfc0dbe 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
@@ -141,7 +141,8 @@
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
-
+import static org.opends.messages.ReplicationMessages.*;
+import org.opends.messages.Message;
/**
* Tests for the replicationServer code.
@@ -1123,8 +1124,8 @@
waitOpResult(searchOp, ResultCode.UNWILLING_TO_PERFORM);
assertEquals(searchOp.getSearchEntries().size(), 0);
- assertTrue(searchOp.getErrorMessage().toString().startsWith(
- "Invalid syntax of the provided cookie"),
+ assertTrue(searchOp.getErrorMessage().toString().equals(
+ ERR_INVALID_COOKIE_SYNTAX.get().toString()),
searchOp.getErrorMessage().toString());
// Test unknown domain in provided cookie
@@ -1154,7 +1155,7 @@
waitOpResult(searchOp, ResultCode.UNWILLING_TO_PERFORM);
assertEquals(searchOp.getSearchEntries().size(), 0);
assertTrue(searchOp.getErrorMessage().toString().startsWith(
- "Full resync required. Reason: The provided cookie contains unknown replicated domain {o=test6=}. Possible cookie: <"),
+ ERR_RESYNC_REQUIRED_UNKNOWN_DOMAIN_IN_PROVIDED_COOKIE.get("{o=test6=}").toString().replace(")","")),
searchOp.getErrorMessage().toString());
// The cookie value is not tested because it is build from a hashmap in
// the server and the order of domains is not predictable.
@@ -1180,9 +1181,8 @@
waitOpResult(searchOp, ResultCode.UNWILLING_TO_PERFORM);
assertEquals(searchOp.getSearchEntries().size(), 0);
- String expectedError =
- "Full resync required because the provided cookie is missing the replicated domain(s) o=test:;. The following cookie value can be used to retrieve the missing changes, including the COMPLETE record of changes for the missing domain(s) : <"
- + newCookie + "o=test:;>";
+ String expectedError = ERR_RESYNC_REQUIRED_MISSING_DOMAIN_IN_PROVIDED_COOKIE
+ .get("o=test:;","<"+ newCookie + "o=test:;>").toString();
assertTrue(searchOp.getErrorMessage().toString().equalsIgnoreCase(expectedError),
"Expected: " + expectedError + "Server output:" +
searchOp.getErrorMessage().toString());
@@ -1365,7 +1365,8 @@
waitOpResult(searchOp, ResultCode.UNWILLING_TO_PERFORM);
assertEquals(searchOp.getSearchEntries().size(), 0);
assertTrue(searchOp.getErrorMessage().toString().startsWith(
- "Full resync required. Reason: The provided cookie is older than the start of historical in the server for the replicated domain : o=test"),
+ ERR_RESYNC_REQUIRED_TOO_OLD_DOMAIN_IN_PROVIDED_COOKIE.get("o=test")
+ .toString()),
searchOp.getErrorMessage().toString());
// Clean
@@ -4101,4 +4102,4 @@
operation.getErrorMessage().toString());
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.10.0