From 8adb7af006bb6bf8a71f86bb520671de381c8e3e Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 13 Feb 2013 09:49:16 +0000
Subject: [PATCH] Minor API cleanup to make it easier to use.
---
opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java | 56 +-------------------------------------------------------
1 files changed, 1 insertions(+), 55 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java
index be92d7c..226d8e7 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ConnectionPoolTestCase.java
@@ -30,11 +30,11 @@
import static org.fest.assertions.Assertions.assertThat;
import static org.forgerock.opendj.ldap.Connections.newFixedConnectionPool;
import static org.forgerock.opendj.ldap.ErrorResultException.newErrorResult;
+import static org.forgerock.opendj.ldap.TestCaseUtils.*;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyBoolean;
import static org.mockito.Matchers.eq;
import static org.mockito.Matchers.isA;
-import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@@ -49,12 +49,8 @@
import org.forgerock.opendj.ldap.requests.Requests;
import org.forgerock.opendj.ldap.responses.ExtendedResult;
import org.forgerock.opendj.ldap.responses.Responses;
-import org.mockito.invocation.InvocationOnMock;
-import org.mockito.stubbing.Answer;
import org.testng.annotations.Test;
-import com.forgerock.opendj.util.CompletedFutureResult;
-
/**
* Tests the connection pool implementation..
*/
@@ -418,54 +414,4 @@
pool.close();
}
- private Connection mockConnection(final List<ConnectionEventListener> listeners) {
- final Connection mockConnection = mock(Connection.class);
-
- // Handle listener registration / deregistration in mock connection.
- doAnswer(new Answer<Void>() {
- @Override
- public Void answer(final InvocationOnMock invocation) throws Throwable {
- final ConnectionEventListener listener =
- (ConnectionEventListener) invocation.getArguments()[0];
- listeners.add(listener);
- return null;
- }
- }).when(mockConnection).addConnectionEventListener(any(ConnectionEventListener.class));
-
- doAnswer(new Answer<Void>() {
- @Override
- public Void answer(final InvocationOnMock invocation) throws Throwable {
- final ConnectionEventListener listener =
- (ConnectionEventListener) invocation.getArguments()[0];
- listeners.remove(listener);
- return null;
- }
- }).when(mockConnection).removeConnectionEventListener(any(ConnectionEventListener.class));
-
- return mockConnection;
- }
-
- @SuppressWarnings("unchecked")
- private ConnectionFactory mockConnectionFactory(final Connection first,
- final Connection... remaining) throws ErrorResultException {
- final ConnectionFactory factory = mock(ConnectionFactory.class);
- when(factory.getConnection()).thenReturn(first, remaining);
- when(factory.getConnectionAsync(any(ResultHandler.class))).thenAnswer(
- new Answer<FutureResult<Connection>>() {
- @Override
- public FutureResult<Connection> answer(final InvocationOnMock invocation)
- throws Throwable {
- final Connection connection = factory.getConnection();
- // Execute handler and return future.
- final ResultHandler<? super Connection> handler =
- (ResultHandler<? super Connection>) invocation.getArguments()[0];
- if (handler != null) {
- handler.handleResult(connection);
- }
- return new CompletedFutureResult<Connection>(connection);
- }
- });
- return factory;
- }
-
}
--
Gitblit v1.10.0