From 64d122240ab532a8f11da2d19ac4eed3137bacdf Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Thu, 10 Jul 2014 18:49:25 +0000
Subject: [PATCH] Port improvements to unit-tests to ease troubleshooting.
---
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java | 14 +++++++++-----
opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java | 15 ++++++++-------
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
index 9823d78..4246e6c 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/monitors/InternalSearchMonitorTestCase.java
@@ -88,7 +88,8 @@
InternalSearchOperation searchOperation =
conn.processSearch(DN.valueOf("cn=monitor"), SearchScope.WHOLE_SUBTREE,
SearchFilter.createFilterFromString("(objectClass=*)"));
- assertEquals(searchOperation.getResultCode(), ResultCode.SUCCESS);
+ assertEquals(searchOperation.getResultCode(), ResultCode.SUCCESS,
+ "Failed to search cn=monitor subtree. Got error message: " + searchOperation.getErrorMessage());
}
@@ -138,7 +139,8 @@
conn.processSearch(monitorDN,
SearchScope.BASE_OBJECT,
SearchFilter.createFilterFromString("(objectClass=*)"));
- assertEquals(searchOperation.getResultCode(), ResultCode.SUCCESS);
+ assertEquals(searchOperation.getResultCode(), ResultCode.SUCCESS,
+ "Failed to read " + monitorDN + " entry. Got error message: " + searchOperation.getErrorMessage());
}
/**
@@ -157,15 +159,17 @@
InternalSearchOperation searchOperation =
conn.processSearch(DN.valueOf("cn=monitor"), SearchScope.WHOLE_SUBTREE,
SearchFilter.createFilterFromString("(objectClass=*)"));
- assertEquals(searchOperation.getResultCode(), ResultCode.SUCCESS);
+ assertEquals(searchOperation.getResultCode(), ResultCode.SUCCESS,
+ "Failed to search cn=monitor subtree. Got error message: " + searchOperation.getErrorMessage());
for (SearchResultEntry sre : searchOperation.getSearchEntries())
{
SearchFilter filter =
SearchFilter.createFilterFromString("(objectClass=*)");
- searchOperation =
+ InternalSearchOperation readOperation =
conn.processSearch(sre.getName(), SearchScope.BASE_OBJECT, filter);
- assertEquals(searchOperation.getResultCode(), ResultCode.SUCCESS);
+ assertEquals(readOperation.getResultCode(), ResultCode.SUCCESS,
+ "Failed to read " + sre.getName() + " entry. Got error message: " + readOperation.getErrorMessage());
}
}
diff --git a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
index 978d75c..b5a773c 100644
--- a/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
+++ b/opendj-sdk/opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/replication/GenerationIdTest.java
@@ -80,12 +80,12 @@
private static final String REPLICATION_GENERATION_ID = "ds-sync-generation-id";
private static final int WINDOW_SIZE = 10;
- private static final int server1ID = 1;
- private static final int server2ID = 2;
- private static final int server3ID = 3;
- private static final int replServerId1 = 11;
- private static final int replServerId2 = 12;
- private static final int replServerId3 = 13;
+ private static final int server1ID = 901;
+ private static final int server2ID = 902;
+ private static final int server3ID = 903;
+ private static final int replServerId1 = 911;
+ private static final int replServerId2 = 912;
+ private static final int replServerId3 = 913;
private DN baseDN;
private ReplicationBroker broker2;
@@ -449,7 +449,7 @@
private int getRSPort(int replServerId) throws Exception
{
- return replServerPort[replServerId - 11];
+ return replServerPort[replServerId - replServerId1];
}
private long readGenIdFromSuffixRootEntry() throws Exception
@@ -1139,6 +1139,7 @@
{
stop(broker);
postTest();
+ debugInfo("Successfully ending " + testCase);
}
}
--
Gitblit v1.10.0