From 368e0cc2cb1c83b249fc17d09a9092d312ae12a5 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 03 Jan 2014 09:26:36 +0000
Subject: [PATCH] Fixed a few test failures in ExternalChangeLogTest, broken after r10049. Created fake LDAP replication domains, so they can participate in the external changelog.

---
 opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java
index 85e8bd5..855d1b0 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/server/ExternalChangeLogTest.java
@@ -2587,20 +2587,31 @@
     ECLCompatTestLimits(expectedFirst, expectedLast, true);
 
     // Creates broker on o=test
-    ReplicationBroker server01 = openReplicationSession(TEST_ROOT_DN, SERVER_ID_1, 100,
-            replicationServerPort, brokerSessionTimeout);
+    ReplicationBroker server01 = null;
+    LDAPReplicationDomain domain = null;
+    try
+    {
+      server01 = openReplicationSession(TEST_ROOT_DN, SERVER_ID_1,
+          100, replicationServerPort, brokerSessionTimeout);
 
-    String user1entryUUID = "11111111-1112-1113-1114-111111111115";
+      DomainFakeCfg domainConf = newFakeCfg(TEST_ROOT_DN, SERVER_ID_1, replicationServerPort);
+      domain = startNewDomain(domainConf, null, null);
 
-    // Publish DEL
-    CSN csn1 = new CSN(TimeThread.getTime(), ts++, SERVER_ID_1);
-    DeleteMsg delMsg = newDeleteMsg("uid=" + tn + "1," + TEST_ROOT_DN_STRING,
-        csn1, user1entryUUID);
-    server01.publish(delMsg);
-    debugInfo(tn, " publishes " + delMsg.getCSN());
-    Thread.sleep(500);
+      String user1entryUUID = "11111111-1112-1113-1114-111111111115";
 
-    stop(server01);
+      // Publish DEL
+      CSN csn1 = new CSN(TimeThread.getTime(), ts++, SERVER_ID_1);
+      DeleteMsg delMsg = newDeleteMsg("uid=" + tn + "1," + TEST_ROOT_DN_STRING,
+          csn1, user1entryUUID);
+      server01.publish(delMsg);
+      debugInfo(tn, " publishes " + delMsg.getCSN());
+      Thread.sleep(500);
+    }
+    finally
+    {
+      remove(domain);
+      stop(server01);
+    }
 
     ECLCompatTestLimits(expectedFirst, expectedLast + 1, true);
 

--
Gitblit v1.10.0