From 5f79bfce18168fca6b47a0153d5c5e586c3a433d Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 30 May 2016 10:43:12 +0000
Subject: [PATCH] OPENDJ-2987 Fix FractionalReplicationTest to use correct attribute
---
opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java
index a770270..b3b11ae 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/plugin/FractionalReplicationTest.java
@@ -1205,7 +1205,7 @@
{
createReplicationServer(testcase);
createFractionalDomain(true, EXCLUDE_FRAC_MODE, "inetOrgPerson",
- "displayName", "description");
+ "displayName", "givenName");
// create fake domain to send operations
createFakeReplicationDomain(true, readGenIdFromSuffixRootEntry(TEST_ROOT_DN_STRING));
@@ -1246,7 +1246,7 @@
// Perform add operation with forbidden attribute in RDN
// @formatter:off
entry = TestCaseUtils.makeEntry(
- "dn: displayName=ValueToBeKept+description=ValueToBeKeptToo," + TEST_ROOT_DN_STRING,
+ "dn: displayName=ValueToBeKept+givenName=ValueToBeKeptToo," + TEST_ROOT_DN_STRING,
"objectClass: top",
"objectClass: person",
"objectClass: organizationalPerson",
@@ -1256,8 +1256,8 @@
"cn: cnValue",
"displayName: ValueToBeKept",
"displayName: displayNameValue",
- "description: descriptionValue",
- "description: ValueToBeKeptToo");
+ "givenName: descriptionValue",
+ "givenName: ValueToBeKeptToo");
// @formatter:on
// Create an update message to add an entry.
@@ -1273,7 +1273,7 @@
objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
- checkEntryAttributeValue(newEntry, "description", "ValueToBeKeptToo");
+ checkEntryAttributeValue(newEntry, "givenName", "ValueToBeKeptToo");
}
finally
{
@@ -1390,13 +1390,13 @@
{
createReplicationServer(testcase);
createFractionalDomain(true, EXCLUDE_FRAC_MODE, "inetOrgPerson",
- "displayName", "description");
+ "displayName", "givenName");
// create fake domain to send operations
createFakeReplicationDomain(true, readGenIdFromSuffixRootEntry(TEST_ROOT_DN_STRING));
// Perform add operation with forbidden attribute in RDN
- String entryName = "displayName=ValueToBeKept+description=ValueToBeRemoved," + TEST_ROOT_DN_STRING ;
+ String entryName = "displayName=ValueToBeKept+givenName=ValueToBeRemoved," + TEST_ROOT_DN_STRING ;
// @formatter:off
Entry entry = TestCaseUtils.makeEntry(
"dn: " + entryName,
@@ -1408,7 +1408,7 @@
"cn: cnValue",
"entryUUID: " + ENTRY_UUID,
"displayName: ValueToBeKept",
- "description: ValueToBeRemoved");
+ "givenName: ValueToBeRemoved");
// @formatter:on
// Create an update message to add an entry.
@@ -1421,7 +1421,7 @@
ObjectClass objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
- checkEntryAttributeValue(newEntry, "description", "ValueToBeRemoved");
+ checkEntryAttributeValue(newEntry, "givenName", "ValueToBeRemoved");
/*
* Perform modify dn operation by renaming the entry keeping only one of
@@ -1444,7 +1444,7 @@
objectClass = DirectoryServer.getObjectClass("inetOrgPerson".toLowerCase());
assertTrue(newEntry.hasObjectClass(objectClass));
checkEntryAttributeValue(newEntry, "displayName", "ValueToBeKept");
- assertThat(newEntry.getAttribute("description")).isEmpty();
+ assertThat(newEntry.getAttribute("givenName")).isEmpty();
}
finally
{
--
Gitblit v1.10.0