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/ReSyncTest.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/replication/ReSyncTest.java b/opendj-server-legacy/src/test/java/org/opends/server/replication/ReSyncTest.java
index 8246b6d..dc635b9 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/replication/ReSyncTest.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/replication/ReSyncTest.java
@@ -70,8 +70,9 @@
// data. So for this particular test, we use a classical backend. Let's
// clear it and create the root entry
TestCaseUtils.clearBackend("userRoot");
- addEntry("dn: dc=example,dc=com\n" + "objectClass: top\n"
- + "objectClass: domain\n");
+ addEntry("dn: dc=example,dc=com",
+ "objectClass: top",
+ "objectClass: domain");
// Change log
String replServerLdif =
@@ -100,21 +101,22 @@
Thread.sleep(1000);
// Create a dummy entry
- addEntry("dn: dc=dummy," + EXAMPLE_DN + "\n"
- + "objectClass: top\n" + "objectClass: domain\n");
+ addEntry("dn: dc=dummy," + EXAMPLE_DN,
+ "objectClass: top",
+ "objectClass: domain");
}
/**
* Utility function. Can be used to create and add and entry
* in the local DS from its ldif description.
*
- * @param entryString The entry in ldif from.
+ * @param ldif The entry in ldif from.
* @return The ResultCode of the operation.
* @throws Exception If something went wrong.
*/
- private ResultCode addEntry(String entryString) throws Exception
+ private ResultCode addEntry(String... ldif) throws Exception
{
- Entry entry = TestCaseUtils.entryFromLdifString(entryString);
+ Entry entry = TestCaseUtils.makeEntry(ldif);
AddOperation addOp = connection.processAdd(entry);
entriesToCleanup.add(entry.getName());
return addOp.getResultCode();
@@ -146,8 +148,9 @@
+ "ds-task-backup-all: TRUE\n");
debugInfo("testResyncAfterRestore: backup done");
- addEntry("dn: dc=fooUniqueName1," + EXAMPLE_DN + "\n"
- + "objectClass: top\n" + "objectClass: domain\n");
+ addEntry("dn: dc=fooUniqueName1," + EXAMPLE_DN,
+ "objectClass: top",
+ "objectClass: domain");
debugInfo("testResyncAfterRestore: entry added");
task("dn: ds-task-id=" + UUID.randomUUID() + ",cn=Scheduled Tasks,cn=Tasks\n"
@@ -193,8 +196,9 @@
+ "ds-task-export-ldif-file: " + path + "\n");
debugInfo("testResyncAfterImport: export done");
- addEntry("dn: dc=fooUniqueName2," + EXAMPLE_DN + "\n"
- + "objectClass: top\n" + "objectClass: domain\n");
+ addEntry("dn: dc=fooUniqueName2," + EXAMPLE_DN,
+ "objectClass: top",
+ "objectClass: domain");
debugInfo("testResyncAfterImport: entry added");
task("dn: ds-task-id=" + UUID.randomUUID() + ",cn=Scheduled Tasks,cn=Tasks\n"
--
Gitblit v1.10.0