From d1b411f448489865d64df06ddca0871011b8f549 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 08 Oct 2013 16:15:26 +0000
Subject: [PATCH] OPENDJ-346 Consider using java.util.ServiceLoader for loading extensions and requesting transport implementations
---
/dev/null | 47 -----------------------------------------------
opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProviderTest.java | 4 +---
2 files changed, 1 insertions(+), 50 deletions(-)
diff --git a/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProviderTest.java b/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProviderTest.java
index fc206a9..afcc9df 100644
--- a/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProviderTest.java
+++ b/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/ConnectionFactoryProviderTest.java
@@ -25,8 +25,6 @@
*/
package com.forgerock.opendj.ldap.tools;
-import static com.forgerock.opendj.ldap.tools.TestCaseUtils.getLDAPTestOptions;
-
import static org.fest.assertions.Assertions.*;
import java.io.File;
@@ -52,7 +50,7 @@
public void init() throws Exception {
MockitoAnnotations.initMocks(this);
argParser = new ArgumentParser("unused", new LocalizableMessageBuilder().toMessage(), false);
- connectionFactoryProvider = new ConnectionFactoryProvider(argParser, app, getLDAPTestOptions());
+ connectionFactoryProvider = new ConnectionFactoryProvider(argParser, app);
}
@Test
diff --git a/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/TestCaseUtils.java b/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/TestCaseUtils.java
deleted file mode 100644
index 2ff091e..0000000
--- a/opendj3/opendj-ldap-toolkit/src/test/java/com/forgerock/opendj/ldap/tools/TestCaseUtils.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2013 ForgeRock AS.
- */
-
-package com.forgerock.opendj.ldap.tools;
-
-import org.forgerock.opendj.ldap.LDAPOptions;
-
-/**
- * This class defines some utility functions which can be used by test cases.
- */
-public final class TestCaseUtils {
-
- /**
- * Returns LDAP options with the parameter {@code LDAPOptions#getClassLoader()} already
- * set to the test class loader.
- *
- * @return LDAPOptions already set with the class loader used by the test.
- * This is required if the test need to use a transport provider.
- */
- public static LDAPOptions getLDAPTestOptions() {
- return new LDAPOptions().setProviderClassLoader(Thread.currentThread().getContextClassLoader());
- }
-
-}
--
Gitblit v1.10.0