From 1047879fdacd5d6ba1ac8c301b885c8b7ec886f6 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 17 Sep 2015 15:13:57 +0000
Subject: [PATCH] Fix NPE in tests
---
opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxTestCase.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxTestCase.java
index dcbf39b..7e91197 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/jmx/JmxTestCase.java
@@ -36,7 +36,7 @@
import java.util.List;
import java.util.concurrent.Callable;
-import org.assertj.core.api.SoftAssertions;
+import org.assertj.core.api.Assertions;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
import org.opends.server.api.ConnectionHandler;
@@ -98,22 +98,14 @@
@Override
public Void call() throws Exception
{
- SoftAssertions softly = new SoftAssertions();
- softly.assertThat(rmiConnector.jmxRmiConnectorNoClientCertificate).isNotNull();
- softly.assertThat(rmiConnector.jmxRmiConnectorNoClientCertificate.isActive()).isTrue();
- softly.assertAll();
+ Assertions.assertThat(rmiConnector.jmxRmiConnectorNoClientCertificate).isNotNull();
+ Assertions.assertThat(rmiConnector.jmxRmiConnectorNoClientCertificate.isActive()).isTrue();
return null;
}
});
return jmxConnectionHandler;
}
- private boolean isReady(RmiConnector rmiConnector)
- {
- return rmiConnector.jmxRmiConnectorNoClientCertificate != null
- && rmiConnector.jmxRmiConnectorNoClientCertificate.isActive();
- }
-
private JmxConnectionHandler getJmxConnectionHandler(List<ConnectionHandler> handlers)
{
for (ConnectionHandler<?> handler : handlers)
--
Gitblit v1.10.0