From 801602d7fa0aba9e5987683d26725daf91885c18 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 10 Jul 2015 08:26:35 +0000
Subject: [PATCH] Code cleanup
---
opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestBackendImpl.java | 37 +++++++++++++++++--------------------
1 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestBackendImpl.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestBackendImpl.java
index b81ae92..dbbda89 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestBackendImpl.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/jeb/TestBackendImpl.java
@@ -26,8 +26,6 @@
*/
package org.opends.server.backends.jeb;
-import static org.opends.server.schema.SchemaConstants.*;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStream;
@@ -89,6 +87,7 @@
import static org.opends.server.backends.pluggable.SuffixContainer.*;
import static org.opends.server.protocols.internal.InternalClientConnection.*;
import static org.opends.server.protocols.internal.Requests.*;
+import static org.opends.server.schema.SchemaConstants.*;
import static org.opends.server.types.Attributes.*;
import static org.opends.server.util.StaticUtils.*;
import static org.testng.Assert.*;
@@ -933,7 +932,6 @@
Entry entry;
Entry newEntry;
EntryID entryID;
- AttributeType attribute;
AttributeIndex titleIndex;
AttributeIndex nameIndex;
Set<ByteString> addKeys;
@@ -947,29 +945,20 @@
List<Modification> modifications = new ArrayList<>();
modifications.add(new Modification(ADD, create("title", "debugger")));
- AttributeBuilder builder = new AttributeBuilder("title");
- builder.setOption("lang-en");
- builder.add("debugger2");
-
- modifications.add(new Modification(ADD, builder.toAttribute()));
+ Attribute attr = attributeWithOption("title", "debugger2", "lang-en");
+ modifications.add(new Modification(ADD, attr));
modifications.add(new Modification(DELETE, create("cn", "Aaren Atp")));
modifications.add(new Modification(ADD, create("cn", "Aaren Rigor")));
modifications.add(new Modification(ADD, create("cn", "Aarenister Rigor")));
- builder = new AttributeBuilder("givenname");
- builder.add("test");
- builder.setOption("lang-de");
- modifications.add(new Modification(ADD, builder.toAttribute()));
+ attr = attributeWithOption("givenname", "test", "lang-de");
+ modifications.add(new Modification(ADD, attr));
- builder = new AttributeBuilder("givenname");
- builder.add("test2");
- builder.setOption("lang-cn");
- modifications.add(new Modification(DELETE, builder.toAttribute()));
+ attr = attributeWithOption("givenname", "test2", "lang-cn");
+ modifications.add(new Modification(DELETE, attr));
- builder = new AttributeBuilder("givenname");
- builder.add("newtest3");
- builder.setOption("lang-es");
- modifications.add(new Modification(REPLACE, builder.toAttribute()));
+ attr = attributeWithOption("givenname", "newtest3", "lang-es");
+ modifications.add(new Modification(REPLACE, attr));
modifications.add(new Modification(REPLACE, create("employeenumber", "222")));
newEntry = entries.get(1);
@@ -1061,6 +1050,14 @@
}
}
+ private Attribute attributeWithOption(String attributeName, String value, String option)
+ {
+ AttributeBuilder builder = new AttributeBuilder(attributeName);
+ builder.add(value);
+ builder.setOption(option);
+ return builder.toAttribute();
+ }
+
@Test(dependsOnMethods = {"testAdd", "testSearchIndex", "testSearchScope",
"testMatchedDN"})
public void testModifyDN() throws Exception {
--
Gitblit v1.10.0