From 9ddd1c3c61e88d6b0eaac1394b95f0fafa07a216 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 13 Jul 2015 09:59:22 +0000
Subject: [PATCH] Used CollectionUtils.newArrayList() and newLinkedList().
---
opendj-server-legacy/src/test/java/org/opends/server/plugins/SambaPasswordPluginTestCase.java | 96 ++++++++++++++++-------------------------------
1 files changed, 33 insertions(+), 63 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/SambaPasswordPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/SambaPasswordPluginTestCase.java
index 21b422c..e074e8e 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/SambaPasswordPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/SambaPasswordPluginTestCase.java
@@ -26,6 +26,8 @@
*/
package org.opends.server.plugins;
+import static org.opends.server.protocols.internal.InternalClientConnection.*;
+import static org.opends.server.util.CollectionUtils.*;
import static org.opends.server.util.StaticUtils.*;
import static org.testng.Assert.*;
@@ -139,16 +141,13 @@
* Samba administrative user needs a permission to manipulate user accounts.
* Hence, we add a very permissive ACI.
*/
- InternalClientConnection conn = InternalClientConnection.getRootConnection();
- LinkedList<Modification> mods = new LinkedList<>();
-
- mods.add(new Modification(ModificationType.ADD, Attributes.create("aci",
+ LinkedList<Modification> mods =
+ newLinkedList(new Modification(ModificationType.ADD, Attributes.create("aci",
"(target=\"ldap:///uid=*,o=test\")(targetattr=\"*\")"
+ "(version 3.0; acl \"Samba admin\"; allow (all) "
+ "userdn=\"ldap:///cn=samba admin,o=test\";)")));
- ModifyOperation modOp = conn.processModify(DN.valueOf("o=test"), mods);
-
+ ModifyOperation modOp = getRootConnection().processModify(DN.valueOf("o=test"), mods);
assertEquals(modOp.getResultCode(), ResultCode.SUCCESS);
}
@@ -220,15 +219,10 @@
TestCaseUtils.addEntry(testEntry);
// Perform the modify operation
- InternalClientConnection conn = InternalClientConnection.getRootConnection();
+ LinkedList<Modification> mods = newLinkedList(
+ new Modification(ModificationType.REPLACE, Attributes.create("userPassword", "password")));
- LinkedList<Modification> mods = new LinkedList<>();
-
- mods.add(new Modification(ModificationType.REPLACE, Attributes.create(
- "userPassword", "password")));
-
- ModifyOperation modOp = conn.processModify(testEntry.getName(), mods);
-
+ ModifyOperation modOp = getRootConnection().processModify(testEntry.getName(), mods);
assertEquals(modOp.getResultCode(), ResultCode.SUCCESS);
// Verification of the change
@@ -299,13 +293,9 @@
InternalClientConnection conn = new InternalClientConnection(authInfo);
- LinkedList<Modification> mods = new LinkedList<>();
-
- mods.add(new Modification(ModificationType.REPLACE, Attributes.create(
- "userPassword", "password")));
-
+ LinkedList<Modification> mods = newLinkedList(
+ new Modification(ModificationType.REPLACE, Attributes.create("userPassword", "password")));
ModifyOperation modOp = conn.processModify(testEntry.getName(), mods);
-
assertEquals(modOp.getResultCode(), ResultCode.SUCCESS);
// Verification of the result
@@ -346,27 +336,18 @@
InternalClientConnection conn = new InternalClientConnection(authInfo);
- LinkedList<Modification> mods = new LinkedList<>();
-
- mods.add(new Modification(ModificationType.REPLACE, Attributes.create(
- "userPassword", "password1")));
+ LinkedList<Modification> mods = newLinkedList(
+ new Modification(ModificationType.REPLACE, Attributes.create("userPassword", "password1")));
ModifyOperation modOp = conn.processModify(testEntry.getName(), mods);
-
assertEquals(modOp.getResultCode(), ResultCode.SUCCESS);
// Verification of the result
Entry entry = DirectoryServer.getEntry(testEntry.getName());
assertNotNull(entry);
-
- List<Attribute> sambaAttribute = entry.getAttribute("sambantpassword");
-
- assertNull(sambaAttribute);
-
- sambaAttribute = entry.getAttribute("sambalmpassword");
-
- assertNull(sambaAttribute);
+ assertNull(entry.getAttribute("sambantpassword"));
+ assertNull(entry.getAttribute("sambalmpassword"));
TestCaseUtils.deleteEntry(entry);
}
@@ -393,21 +374,12 @@
TestCaseUtils.addEntry(testEntry);
// Perform the modify operation
- InternalClientConnection conn = InternalClientConnection
- .getRootConnection();
-
LinkedList<Modification> mods = new LinkedList<>();
+ mods.add(new Modification(ModificationType.ADD, Attributes.create("userPassword", "password1")));
+ mods.add(new Modification(ModificationType.ADD, Attributes.create("userPassword", "password2")));
+ mods.add(new Modification(ModificationType.ADD, Attributes.create("userPassword", "password3")));
- mods.add(new Modification(ModificationType.ADD, Attributes.create(
- "userPassword", "password1")));
- mods.add(new Modification(ModificationType.ADD, Attributes.create(
- "userPassword", "password2")));
-
- mods.add(new Modification(ModificationType.ADD, Attributes.create(
- "userPassword", "password3")));
-
- ModifyOperation modOp = conn.processModify(testEntry.getName(), mods);
-
+ ModifyOperation modOp = getRootConnection().processModify(testEntry.getName(), mods);
assertEquals(modOp.getResultCode(), ResultCode.SUCCESS);
// Verification of the result
@@ -705,29 +677,15 @@
InternalClientConnection conn = InternalClientConnection
.getRootConnection();
- LinkedList<Modification> mods = new LinkedList<>();
-
- mods.add(new Modification(ModificationType.REPLACE, Attributes.create(
- "userPassword", "password")));
+ LinkedList<Modification> mods =
+ newLinkedList(new Modification(ModificationType.REPLACE, Attributes.create("userPassword", "password")));
ModifyOperation modOp = conn.processModify(testEntry.getName(), mods);
-
assertEquals(modOp.getResultCode(), ResultCode.SUCCESS);
Attribute sambaPwdLastSetAttr =
Attributes.create("sambapwdlastset", String.valueOf(1339012789L));
- boolean attrPresent = false;
-
- for (Modification mod : modOp.getModifications())
- {
- if (mod.getAttribute().equals(sambaPwdLastSetAttr))
- {
- attrPresent = true;
- break;
- }
- }
-
- assertTrue(attrPresent);
+ assertTrue(containsAttribute(modOp, sambaPwdLastSetAttr));
TestCaseUtils.deleteEntry(testEntry);
}
@@ -737,6 +695,18 @@
}
}
+ private boolean containsAttribute(ModifyOperation modOp, Attribute attr)
+ {
+ for (Modification mod : modOp.getModifications())
+ {
+ if (mod.getAttribute().equals(attr))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
* Test if the plugin properly updates the 'sambaPwdLastSet' attribute when
* the password is changed through the PMEO.
--
Gitblit v1.10.0