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/GrizzlyLDAPConnectionFactoryTestCase.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactoryTestCase.java b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactoryTestCase.java
index d90ed9d..24f1d7e 100644
--- a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactoryTestCase.java
+++ b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionFactoryTestCase.java
@@ -37,7 +37,7 @@
import org.forgerock.opendj.ldap.ConnectionFactory;
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.FutureResult;
import org.forgerock.opendj.ldap.IntermediateResponseHandler;
import org.forgerock.opendj.ldap.LDAPClientContext;
@@ -126,8 +126,8 @@
new LDAPOptions().setConnectTimeout(1, TimeUnit.MILLISECONDS));
try {
for (int i = 0; i < ITERATIONS; i++) {
- final PromiseImpl<ErrorResultException, NeverThrowsException> promise = PromiseImpl.create();
- final Promise<? extends Connection, ErrorResultException> future = factory.getConnectionAsync();
+ final PromiseImpl<LdapException, NeverThrowsException> promise = PromiseImpl.create();
+ final Promise<? extends Connection, LdapException> future = factory.getConnectionAsync();
future.onFailure(getFailureHandler(promise));
ConnectionException e = (ConnectionException) promise.getOrThrow(TEST_TIMEOUT, TimeUnit.SECONDS);
@@ -163,7 +163,7 @@
waitForConnect();
final MockConnectionEventListener listener = new MockConnectionEventListener();
connection.addConnectionEventListener(listener);
- final PromiseImpl<ErrorResultException, NeverThrowsException> promise = PromiseImpl.create();
+ final PromiseImpl<LdapException, NeverThrowsException> promise = PromiseImpl.create();
final FutureResult<BindResult> future = connection.bindAsync(newSimpleBindRequest());
future.onFailure(getFailureHandler(promise));
waitForBind();
@@ -213,7 +213,7 @@
connection.addConnectionEventListener(listener);
// Now bind with timeout.
- final PromiseImpl<ErrorResultException, NeverThrowsException> promise = PromiseImpl.create();
+ final PromiseImpl<LdapException, NeverThrowsException> promise = PromiseImpl.create();
final FutureResult<BindResult> future = connection.bindAsync(newSimpleBindRequest());
future.onFailure(getFailureHandler(promise));
waitForBind();
@@ -266,12 +266,12 @@
waitForConnect();
final ConnectionEventListener listener = mock(ConnectionEventListener.class);
connection.addConnectionEventListener(listener);
- final PromiseImpl<ErrorResultException, NeverThrowsException> promise = PromiseImpl.create();
+ final PromiseImpl<LdapException, NeverThrowsException> promise = PromiseImpl.create();
final FutureResult<SearchResultEntry> future = connection.readEntryAsync(DN.valueOf("cn=test"), null);
future.onFailure(getFailureHandler(promise));
waitForSearch();
- ErrorResultException e = promise.getOrThrow(TEST_TIMEOUT, TimeUnit.SECONDS);
+ LdapException e = promise.getOrThrow(TEST_TIMEOUT, TimeUnit.SECONDS);
verifyResultCodeIsClientSideTimeout(e);
// Wait for the request to timeout.
try {
@@ -355,7 +355,7 @@
new ServerConnectionFactory<LDAPClientContext, Integer>() {
@Override
public ServerConnection<Integer> handleAccept(
- final LDAPClientContext clientContext) throws ErrorResultException {
+ final LDAPClientContext clientContext) throws LdapException {
context.set(clientContext);
connectLatch.release();
return serverConnection;
@@ -367,11 +367,11 @@
}
}
- private FailureHandler<ErrorResultException> getFailureHandler(
- final PromiseImpl<ErrorResultException, NeverThrowsException> promise) {
- return new FailureHandler<ErrorResultException>() {
+ private FailureHandler<LdapException> getFailureHandler(
+ final PromiseImpl<LdapException, NeverThrowsException> promise) {
+ return new FailureHandler<LdapException>() {
@Override
- public void handleError(ErrorResultException error) {
+ public void handleError(LdapException error) {
promise.handleResult(error);
}
};
@@ -423,7 +423,7 @@
any(AbandonRequest.class));
}
- private void verifyResultCodeIsClientSideTimeout(ErrorResultException error) {
+ private void verifyResultCodeIsClientSideTimeout(LdapException error) {
assertThat(error.getResult().getResultCode()).isEqualTo(ResultCode.CLIENT_SIDE_TIMEOUT);
}
--
Gitblit v1.10.0