From 34e3f5716b8090d80101d2bef6ac92b50df905ba Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 14 Oct 2013 09:01:50 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-175: Decouple OpenDJ LDAP SDK from Grizzly
---
opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPConnectionFactory.java | 3 ++-
opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicTransportProvider.java | 2 --
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPConnectionFactory.java b/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPConnectionFactory.java
index 9099ca4..fa09dc0 100644
--- a/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPConnectionFactory.java
+++ b/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPConnectionFactory.java
@@ -27,6 +27,7 @@
package com.forgerock.opendj.ldap;
import static org.forgerock.opendj.ldap.ErrorResultException.*;
+import static org.mockito.Mockito.*;
import java.net.SocketAddress;
@@ -80,7 +81,7 @@
final ResultHandler<? super Connection> handler) {
final AsynchronousFutureResult<Connection, ResultHandler<? super Connection>> future =
new AsynchronousFutureResult<Connection, ResultHandler<? super Connection>>(handler);
- future.handleResult(org.mockito.Mockito.mock(Connection.class));
+ future.handleResult(mock(Connection.class));
return future;
}
diff --git a/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicTransportProvider.java b/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicTransportProvider.java
index 13f0194..3444aab 100644
--- a/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicTransportProvider.java
+++ b/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicTransportProvider.java
@@ -55,7 +55,6 @@
@Override
public LDAPConnectionFactoryImpl getLDAPConnectionFactory(SocketAddress address, LDAPOptions options) {
return new BasicLDAPConnectionFactory(address, options);
- //return null;
}
/** {@inheritDoc} */
@@ -65,7 +64,6 @@
ServerConnectionFactory<LDAPClientContext, Integer> factory,
LDAPListenerOptions options)
throws IOException {
- //return null;
return new BasicLDAPListener(address, factory, options);
}
--
Gitblit v1.10.0