From 0d88ba4b58e27627ac2cb852d14fe91a0174c6dc Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 03 Sep 2013 13:08:51 +0000
Subject: [PATCH] LDAPreplicationDomain.java: Reverted if statement conditions to do early exit in loops or methods. Reduced variable scopes. Moved clearJEBackend() to TestCaseUtils and renamed it clearJEBackend2(). Extracted method allOperationalAttributes. Increased vertical density.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
index bd1c796..6ef92a4 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReSyncTest.java
@@ -27,10 +27,6 @@
*/
package org.opends.server.replication;
-import static org.opends.server.loggers.ErrorLogger.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import static org.testng.Assert.*;
-
import java.io.File;
import java.util.UUID;
@@ -41,7 +37,6 @@
import org.opends.server.core.AddOperationBasis;
import org.opends.server.loggers.debug.DebugTracer;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.opends.server.replication.plugin.LDAPReplicationDomain;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.ResultCode;
@@ -49,12 +44,16 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import static org.opends.server.loggers.ErrorLogger.*;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.testng.Assert.*;
+
/**
* Test re-synchronization after after backup/restore and LDIF import.
*/
public class ReSyncTest extends ReplicationTestCase
{
- // The tracer object for the debug logger
+ /** The tracer object for the debug logger */
private static final DebugTracer TRACER = getTracer();
private void debugInfo(String s)
@@ -66,8 +65,7 @@
}
}
- protected static final String EXAMPLE_DN = "dc=example,dc=com";
-
+ private static final String EXAMPLE_DN = "dc=example,dc=com";
private File reSyncTempDir;
/**
@@ -95,8 +93,7 @@
// re-enabled and this clears the backend reference and thus the underlying
// data. So for this particular test, we use a classical backend. Let's
// clear it and create the root entry
-
- LDAPReplicationDomain.clearJEBackend(false, "userRoot", EXAMPLE_DN);
+ TestCaseUtils.clearJEBackend2(false, "userRoot", EXAMPLE_DN);
addEntry("dn: dc=example,dc=com\n" + "objectClass: top\n"
+ "objectClass: domain\n");
@@ -268,9 +265,7 @@
callParanoiaCheck = false;
super.classCleanUp();
- // Clear the backend
- LDAPReplicationDomain.clearJEBackend(false, "userRoot", EXAMPLE_DN);
-
+ TestCaseUtils.clearJEBackend2(false, "userRoot", EXAMPLE_DN);
TestCaseUtils.deleteDirectory(reSyncTempDir);
paranoiaCheck();
--
Gitblit v1.10.0