From bdc5fa0dd0980eb9e077ae80644504705a24e035 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Mon, 07 Nov 2016 13:59:40 +0000
Subject: [PATCH] OPENDJ-3179: Migrate LDAP Connection Handler to SDK Grizzly transport
---
opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java
index 0d1933b..7660605 100644
--- a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java
+++ b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java
@@ -20,6 +20,7 @@
import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
import static org.fest.assertions.Assertions.assertThat;
+import static org.forgerock.opendj.ldap.LDAPListener.*;
import static org.forgerock.opendj.ldap.Connections.*;
import static org.forgerock.opendj.ldap.LDAPConnectionFactory.*;
import static org.forgerock.opendj.ldap.LdapException.newLdapException;
@@ -34,6 +35,7 @@
import java.net.InetSocketAddress;
import java.util.Arrays;
+import java.util.Collections;
import java.util.concurrent.Callable;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -90,6 +92,8 @@
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import com.forgerock.reactive.ServerConnectionFactoryAdapter;
+
/**
* Tests the {@code ConnectionFactory} classes.
*/
@@ -544,11 +548,12 @@
}
});
- LDAPListener listener = new LDAPListener(new InetSocketAddress("127.0.0.1", 0), mockServer);
+ LDAPListener listener = new LDAPListener(Collections.singleton(loopbackWithDynamicPort()),
+ new ServerConnectionFactoryAdapter(Options.defaultOptions().get(LDAP_DECODE_OPTIONS), mockServer));
+ final InetSocketAddress listenerAddr = listener.getSocketAddresses().iterator().next();
try {
- LDAPConnectionFactory clientFactory = new LDAPConnectionFactory(
- ((InetSocketAddress) listener.getSocketAddresses().iterator().next()).getHostName(),
- ((InetSocketAddress) listener.getSocketAddresses().iterator().next()).getPort());
+ LDAPConnectionFactory clientFactory = new LDAPConnectionFactory(listenerAddr.getHostName(),
+ listenerAddr.getPort());
final Connection client = clientFactory.getConnection();
connectLatch.await(TEST_TIMEOUT, TimeUnit.SECONDS);
MockConnectionEventListener mockListener = null;
@@ -627,12 +632,12 @@
}
});
- LDAPListener listener = new LDAPListener(new InetSocketAddress("127.0.0.1", 0), mockServer);
+ LDAPListener listener = new LDAPListener(Collections.singleton(loopbackWithDynamicPort()),
+ new ServerConnectionFactoryAdapter(Options.defaultOptions().get(LDAP_DECODE_OPTIONS), mockServer));
+ final InetSocketAddress listenerAddr = listener.getSocketAddresses().iterator().next();
try {
- LDAPConnectionFactory clientFactory =
- new LDAPConnectionFactory(
- listener.getSocketAddresses().iterator().next().getHostName(),
- listener.getSocketAddresses().iterator().next().getPort());
+ LDAPConnectionFactory clientFactory = new LDAPConnectionFactory(listenerAddr.getHostName(),
+ listenerAddr.getPort());
final Connection client = clientFactory.getConnection();
connectLatch.await(TEST_TIMEOUT, TimeUnit.SECONDS);
try {
--
Gitblit v1.10.0