From 5cd7bdbbda0fa9f1aa6e12d9171c3811b73feb07 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 09 Jul 2015 14:01:31 +0000
Subject: [PATCH] Code cleanup

---
 opendj-server-legacy/src/test/java/org/opends/server/api/PasswordValidatorTestCase.java |   28 +++++++---------------------
 1 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/opendj-server-legacy/src/test/java/org/opends/server/api/PasswordValidatorTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/api/PasswordValidatorTestCase.java
index a0e7e8d..02bf681 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/api/PasswordValidatorTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/api/PasswordValidatorTestCase.java
@@ -440,10 +440,8 @@
     BindResponseProtocolOp bindResponse = message.getBindResponseProtocolOp();
     assertEquals(bindResponse.getResultCode(), 0);
 
+    LDAPAttribute attr = new LDAPAttribute("userPassword", "newPassword");
     ArrayList<RawModification> mods = new ArrayList<>();
-    ArrayList<ByteString> values = new ArrayList<>();
-    values.add(ByteString.valueOf("newPassword"));
-    LDAPAttribute attr = new LDAPAttribute("userPassword", values);
     mods.add(new LDAPModification(ModificationType.REPLACE, attr));
 
     ModifyRequestProtocolOp modifyRequest =
@@ -509,9 +507,7 @@
     assertEquals(bindResponse.getResultCode(), 0);
 
     ArrayList<RawModification> mods = new ArrayList<>();
-    ArrayList<ByteString> values = new ArrayList<>();
-    values.add(ByteString.valueOf("newPassword"));
-    LDAPAttribute attr = new LDAPAttribute("userPassword", values);
+    LDAPAttribute attr = new LDAPAttribute("userPassword", "newPassword");
     mods.add(new LDAPModification(ModificationType.REPLACE, attr));
 
     TestPasswordValidator.setNextReturnValue(false);
@@ -580,15 +576,11 @@
     BindResponseProtocolOp bindResponse = message.getBindResponseProtocolOp();
     assertEquals(bindResponse.getResultCode(), 0);
 
+    LDAPAttribute attr = new LDAPAttribute("userPassword", "password");
     ArrayList<RawModification> mods = new ArrayList<>();
-    ArrayList<ByteString> values = new ArrayList<>();
-    values.add(ByteString.valueOf("password"));
-    LDAPAttribute attr = new LDAPAttribute("userPassword", values);
     mods.add(new LDAPModification(ModificationType.DELETE, attr));
 
-    values = new ArrayList<>();
-    values.add(ByteString.valueOf("newPassword"));
-    attr = new LDAPAttribute("userPassword", values);
+    attr = new LDAPAttribute("userPassword", "newPassword");
     mods.add(new LDAPModification(ModificationType.ADD, attr));
 
     ModifyRequestProtocolOp modifyRequest =
@@ -659,10 +651,8 @@
     BindResponseProtocolOp bindResponse = message.getBindResponseProtocolOp();
     assertEquals(bindResponse.getResultCode(), 0);
 
+    LDAPAttribute attr = new LDAPAttribute("userPassword", "newPassword");
     ArrayList<RawModification> mods = new ArrayList<>();
-    ArrayList<ByteString> values = new ArrayList<>();
-    values.add(ByteString.valueOf("newPassword"));
-    LDAPAttribute attr = new LDAPAttribute("userPassword", values);
     mods.add(new LDAPModification(ModificationType.REPLACE, attr));
 
     ModifyRequestProtocolOp modifyRequest =
@@ -733,15 +723,11 @@
     BindResponseProtocolOp bindResponse = message.getBindResponseProtocolOp();
     assertEquals(bindResponse.getResultCode(), 0);
 
+    LDAPAttribute attr = new LDAPAttribute("userPassword", "password");
     ArrayList<RawModification> mods = new ArrayList<>();
-    ArrayList<ByteString> values = new ArrayList<>();
-    values.add(ByteString.valueOf("password"));
-    LDAPAttribute attr = new LDAPAttribute("userPassword", values);
     mods.add(new LDAPModification(ModificationType.DELETE, attr));
 
-    values = new ArrayList<>();
-    values.add(ByteString.valueOf("newPassword"));
-    attr = new LDAPAttribute("userPassword", values);
+    attr = new LDAPAttribute("userPassword", "newPassword");
     mods.add(new LDAPModification(ModificationType.ADD, attr));
 
     ModifyRequestProtocolOp modifyRequest =

--
Gitblit v1.10.0