From 7241cc815fc69f64b867d7b0250b616d8fadf0f4 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Fri, 13 Sep 2013 14:57:22 +0000
Subject: [PATCH] Fix OPENDJ-1137: ConnectionEntryReader does not provide a means for accessing controls in the search result
---
opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java | 59 ++++++++++++++++++++++++++++++-----------------------------
1 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java
index 895a463..34882fd 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldif/ConnectionEntryReaderTestCase.java
@@ -253,38 +253,39 @@
private ConnectionEntryReader newReader(final Object... responses) {
final Connection connection = mock(Connection.class);
- when(
- connection.searchAsync(same(SEARCH), (IntermediateResponseHandler) isNull(),
- any(SearchResultHandler.class))).thenAnswer(
- new Answer<FutureResult<Result>>() {
- @Override
- public FutureResult<Result> answer(final InvocationOnMock invocation)
- throws Throwable {
- // Execute handler and return future.
- final SearchResultHandler handler =
- (SearchResultHandler) invocation.getArguments()[2];
- if (handler != null) {
- for (int i = 0; i < responses.length; i++) {
- final Object response = responses[i];
- if (response instanceof SearchResultEntry) {
- handler.handleEntry((SearchResultEntry) response);
- } else if (response instanceof SearchResultReference) {
- handler.handleReference((SearchResultReference) response);
- } else if (((Result) response).isSuccess()) {
- handler.handleResult((Result) response);
+ // @formatter:off
+ when(connection.searchAsync(same(SEARCH), (IntermediateResponseHandler) isNull(),
+ any(SearchResultHandler.class))).thenAnswer(
+ new Answer<FutureResult<Result>>() {
+ @Override
+ public FutureResult<Result> answer(final InvocationOnMock invocation)
+ throws Throwable {
+ // Execute handler and return future.
+ final SearchResultHandler handler =
+ (SearchResultHandler) invocation.getArguments()[2];
+ if (handler != null) {
+ for (int i = 0; i < responses.length; i++) {
+ final Object response = responses[i];
+ if (response instanceof SearchResultEntry) {
+ handler.handleEntry((SearchResultEntry) response);
+ } else if (response instanceof SearchResultReference) {
+ handler.handleReference((SearchResultReference) response);
+ } else if (((Result) response).isSuccess()) {
+ handler.handleResult((Result) response);
+ } else {
+ handler.handleErrorResult(newErrorResult((Result) response));
+ }
+ }
+ }
+ final Result result = (Result) responses[responses.length - 1];
+ if (result.isSuccess()) {
+ return new CompletedFutureResult<Result>(result);
} else {
- handler.handleErrorResult(newErrorResult((Result) response));
+ return new CompletedFutureResult<Result>(newErrorResult(result));
}
}
- }
- final Result result = (Result) responses[responses.length - 1];
- if (result.isSuccess()) {
- return new CompletedFutureResult<Result>(result);
- } else {
- return new CompletedFutureResult<Result>(newErrorResult(result));
- }
- }
- });
+ });
+ // @formatter:on
return new ConnectionEntryReader(connection, SEARCH);
}
--
Gitblit v1.10.0