From db875e68373bb8fe55c4305351949fa3c7e84529 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 16 Mar 2016 17:46:57 +0000
Subject: [PATCH] Minor: fix unit tests that were passing in DNs instead of RDNs for modifyDN operations
---
opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java | 15 +++++----------
opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java | 8 ++++----
opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java | 8 ++++----
3 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java
index b04d464..abdc7a6 100644
--- a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java
+++ b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldap/requests/ModifyDNRequestTestCase.java
@@ -12,7 +12,7 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2013 ForgeRock AS.
+ * Portions copyright 2013-2016 ForgeRock AS.
*/
package org.forgerock.opendj.ldap.requests;
@@ -31,7 +31,7 @@
public class ModifyDNRequestTestCase extends RequestsTestCase {
private static final ModifyDNRequest NEW_MODIFY_DN_REQUEST = Requests.newModifyDNRequest(
- "uid=user.100,ou=people,o=test", "uid=100.user,ou=people,o=testl");
+ "uid=user.100,ou=people,o=test", "uid=100.user");
private static final ModifyDNRequest NEW_MODIFY_DN_REQUEST2 = Requests.newModifyDNRequest(
"cn=ModifyDNrequesttestcase", "cn=xyz");
@@ -102,13 +102,13 @@
@Test(dataProvider = "ModifyDNRequests", expectedExceptions = UnsupportedOperationException.class)
public void testUnmodifiableSetNewRDN(final ModifyDNRequest original) {
final ModifyDNRequest unmodifiable = (ModifyDNRequest) unmodifiableOf(original);
- unmodifiable.setNewRDN("dc=example,dc=org");
+ unmodifiable.setNewRDN("dc=org");
}
@Test(dataProvider = "ModifyDNRequests", expectedExceptions = UnsupportedOperationException.class)
public void testUnmodifiableSetNewRDN2(final ModifyDNRequest original) {
final ModifyDNRequest unmodifiable = (ModifyDNRequest) unmodifiableOf(original);
- unmodifiable.setNewRDN(RDN.valueOf("dc=example,dc=org"));
+ unmodifiable.setNewRDN(RDN.valueOf("dc=org"));
}
@Test(dataProvider = "ModifyDNRequests", expectedExceptions = UnsupportedOperationException.class)
diff --git a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java
index d102f6e..f6b75c0 100644
--- a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java
+++ b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFChangeRecordReaderTestCase.java
@@ -12,7 +12,6 @@
* information: "Portions Copyright [year] [name of copyright owner]".
*
* Copyright 2011-2016 ForgeRock AS.
- * Portions copyright 2012 ForgeRock AS.
* Portions Copyright 2014 Manuel Gaupp
*/
@@ -1516,12 +1515,10 @@
}
/**
- * Test to read an record containing an invalid control. (pair.value is null) Must throw a DecodeException.
- *
- * @throws Exception
+ * Tests that change records containing an empty control are rejected.
*/
@Test(expectedExceptions = DecodeException.class)
- public void testParseChangeRecordEntryWithAddControlPairKeyNull() throws Exception {
+ public void testParseChangeRecordEntryRejectedWhenControlIsEmpty() throws Exception {
// @formatter:off
final LDIFChangeRecordReader reader = new LDIFChangeRecordReader(
@@ -1963,7 +1960,7 @@
LDIFChangeRecordReader reader = new LDIFChangeRecordReader(
"dn::ZGM9cGVvcGxlLGRjPWV4YW1wbGUsZGM9b3Jn",
"changetype: modrdn",
- "newrdn::ZGM9cGVvcGxlLGRjPWV4YW1wbGUsZGM9Y29t",
+ "newrdn::ZGM9cGVvcGxl",
"deleteoldrdn: 1"
);
// @formatter:on
@@ -1972,10 +1969,8 @@
ChangeRecord record = reader.readChangeRecord();
assertThat(record).isInstanceOf(ModifyDNRequest.class);
ModifyDNRequest modifyDNRequest = (ModifyDNRequest) record;
- assertThat((Object) modifyDNRequest.getName()).isEqualTo(
- DN.valueOf("dc=people,dc=example,dc=org"));
- assertThat((Object) modifyDNRequest.getNewRDN()).isEqualTo(
- RDN.valueOf("dc=people,dc=example,dc=com"));
+ assertThat((Object) modifyDNRequest.getName()).isEqualTo(DN.valueOf("dc=people,dc=example,dc=org"));
+ assertThat((Object) modifyDNRequest.getNewRDN()).isEqualTo(RDN.valueOf("dc=people"));
assertThat(modifyDNRequest.isDeleteOldRDN()).isTrue();
reader.close();
}
diff --git a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java
index 24db44b..b8d8a94 100644
--- a/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java
+++ b/opendj-sdk/opendj-core/src/test/java/org/forgerock/opendj/ldif/LDIFTestCase.java
@@ -1916,7 +1916,7 @@
final LDIFChangeRecordReader patch = new LDIFChangeRecordReader(
"dn: ou=People,dc=example,dc=com",
"changetype: modrdn",
- "newrdn: ou=Human Resources,dc=example,dc=com",
+ "newrdn: ou=Human Resources",
"deleteoldrdn: 1"
);
// @formatter:on
@@ -2012,7 +2012,7 @@
final LDIFChangeRecordReader patch = new LDIFChangeRecordReader(
"dn: ou=People,dc=example,dc=com",
"changetype: modrdn",
- "newrdn: ou=Human Resources,dc=example,dc=com",
+ "newrdn: ou=Human Resources",
"deleteoldrdn: 0"
);
// @formatter:on
@@ -2582,7 +2582,7 @@
final LDIFChangeRecordReader patch = new LDIFChangeRecordReader(
"dn: ou=WRONGscarter, dc=example,dc=com",
"changetype: modrdn",
- "newrdn: ou=Human Resources,dc=example,dc=com",
+ "newrdn: ou=Human Resources",
"deleteoldrdn: 1"
);
// @formatter:on
@@ -2684,7 +2684,7 @@
final LDIFChangeRecordReader patch = new LDIFChangeRecordReader(
"dn: uid=scarter,ou=People,dc=example,dc=com",
"changetype: moddn",
- "newrdn: uid=user.2,ou=People,dc=example,dc=com",
+ "newrdn: uid=user.2",
"deleteoldrdn: 0"
);
// @formatter:on
--
Gitblit v1.10.0