From f2090c0d863b07e3bad8d16a3efddfad6ff77960 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 08 Oct 2013 14:16:54 +0000
Subject: [PATCH] Fix OPENDJ-346 Consider using java.util.ServiceLoader for loading extensions and requesting transport implementations This a a part of OPENDJ-175 - Decouple OpenDJ LDAP SDK from Grizzly CR-2440
---
opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/GrizzlyLDAPConnectionTestCase.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPConnectionTestCase.java b/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/GrizzlyLDAPConnectionTestCase.java
similarity index 91%
rename from opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPConnectionTestCase.java
rename to opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/GrizzlyLDAPConnectionTestCase.java
index 5924e23..c1b271d 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/LDAPConnectionTestCase.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/com/forgerock/opendj/ldap/GrizzlyLDAPConnectionTestCase.java
@@ -38,7 +38,6 @@
import org.forgerock.opendj.ldap.ErrorResultException;
import org.forgerock.opendj.ldap.LDAPConnectionFactory;
import org.forgerock.opendj.ldap.LDAPListener;
-import org.forgerock.opendj.ldap.LDAPOptions;
import org.forgerock.opendj.ldap.RequestHandler;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.SearchResultHandler;
@@ -55,7 +54,7 @@
* Tests LDAP connection implementation class.
*/
@SuppressWarnings("javadoc")
-public class LDAPConnectionTestCase extends LDAPTestCase {
+public class GrizzlyLDAPConnectionTestCase extends LDAPTestCase {
/**
* Tests that a normal request is subject to client side timeout checking.
@@ -84,16 +83,16 @@
@SuppressWarnings("unchecked")
LDAPListener listener =
new LDAPListener(address, Connections
- .newServerConnectionFactory(mock(RequestHandler.class)));
+ .newServerConnectionFactory(mock(RequestHandler.class)),
+ TestCaseUtils.getLDAPListenerTestOptions());
/*
* Use a very long time out in order to prevent the timeout thread from
* triggering the timeout.
*/
- LDAPConnectionFactory factory =
- new LDAPConnectionFactory(address, new LDAPOptions().setTimeout(100,
- TimeUnit.SECONDS));
- LDAPConnection connection = (LDAPConnection) factory.getConnection();
+ LDAPConnectionFactory factory = new LDAPConnectionFactory(address,
+ TestCaseUtils.getLDAPTestOptions().setTimeout(100, TimeUnit.SECONDS));
+ GrizzlyLDAPConnection connection = (GrizzlyLDAPConnection) factory.getConnection();
try {
SearchRequest request =
Requests.newSearchRequest("dc=test", SearchScope.BASE_OBJECT, "(objectClass=*)");
--
Gitblit v1.10.0