From 7ef7e59d8a70949d7c07964e826c19ea882cf04c Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 06 Apr 2016 13:09:53 +0000
Subject: [PATCH] Readability: TestCaseUtils.entryFromLdifString() => TestCaseUtils.makeEntry()

---
 opendj-server-legacy/src/test/java/org/opends/server/replication/DependencyTest.java |   46 +++++++++++++++++++++++-----------------------
 1 files changed, 23 insertions(+), 23 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 605bc01..877869e 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
@@ -114,11 +114,11 @@
        * - Configure replication server
        * - check that the last entry has been correctly added
        */
-      Entry entry = TestCaseUtils.entryFromLdifString(
-          "dn:" + TEST_ROOT_DN_STRING + "\n"
-          + "objectClass: top\n"
-          + "objectClass: organization\n"
-          + "entryuuid: " + stringUID(1) + "\n");
+      Entry entry = TestCaseUtils.makeEntry(
+          "dn:" + TEST_ROOT_DN_STRING,
+          "objectClass: top",
+          "objectClass: organization",
+          "entryuuid: " + stringUID(1));
 
       replServer = newReplicationServer(replServerId, addSequenceLength * 5 + 100, "dependencyTestAddModDelDependencyTestDb");
 
@@ -243,10 +243,10 @@
     try
     {
       // Create replication server, replication domain and broker.
-      Entry entry = TestCaseUtils.entryFromLdifString(
-          "dn:" + TEST_ROOT_DN_STRING + "\n"
-          + "objectClass: top\n"
-          + "objectClass: organization\n");
+      Entry entry = TestCaseUtils.makeEntry(
+          "dn:" + TEST_ROOT_DN_STRING,
+          "objectClass: top",
+          "objectClass: organization");
 
       CSNGenerator gen = new CSNGenerator(brokerId, 0L);
       int renamedEntryUuid = 100;
@@ -309,12 +309,12 @@
     TestCaseUtils.initializeTestBackend(false);
 
     // Create top entry with uuid
-    Entry topEntry = TestCaseUtils.entryFromLdifString(
-        "dn:" + TEST_ROOT_DN_STRING + "\n"
-         + "objectClass: top\n"
-         + "objectClass: organization\n"
-         + "o: test\n"
-         + "entryuuid: " + stringUID(1) + "\n");
+    Entry topEntry = TestCaseUtils.makeEntry(
+        "dn:" + TEST_ROOT_DN_STRING,
+         "objectClass: top",
+         "objectClass: organization",
+         "o: test",
+         "entryuuid: " + stringUID(1));
 
     MemoryBackend memoryBackend = (MemoryBackend) DirectoryServer.getBackend(TEST_BACKEND_ID);
     memoryBackend.addEntry(topEntry, null);
@@ -343,10 +343,10 @@
 
     try
     {
-      Entry entry = TestCaseUtils.entryFromLdifString(
-          "dn:" + TEST_ROOT_DN_STRING + "\n"
-          + "objectClass: top\n"
-          + "objectClass: organization\n");
+      Entry entry = TestCaseUtils.makeEntry(
+          "dn:" + TEST_ROOT_DN_STRING,
+          "objectClass: top",
+          "objectClass: organization");
 
       replServer = newReplicationServer(replServerId, 5 * addSequenceLength + 100, "dependencyTestAddDelAddDependencyTestDb");
 
@@ -447,10 +447,10 @@
 
     try
     {
-      Entry entry = TestCaseUtils.entryFromLdifString(
-          "dn:" + TEST_ROOT_DN_STRING + "\n"
-          + "objectClass: top\n"
-          + "objectClass: organization\n");
+      Entry entry = TestCaseUtils.makeEntry(
+          "dn:" + TEST_ROOT_DN_STRING,
+          "objectClass: top",
+          "objectClass: organization");
 
       replServer = newReplicationServer(replServerId, 5 * addSequenceLength + 100, "dependencyTestAddModdnDependencyTestDb");
 

--
Gitblit v1.10.0