From a11a0561f324860f1381a3b57212e20ede1ad05f Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 03 Sep 2015 14:06:47 +0000
Subject: [PATCH] Fix randomness in ChangelogBackendTestCase
---
opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
index 6768755..1581ded 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/ChangelogBackendTestCase.java
@@ -52,6 +52,7 @@
import java.util.SortedSet;
import java.util.concurrent.Callable;
+import org.assertj.core.api.SoftAssertions;
import org.forgerock.i18n.slf4j.LocalizedLogger;
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ModificationType;
@@ -1119,7 +1120,7 @@
}
private InternalSearchOperation searchChangelog(final SearchRequest request, final int expectedNbEntries,
- ResultCode expectedResultCode, String testName) throws Exception
+ final ResultCode expectedResultCode, String testName) throws Exception
{
TestTimer timer = new TestTimer.Builder()
.maxSleep(5, SECONDS)
@@ -1131,15 +1132,18 @@
public InternalSearchOperation call() throws Exception
{
InternalSearchOperation searchOp = connection.processSearch(request);
- assertThat(searchOp.getSearchEntries()).hasSize(expectedNbEntries);
+
+ final SoftAssertions softly = new SoftAssertions();
+ softly.assertThat(searchOp.getResultCode()).as(searchOp.getErrorMessage().toString())
+ .isEqualTo(expectedResultCode);
+ softly.assertThat(searchOp.getSearchEntries()).hasSize(expectedNbEntries);
+ softly.assertAll();
+
return searchOp;
}
});
- final List<SearchResultEntry> entries = searchOp.getSearchEntries();
- assertThat(entries).hasSize(expectedNbEntries);
- debugAndWriteEntries(getLDIFWriter(), entries, testName);
- waitForSearchOpResult(searchOp, expectedResultCode);
+ debugAndWriteEntries(getLDIFWriter(), searchOp.getSearchEntries(), testName);
return searchOp;
}
--
Gitblit v1.10.0