From cfef836bc4acc99cce9e1a2d9b4401ab0394baa1 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 01 Oct 2013 14:41:21 +0000
Subject: [PATCH] ReplicationServerTest.java: In setUp(), used "ou" under "o" to be logically compliant with LDAP. In assertDeleteMsgBodyEquals(), renamed parameters to match the names in sendAndReceiveDeleteMsg() + removed a useless cast.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
index 60853ae..e401945 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ReplicationServerTest.java
@@ -115,7 +115,7 @@
{
super.setUp();
TEST_ROOT_DN = DN.decode(TEST_ROOT_DN_STRING);
- EXAMPLE_DN = DN.decode("o=example," + TEST_ROOT_DN_STRING);
+ EXAMPLE_DN = DN.decode("ou=example," + TEST_ROOT_DN_STRING);
// This test suite depends on having the schema available.
configure();
@@ -280,13 +280,12 @@
assertDeleteMsgBodyEquals(sentMsg, receivedMsg);
}
- private void assertDeleteMsgBodyEquals(DeleteMsg msg, ReplicationMsg msg2)
+ private void assertDeleteMsgBodyEquals(DeleteMsg sentMsg, ReplicationMsg receivedMsg)
{
- assertTrue(msg2 instanceof DeleteMsg,
+ assertTrue(receivedMsg instanceof DeleteMsg,
"ReplicationServer basic : incorrect message type received: "
- + msg2.getClass() + ": content: " + msg2);
- DeleteMsg del = (DeleteMsg) msg2;
- assertEquals(del.toString(), msg.toString(),
+ + receivedMsg.getClass() + ": content: " + receivedMsg);
+ assertEquals(receivedMsg.toString(), sentMsg.toString(),
"ReplicationServer basic : incorrect message body received.");
}
--
Gitblit v1.10.0