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-config/src/test/java/org/forgerock/opendj/config/client/ldap/LDAPClientTest.java | 52 ++++++++++++++++++++++------------------------------
1 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/LDAPClientTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/LDAPClientTest.java
index 4e2ba01..4ec05aa 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/LDAPClientTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/client/ldap/LDAPClientTest.java
@@ -51,7 +51,7 @@
import org.forgerock.opendj.ldap.Connection;
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.Entry;
-import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.LdapException;
import org.forgerock.opendj.ldap.LinkedHashMapEntry;
import org.forgerock.opendj.ldap.MemoryBackend;
import org.forgerock.opendj.ldap.ResultCode;
@@ -193,11 +193,10 @@
return new Object[][] {
// result code corresponding to exception thrown, expected
// exception, expected code result
- { ResultCode.PROTOCOL_ERROR, ErrorResultException.class, ResultCode.PROTOCOL_ERROR },
- { ResultCode.UNAVAILABLE, ErrorResultException.class, ResultCode.UNAVAILABLE },
+ { ResultCode.PROTOCOL_ERROR, LdapException.class, ResultCode.PROTOCOL_ERROR },
+ { ResultCode.UNAVAILABLE, LdapException.class, ResultCode.UNAVAILABLE },
{ ResultCode.ENTRY_ALREADY_EXISTS, ManagedObjectAlreadyExistsException.class, null },
- { ResultCode.INSUFFICIENT_ACCESS_RIGHTS, ErrorResultException.class,
- ResultCode.INSUFFICIENT_ACCESS_RIGHTS },
+ { ResultCode.INSUFFICIENT_ACCESS_RIGHTS, LdapException.class, ResultCode.INSUFFICIENT_ACCESS_RIGHTS },
{ ResultCode.UNWILLING_TO_PERFORM, OperationRejectedException.class, null } };
}
@@ -211,13 +210,11 @@
return new Object[][] {
// result code corresponding to exception thrown, expected
// exception, expected code result
- { ResultCode.PROTOCOL_ERROR, ErrorResultException.class, ResultCode.PROTOCOL_ERROR },
- { ResultCode.UNAVAILABLE, ErrorResultException.class, ResultCode.UNAVAILABLE },
+ { ResultCode.PROTOCOL_ERROR, LdapException.class, ResultCode.PROTOCOL_ERROR },
+ { ResultCode.UNAVAILABLE, LdapException.class, ResultCode.UNAVAILABLE },
{ ResultCode.NO_SUCH_OBJECT, ManagedObjectNotFoundException.class, null },
- { ResultCode.INSUFFICIENT_ACCESS_RIGHTS, ErrorResultException.class,
- ResultCode.INSUFFICIENT_ACCESS_RIGHTS },
- { ResultCode.UNWILLING_TO_PERFORM, ErrorResultException.class,
- ResultCode.UNWILLING_TO_PERFORM } };
+ { ResultCode.INSUFFICIENT_ACCESS_RIGHTS, LdapException.class, ResultCode.INSUFFICIENT_ACCESS_RIGHTS },
+ { ResultCode.UNWILLING_TO_PERFORM, LdapException.class, ResultCode.UNWILLING_TO_PERFORM } };
}
@BeforeClass
@@ -273,8 +270,8 @@
MemoryBackend backend = new MemoryBackend(new LDIFEntryReader(TEST_LDIF));
Connection c = new AbstractConnectionWrapper<Connection>(newInternalConnection(backend)) {
@Override
- public Result add(Entry entry) throws ErrorResultException {
- throw ErrorResultException.newErrorResult(resultCodeOfThrownException);
+ public Result add(Entry entry) throws LdapException {
+ throw LdapException.newErrorResult(resultCodeOfThrownException);
}
};
ManagementContext ctx =
@@ -285,10 +282,9 @@
parent.setMandatoryReadOnlyAttributeTypeProperty(getAttributeType("description"));
parent.commit();
} catch (Exception e) {
- if (expectedExceptionClass.equals(ErrorResultException.class)) {
- assertThat(e).isInstanceOf(ErrorResultException.class);
- assertThat(((ErrorResultException) e).getResult().getResultCode()).isEqualTo(
- expectedCode);
+ if (expectedExceptionClass.equals(LdapException.class)) {
+ assertThat(e).isInstanceOf(LdapException.class);
+ assertThat(((LdapException) e).getResult().getResultCode()).isEqualTo(expectedCode);
} else {
assertThat(e).isInstanceOf(expectedExceptionClass);
}
@@ -378,11 +374,9 @@
/**
* Tests retrieval of a top-level managed object fails when an underlying
- * ErrorResultException occurs.
+ * LdapException occurs.
*
- * @param cause
- * The ErrorResultException cause of the failure.
- * @param expected
+ * @param expectedExceptionClass
* The expected client API exception class.
*/
@Test(dataProvider = "getManagedObjectExceptions")
@@ -392,9 +386,8 @@
MemoryBackend backend = new MemoryBackend(new LDIFEntryReader(TEST_LDIF));
Connection c = new AbstractConnectionWrapper<Connection>(newInternalConnection(backend)) {
@Override
- public SearchResultEntry readEntry(DN name, String... attributeDescriptions)
- throws ErrorResultException {
- throw ErrorResultException.newErrorResult(resultCodeOfThrownException);
+ public SearchResultEntry readEntry(DN name, String... attributeDescriptions) throws LdapException {
+ throw LdapException.newErrorResult(resultCodeOfThrownException);
}
};
ManagementContext ctx =
@@ -402,10 +395,9 @@
try {
getTestParent(ctx, "test parent 2");
} catch (Exception e) {
- if (expectedExceptionClass.equals(ErrorResultException.class)) {
- assertThat(e).isInstanceOf(ErrorResultException.class);
- assertThat(((ErrorResultException) e).getResult().getResultCode()).isEqualTo(
- expectedCode);
+ if (expectedExceptionClass.equals(LdapException.class)) {
+ assertThat(e).isInstanceOf(LdapException.class);
+ assertThat(((LdapException) e).getResult().getResultCode()).isEqualTo(expectedCode);
} else {
assertThat(e).isInstanceOf(expectedExceptionClass);
}
@@ -656,7 +648,7 @@
final AtomicBoolean isModified = new AtomicBoolean();
Connection c = new AbstractConnectionWrapper<Connection>(newInternalConnection(backend)) {
@Override
- public Result modify(ModifyRequest request) throws ErrorResultException {
+ public Result modify(ModifyRequest request) throws LdapException {
isModified.set(true);
return super.modify(request);
}
@@ -680,7 +672,7 @@
final AtomicBoolean isModified = new AtomicBoolean();
Connection c = new AbstractConnectionWrapper<Connection>(newInternalConnection(backend)) {
@Override
- public Result modify(ModifyRequest request) throws ErrorResultException {
+ public Result modify(ModifyRequest request) throws LdapException {
isModified.set(true);
return super.modify(request);
}
--
Gitblit v1.10.0