From 1afa78c17309fb6f3e50cd112542c607f2a1b66b Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 29 Jul 2013 10:33:55 +0000
Subject: [PATCH] ModifyOperationTestCase.java: Expanded the scope of processAdd() to remove another 150 lines of code.
---
opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java | 351 ++++++++++++----------------------------------------------
1 files changed, 72 insertions(+), 279 deletions(-)
diff --git a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
index d9d5fdf..280f13e 100644
--- a/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
+++ b/opendj-sdk/opends/tests/unit-tests-testng/src/server/org/opends/server/core/ModifyOperationTestCase.java
@@ -657,7 +657,7 @@
public void testFailAddToSingleValuedAttribute(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -670,9 +670,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("displayName", "foo");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, add(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -691,7 +688,7 @@
public void testFailAddToSingleValuedOperationalAttribute(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -705,9 +702,6 @@
"userPassword: password",
"ds-pwp-account-disabled: true");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("ds-pwp-account-disabled", "false");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, add(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -726,7 +720,7 @@
public void testFailReplaceSingleValuedWithMultipleValues(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -739,9 +733,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("displayName", "foo", "bar");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, replace(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -761,7 +752,7 @@
String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -774,9 +765,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("ds-pwp-account-disabled", "true", "false");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, replace(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -826,12 +814,15 @@
return conn.processModify(ByteString.valueOf(entryDN), mods, requestControls);
}
- private AddOperation processAdd(Entry entry)
+ private void processAdd(String... entryLines) throws Exception
{
+ Entry entry = TestCaseUtils.makeEntry(entryLines);
InternalClientConnection conn =
InternalClientConnection.getRootConnection();
- return conn.processAdd(entry.getDN(), entry.getObjectClasses(), entry
- .getUserAttributes(), entry.getOperationalAttributes());
+ AddOperation addOperation =
+ conn.processAdd(entry.getDN(), entry.getObjectClasses(), entry
+ .getUserAttributes(), entry.getOperationalAttributes());
+ assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -846,7 +837,7 @@
public void testFailAddDuplicateValue(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -859,9 +850,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("givenName", "Test");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, add(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -880,7 +868,7 @@
public void testFailReplaceWithDuplicates(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -893,9 +881,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("description", "Foo", "Foo");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, replace(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -914,7 +899,7 @@
public void testFailReplaceWithSyntaxViolation(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -928,9 +913,6 @@
"userPassword: password",
"manager: cn=boss," + baseDN);
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("manager", "invaliddn");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, replace(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -949,7 +931,7 @@
public void testFailAddSyntaxViolation(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -962,9 +944,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("manager", "invaliddn");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, add(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -983,7 +962,7 @@
public void testFailAddDisallowedAttribute(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -996,9 +975,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("dc", "foo");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, add(attr));
assertEquals(modifyOperation.getResultCode(), ResultCode.OBJECTCLASS_VIOLATION);
@@ -1019,7 +995,7 @@
String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1032,9 +1008,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("dc", "foo");
attr = newLDAPAttribute("objectClass", "extensibleObject");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, add(attr));
@@ -1054,7 +1027,7 @@
public void testFailReplaceRDNAttribute(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1067,9 +1040,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("uid", "foo");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, replace(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1088,7 +1058,7 @@
public void testFailRemoveRDNAttribute(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1101,9 +1071,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = new LDAPAttribute("uid");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1122,7 +1089,7 @@
public void testFailRemoveRDNValue(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1135,9 +1102,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("uid", "test.user");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1156,7 +1120,7 @@
public void testFailReplaceOneOfMultipleRDNAttributes(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: givenName=Test+sn=User," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1169,9 +1133,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("givenName", "Foo");
ModifyOperation modifyOperation = processModify("givenName=Test,sn=User," + baseDN, replace(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1190,7 +1151,7 @@
public void testFailRemoveOneOfMultipleRDNValues(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: givenName=Test+sn=User," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1203,9 +1164,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = new LDAPAttribute("givenName");
ModifyOperation modifyOperation = processModify("givenName=Test,sn=User," + baseDN, delete(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1224,7 +1182,7 @@
public void testSuccessRemoveCompleteAttribute(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1237,9 +1195,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = new LDAPAttribute("displayName");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1258,7 +1213,7 @@
public void testSuccessRemoveOneOfManyValues(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1273,9 +1228,6 @@
"mail: foo",
"mail: bar");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("mail", "foo");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1294,7 +1246,7 @@
public void testSuccessRemoveOnlyValue(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1308,9 +1260,6 @@
"userPassword: password",
"mail: foo");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("mail", "foo");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1329,7 +1278,7 @@
public void testSuccessRemoveAllOfManyValues(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1344,9 +1293,6 @@
"mail: foo",
"mail: bar");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("mail", "foo", "bar");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1365,7 +1311,7 @@
public void testFailRemoveRequiredAttribute(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1378,9 +1324,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = new LDAPAttribute("sn");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1399,7 +1342,7 @@
public void testFailRemoveRequiredAttributeValue(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1412,9 +1355,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("sn", "User");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1433,7 +1373,7 @@
public void testSuccessReplaceExistingWithNew(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1447,9 +1387,6 @@
"userPassword: password",
"mail: foo");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("description", "bar");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, replace(attr));
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1468,7 +1405,7 @@
public void testSuccessReplaceExistingWithSame(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1482,9 +1419,6 @@
"userPassword: password",
"mail: foo");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("uid", "test.user");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, replace(attr));
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1523,7 +1457,7 @@
public void testSuccessDeleteAndAddSameValue(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1537,9 +1471,6 @@
"userPassword: password",
"mail: foo");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("cn", "Test User");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr), add(attr));
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1579,7 +1510,7 @@
public void testSuccessDeleteAttributeWithOption(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1595,9 +1526,6 @@
"userPassword: password",
"mail: foo");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("givenName;lang-fr", "X");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1636,7 +1564,7 @@
public void testSuccessReplaceExistingWithNothing(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1650,9 +1578,6 @@
"userPassword: password",
"mail: foo");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = new LDAPAttribute("description");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, replace(attr));
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1671,7 +1596,7 @@
public void testSuccessReplaceNonExistingWithNothing(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1684,9 +1609,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = new LDAPAttribute("description");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, replace(attr));
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1705,7 +1627,7 @@
public void testSuccessReplaceNonExistingWithNew(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1718,9 +1640,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("description", "foo");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, replace(attr));
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -1739,7 +1658,7 @@
public void testSuccessRemoveOnlyExistingAndAddNew(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1753,9 +1672,6 @@
"userPassword: password",
"mail: foo");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("mail", "foo");
LDAPAttribute attr2 = newLDAPAttribute("mail", "bar");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr), add(attr2));
@@ -1775,7 +1691,7 @@
public void testSuccessRemoveOneExistingAndAddNew(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1790,9 +1706,6 @@
"mail: foo",
"mail: bar");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("mail", "foo");
LDAPAttribute attr2 = new LDAPAttribute("mail", "baz");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr), add(attr2));
@@ -1812,7 +1725,7 @@
public void testSuccessRemoveOneExistingAndAddMultipleNew(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1826,9 +1739,6 @@
"userPassword: password",
"mail: foo");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("mail", "foo");
LDAPAttribute attr2 = newLDAPAttribute("mail", "bar", "baz");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr), add(attr2));
@@ -1848,7 +1758,7 @@
public void testFailRemoveNonExistentAttribute(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1860,9 +1770,6 @@
"cn: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = new LDAPAttribute("displayName");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1881,7 +1788,7 @@
public void testFailRemoveNonExistentValue(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1894,9 +1801,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("displayName", "Foo");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1915,7 +1819,7 @@
public void testFailRemoveAllObjectClasses(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1928,9 +1832,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = new LDAPAttribute("objectClass");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1949,7 +1850,7 @@
public void testFailReplaceObjectClassesWithNothing(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -1962,9 +1863,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = new LDAPAttribute("objectClass");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, replace(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -1983,16 +1881,13 @@
public void testFailRemoveStructuralObjectclass(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: ou=People," + baseDN,
"objectClass: top",
"objectClass: organizationalUnit",
"objectClass: extensibleObject",
"ou: People");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("objectClass", "organizationalUnit");
ModifyOperation modifyOperation = processModify("ou=People," + baseDN, delete(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -2011,16 +1906,13 @@
public void testFailAddSecondStructuralObjectClass(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: ou=People," + baseDN,
"objectClass: top",
"objectClass: organizationalUnit",
"objectClass: extensibleObject",
"ou: People");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("objectClass", "organization");
ModifyOperation modifyOperation = processModify("ou=People," + baseDN, add(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -2039,7 +1931,7 @@
public void testSuccessIncrementByOne(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2054,9 +1946,6 @@
"mail: foo",
"employeeNumber: 1");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("employeeNumber", "1");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, increment(attr));
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2081,7 +1970,7 @@
public void testSuccessIncrementByTen(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2096,9 +1985,6 @@
"mail: foo",
"employeeNumber: 1");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("employeeNumber", "10");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, increment(attr));
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2123,7 +2009,7 @@
public void testSuccessIncrementByNegativeOne(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2138,9 +2024,6 @@
"mail: foo",
"employeeNumber: 1");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("employeeNumber", "-1");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, increment(attr));
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2179,7 +2062,7 @@
public void testFailIncrementNonNumeric(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2192,9 +2075,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("displayName", "1");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, increment(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -2213,7 +2093,7 @@
public void testFailIncrementValueNonNumeric(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2227,9 +2107,6 @@
"userPassword: password",
"mail: 1");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("description", "notnumeric");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, increment(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -2248,7 +2125,7 @@
public void testSuccessIncrementMultiValued(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2263,9 +2140,6 @@
"roomNumber: 1",
"roomNumber: 2");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("roomNumber", "1");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, increment(attr));
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2284,7 +2158,7 @@
public void testFailIncrementNoIncrementValues(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2298,9 +2172,6 @@
"userPassword: password",
"roomNumber: 1");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = new LDAPAttribute("roomNumber");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, increment(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -2319,7 +2190,7 @@
public void testFailIncrementMultipleIncrementValues(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2333,9 +2204,6 @@
"userPassword: password",
"roomNumber: 1");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("roomNumber", "1", "2");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, increment(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -2354,7 +2222,7 @@
public void testFailIncrementNonExisting(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2367,9 +2235,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("employeeNumber", "1");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, increment(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -2388,7 +2253,7 @@
public void testSuccessRemoveUnneededAuxiliaryObjectClass(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2404,9 +2269,6 @@
"mail: foo",
"employeeNumber: 1");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("objectClass", "extensibleObject");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2429,7 +2291,7 @@
public void testSuccessAddAuxiliaryObjectClass(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2444,9 +2306,6 @@
"mail: foo",
"employeeNumber: 1");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("objectClass", "extensibleObject");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, add(attr));
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
@@ -2472,7 +2331,7 @@
public void testFailAddDuplicateObjectClass(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2487,9 +2346,6 @@
"mail: foo",
"employeeNumber: 1");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("objectClass", "inetOrgPerson");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, add(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -2508,7 +2364,7 @@
public void testFailRemoveNonExistingObjectClass(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2523,9 +2379,6 @@
"mail: foo",
"employeeNumber: 1");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("objectClass", "organizationalUnit");
ModifyOperation modifyOperation = processModify("uid=test.user," + baseDN, delete(attr));
assertFalse(modifyOperation.getResultCode() == ResultCode.SUCCESS);
@@ -2544,7 +2397,7 @@
public void testFailReplaceNoUserModification(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2557,10 +2410,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
-
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
@@ -2611,7 +2460,7 @@
public void testFailServerCompletelyReadOnly(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2626,10 +2475,6 @@
"mail: foo",
"employeeNumber: 1");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
-
DirectoryServer.setWritabilityMode(WritabilityMode.DISABLED);
LDAPAttribute attr = newLDAPAttribute("objectClass", "extensibleObject");
@@ -2652,7 +2497,7 @@
public void testSucceedServerInternalOnlyWritability(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2667,10 +2512,6 @@
"mail: foo",
"employeeNumber: 1");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
-
DirectoryServer.setWritabilityMode(WritabilityMode.INTERNAL_ONLY);
LDAPAttribute attr = newLDAPAttribute("objectClass", "extensibleObject");
@@ -2693,7 +2534,7 @@
public void testFailServerInternalOnlyWritability(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2708,13 +2549,8 @@
"mail: foo",
"employeeNumber: 1");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
-
DirectoryServer.setWritabilityMode(WritabilityMode.INTERNAL_ONLY);
-
Socket s = new Socket("127.0.0.1", TestCaseUtils.getServerLdapPort());
org.opends.server.tools.LDAPReader r = new org.opends.server.tools.LDAPReader(s);
LDAPWriter w = new LDAPWriter(s);
@@ -2767,7 +2603,7 @@
public void testFailBackendCompletelyReadOnly(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2782,10 +2618,6 @@
"mail: foo",
"employeeNumber: 1");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
-
Backend b = DirectoryServer.getBackend(DN.decode(baseDN));
b.setWritabilityMode(WritabilityMode.DISABLED);
@@ -2809,7 +2641,7 @@
public void testSucceedBackendInternalOnlyWritability(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2824,10 +2656,6 @@
"mail: foo",
"employeeNumber: 1");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
-
Backend b = DirectoryServer.getBackend(DN.decode(baseDN));
b.setWritabilityMode(WritabilityMode.INTERNAL_ONLY);
@@ -2851,7 +2679,7 @@
public void testFailBackendInternalOnlyWritability(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -2866,10 +2694,6 @@
"mail: foo",
"employeeNumber: 1");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
-
Backend b = DirectoryServer.getBackend(DN.decode(baseDN));
b.setWritabilityMode(WritabilityMode.INTERNAL_ONLY);
@@ -2926,7 +2750,6 @@
public void testSuccessNotifyChangeListeners()
throws Exception
{
-
TestChangeNotificationListener changeListener =
new TestChangeNotificationListener();
DirectoryServer.registerChangeNotificationListener(changeListener);
@@ -3457,7 +3280,7 @@
public void testSuccessPermissiveModifyControlAddDuplicateValue(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -3470,9 +3293,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("givenName", "Test");
List<RawModification> mods = new ArrayList<RawModification>();
@@ -3499,7 +3319,7 @@
public void testSuccessPermissiveModifyControlRemoveNonExistentValue(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -3512,9 +3332,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = newLDAPAttribute("givenName", "Foo");
List<RawModification> mods = new ArrayList<RawModification>();
@@ -3541,7 +3358,7 @@
public void testSuccessPermissiveModifyControlRemoveNonExistentAttribute(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=test.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -3554,9 +3371,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
LDAPAttribute attr = new LDAPAttribute("description");
List<RawModification> mods = new ArrayList<RawModification>();
mods.add(delete(attr));
@@ -3584,7 +3398,7 @@
public void testModifyDelAddPasswordAttribute(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=testPassword01.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -3597,10 +3411,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
-
String path = TestCaseUtils.createTempFile(
"dn: uid=testPassword01.user," + baseDN,
"changetype: modify",
@@ -3633,7 +3443,7 @@
public void testModifyDelOneAddOnePasswordAttribute(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=testPassword02.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -3646,10 +3456,6 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
-
String path = TestCaseUtils.createTempFile(
"dn: uid=testPassword02.user," + baseDN,
"changetype: modify",
@@ -3683,7 +3489,7 @@
public void testModifyDelEncryptedAddOnePasswordAttribute(String baseDN)
throws Exception
{
- Entry entry = TestCaseUtils.makeEntry(
+ processAdd(
"dn: uid=testPassword03.user," + baseDN,
"objectClass: top",
"objectClass: person",
@@ -3696,14 +3502,10 @@
"displayName: Test User",
"userPassword: password");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
Entry e = DirectoryServer.getEntry(
DN.decode("uid=testPassword03.user," + baseDN));
List<Attribute> attrList =
e.getAttribute(DirectoryServer.getAttributeType("userpassword", true));
-
assertNotNull(attrList);
String passwd = null;
@@ -3714,7 +3516,6 @@
passwd = v.toString();
}
}
-
assertNotNull(passwd);
String path = TestCaseUtils.createTempFile(
@@ -3972,13 +3773,10 @@
{
String baseDN = "dc=example,dc=com";
TestCaseUtils.clearJEBackend(true, "userRoot", baseDN);
- Entry entry = TestCaseUtils.makeEntry("dn: cn=Test User," + baseDN,
+ processAdd("dn: cn=Test User," + baseDN,
"objectClass: top", "objectClass: person",
"objectClass: organizationalPerson", "sn: User", "cn: Test User");
- AddOperation addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
// First check that adding "dc" fails because it is not allowed by
// inetOrgPerson.
LDAPAttribute attr = newLDAPAttribute("dc", "foo");
@@ -4008,13 +3806,10 @@
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
// Add new entry and modify.
- entry = TestCaseUtils.makeEntry("dn: cn=Test User2," + baseDN,
+ processAdd("dn: cn=Test User2," + baseDN,
"objectClass: top", "objectClass: person",
"objectClass: organizationalPerson", "sn: User2", "cn: Test User2");
- addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
-
modifyOperation = processModify("cn=Test User2," + baseDN, mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.SUCCESS);
}
@@ -4036,11 +3831,9 @@
assertEquals(result, 0, "Schema update failed");
// Add new entry and modify (this time it should fail).
- entry = TestCaseUtils.makeEntry("dn: cn=Test User3," + baseDN,
+ processAdd("dn: cn=Test User3," + baseDN,
"objectClass: top", "objectClass: person",
"objectClass: organizationalPerson", "sn: User3", "cn: Test User3");
- addOperation = processAdd(entry);
- assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
modifyOperation = processModify("cn=Test User3," + baseDN, mods);
assertEquals(modifyOperation.getResultCode(), ResultCode.OBJECTCLASS_VIOLATION);
--
Gitblit v1.10.0