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/GrizzlyLDAPConnectionTestCase.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java
index 9050ca0..9dab53b 100644
--- a/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java
+++ b/opendj-grizzly/src/test/java/org/forgerock/opendj/grizzly/GrizzlyLDAPConnectionTestCase.java
@@ -35,7 +35,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.forgerock.opendj.ldap.Connections;
-import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.LdapException;
 import org.forgerock.opendj.ldap.LDAPConnectionFactory;
 import org.forgerock.opendj.ldap.LDAPListener;
 import org.forgerock.opendj.ldap.LDAPOptions;
@@ -103,7 +103,7 @@
             }
             SearchResultHandler searchHandler = mock(SearchResultHandler.class);
             @SuppressWarnings("unchecked")
-            FailureHandler<ErrorResultException> failureHandler = mock(FailureHandler.class);
+            FailureHandler<LdapException> failureHandler = mock(FailureHandler.class);
             connection.searchAsync(request, searchHandler).onFailure(failureHandler);
 
             // Pass in a time which is guaranteed to trigger expiration.
@@ -111,8 +111,7 @@
             if (isPersistentSearch) {
                 verifyZeroInteractions(searchHandler);
             } else {
-                ArgumentCaptor<ErrorResultException> arg =
-                        ArgumentCaptor.forClass(ErrorResultException.class);
+                ArgumentCaptor<LdapException> arg = ArgumentCaptor.forClass(LdapException.class);
                 verify(failureHandler).handleError(arg.capture());
                 assertThat(arg.getValue()).isInstanceOf(TimeoutResultException.class);
                 assertThat(arg.getValue().getResult().getResultCode()).isEqualTo(

--
Gitblit v1.10.0