From d94f6d23898f7515e969517f85b8e626667a1e02 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 19 Sep 2014 08:56:38 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1536: Rename ErrorResultException to LdapException and remove ErrorResultIOException
---
opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/ConnectionFactoryTestCase.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 9e878f6..58fcbbc 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
@@ -22,7 +22,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
- * Portions copyright 2011-2014 ForgeRock AS
+ * Portions Copyright 2011-2014 ForgeRock AS
*/
package org.forgerock.opendj.grizzly;
@@ -45,7 +45,7 @@
import org.forgerock.opendj.ldap.ConnectionPool;
import org.forgerock.opendj.ldap.Connections;
import org.forgerock.opendj.ldap.DN;
-import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.ldap.FailoverLoadBalancingAlgorithm;
import org.forgerock.opendj.ldap.FutureResult;
import org.forgerock.opendj.ldap.IntermediateResponseHandler;
@@ -87,7 +87,7 @@
import static org.fest.assertions.Assertions.*;
import static org.forgerock.opendj.ldap.Connections.*;
-import static org.forgerock.opendj.ldap.ErrorResultException.*;
+import static org.forgerock.opendj.ldap.LdapException.*;
import static org.forgerock.opendj.ldap.FutureResultWrapper.*;
import static org.forgerock.opendj.ldap.TestCaseUtils.*;
import static org.mockito.Matchers.*;
@@ -262,7 +262,7 @@
*/
@Test(dataProvider = "connectionFactories", timeOut = TEST_TIMEOUT_MS)
public void testBlockingFutureNoHandler(ConnectionFactory factory) throws Exception {
- final Promise<? extends Connection, ErrorResultException> promise = factory.getConnectionAsync();
+ final Promise<? extends Connection, LdapException> promise = factory.getConnectionAsync();
final Connection con = promise.get();
// quickly check if it is a valid connection.
// Don't use a result handler.
@@ -278,7 +278,7 @@
@Test(dataProvider = "connectionFactories", timeOut = TEST_TIMEOUT_MS)
public void testNonBlockingFutureWithHandler(ConnectionFactory factory) throws Exception {
// Use the handler to get the result asynchronously.
- final PromiseImpl<Connection, ErrorResultException> promise = PromiseImpl.create();
+ final PromiseImpl<Connection, LdapException> promise = PromiseImpl.create();
factory.getConnectionAsync().onSuccess(new SuccessHandler<Connection>() {
@Override
@@ -286,10 +286,10 @@
con.close();
promise.handleResult(con);
}
- }).onFailure(new FailureHandler<ErrorResultException>() {
+ }).onFailure(new FailureHandler<LdapException>() {
@Override
- public void handleError(ErrorResultException error) {
+ public void handleError(LdapException error) {
promise.handleError(error);
}
--
Gitblit v1.10.0