From ee36239ae6c752a99c35508635701fae802a3e56 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 23 Jun 2015 09:28:18 +0000
Subject: [PATCH] Fixed unit tests after r12545
---
opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ChangeNumberIndexerTest.java | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ChangeNumberIndexerTest.java b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ChangeNumberIndexerTest.java
index 0218148..973d8f0 100644
--- a/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ChangeNumberIndexerTest.java
+++ b/opendj-sdk/opendj-server-legacy/src/test/java/org/opends/server/replication/server/changelog/file/ChangeNumberIndexerTest.java
@@ -54,7 +54,6 @@
import org.opends.server.replication.server.changelog.file.ECLEnabledDomainPredicate;
import org.opends.server.replication.server.changelog.file.MultiDomainDBCursor;
import org.opends.server.types.DN;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -90,7 +89,6 @@
private static final class ReplicatedUpdateMsg extends UpdateMsg
{
-
private final DN baseDN;
private final boolean emptyCursor;
@@ -116,7 +114,6 @@
return emptyCursor;
}
- /** {@inheritDoc} */
@Override
public String toString()
{
@@ -153,24 +150,18 @@
@BeforeClass
public static void classSetup() throws Exception
{
- TestCaseUtils.startFakeServer();
+ TestCaseUtils.startServer();
BASE_DN1 = DN.valueOf("dc=example,dc=com");
BASE_DN2 = DN.valueOf("dc=world,dc=company");
ADMIN_DATA_DN = DN.valueOf("cn=admin data");
}
- @AfterClass
- public static void classTearDown() throws Exception
- {
- TestCaseUtils.shutdownFakeServer();
- }
-
@BeforeMethod
public void setup() throws Exception
{
MockitoAnnotations.initMocks(this);
- CursorOptions options = new CursorOptions(LESS_THAN_OR_EQUAL_TO_KEY, AFTER_MATCHING_KEY);
+ CursorOptions options = new CursorOptions(LESS_THAN_OR_EQUAL_TO_KEY, ON_MATCHING_KEY, null);
multiDomainCursor = new MultiDomainDBCursor(domainDB, options);
initialState = new ChangelogState();
replicaDBCursors = new HashMap<ReplicaId, SequentialDBCursor>();
@@ -563,7 +554,7 @@
if (predicate.isECLEnabledDomain(baseDN))
{
- CursorOptions options = new CursorOptions(LESS_THAN_OR_EQUAL_TO_KEY, AFTER_MATCHING_KEY);
+ CursorOptions options = new CursorOptions(LESS_THAN_OR_EQUAL_TO_KEY, ON_MATCHING_KEY, null);
DomainDBCursor domainDBCursor = domainDBCursors.get(baseDN);
if (domainDBCursor == null)
{
--
Gitblit v1.10.0