From 3d4c0acccda6e62b23f248d75c1cc6721fc20bdf Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 07 Jun 2016 13:51:21 +0000
Subject: [PATCH] OPENDJ-3037 inlined DirectoryServer.getAttributeType(String)
---
opendj-server-legacy/src/test/java/org/opends/server/replication/DependencyTest.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/DependencyTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/DependencyTest.java
index 5b7689b..3f4a8ef 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/DependencyTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/DependencyTest.java
@@ -24,6 +24,7 @@
import org.forgerock.opendj.config.server.ConfigException;
import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.DN;
import org.opends.server.TestCaseUtils;
import org.opends.server.backends.MemoryBackend;
import org.opends.server.core.DirectoryServer;
@@ -39,14 +40,13 @@
import org.opends.server.replication.server.ReplicationServer;
import org.opends.server.replication.service.ReplicationBroker;
import org.opends.server.types.Attributes;
-import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.Modification;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import static org.forgerock.opendj.ldap.schema.CoreSchema.*;
import static org.opends.server.TestCaseUtils.*;
-import static org.opends.server.core.DirectoryServer.*;
import static org.opends.server.util.CollectionUtils.*;
import static org.testng.Assert.*;
@@ -135,7 +135,7 @@
int sequence;
for (sequence = 1; sequence<=addSequenceLength; sequence ++)
{
- entry.removeAttribute(getAttributeType("entryuuid"));
+ entry.removeAttribute(getEntryUUIDAttributeType());
entry.addAttribute(Attributes.create("entryuuid", stringUID(sequence+1)),
new LinkedList<ByteString>());
addDN = DN.valueOf("dc=dependency" + sequence + "," + addDN);
@@ -262,7 +262,7 @@
baseDN, brokerId, 1000, replServer.getReplicationPort(), 1000, CLEAN_DB_GENERATION_ID);
// add an entry to play with.
- entry.removeAttribute(getAttributeType("entryuuid"));
+ entry.removeAttribute(getEntryUUIDAttributeType());
entry.addAttribute(Attributes.create("entryuuid",
stringUID(renamedEntryUuid)),
new LinkedList<ByteString>());
@@ -362,7 +362,7 @@
for (sequence = 1; sequence<=addSequenceLength; sequence ++)
{
// add the entry a first time
- entry.removeAttribute(getAttributeType("entryuuid"));
+ entry.removeAttribute(getEntryUUIDAttributeType());
entry.addAttribute(Attributes.create("entryuuid", stringUID(sequence+1)),
new LinkedList<ByteString>());
DN addDN = DN.valueOf("dc=dependency" + sequence + "," + TEST_ROOT_DN_STRING);
@@ -370,7 +370,7 @@
broker.publish(delMsg(addDN, sequence + 1, gen));
// add again the entry with a new entryuuid.
- entry.removeAttribute(getAttributeType("entryuuid"));
+ entry.removeAttribute(getEntryUUIDAttributeType());
entry.addAttribute(Attributes.create("entryuuid", stringUID(sequence+1025)),
new LinkedList<ByteString>());
broker.publish(addMsg(addDN, entry, sequence + 1025, 1, gen));
@@ -469,7 +469,7 @@
for (sequence = 1; sequence<=addSequenceLength; sequence ++)
{
// add the entry
- entry.removeAttribute(getAttributeType("entryuuid"));
+ entry.removeAttribute(getEntryUUIDAttributeType());
entry.addAttribute(Attributes.create("entryuuid", stringUID(sequence+1)),
new LinkedList<ByteString>());
addDN = DN.valueOf("dc=dependency" + sequence + "," + TEST_ROOT_DN_STRING);
--
Gitblit v1.10.0