From 4d9910266f59041ff3135c0fa6a3ed7c9b972db5 Mon Sep 17 00:00:00 2001
From: Ulrik Sandberg <ulrik.sandberg@jayway.com>
Date: Mon, 16 Jun 2008 10:59:26 +0000
Subject: [PATCH] Changes required for paged results to work with a single
 pooled connection. (LDAP-114)

---
 ...RequestControlDirContextProcessorTest.java | 61 +++++++++++++------
 1 file changed, 43 insertions(+), 18 deletions(-)

diff --git a/spring-ldap/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTest.java b/spring-ldap/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTest.java
index edaa3b48..335765e1 100644
--- a/spring-ldap/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTest.java
+++ b/spring-ldap/src/test/java/org/springframework/ldap/control/RequestControlDirContextProcessorTest.java
@@ -23,7 +23,8 @@ import javax.naming.ldap.LdapContext;
 import junit.framework.TestCase;
 
 import org.easymock.MockControl;
-import org.springframework.ldap.control.AbstractRequestControlDirContextProcessor;
+
+import com.sun.jndi.ldap.ctl.SortControl;
 
 public class RequestControlDirContextProcessorTest extends TestCase {
 
@@ -106,12 +107,12 @@ public class RequestControlDirContextProcessorTest extends TestCase {
         dirContextControl.verify();
     }
 
-    public void testPreProcess() throws NamingException {
+    public void testPreProcessWithExistingControlOfDifferentClassShouldAdd() throws Exception {
         ldapContextControl.setDefaultMatcher(MockControl.ARRAY_MATCHER);
-        ldapContextControl.expectAndDefaultReturn(ldapContextMock
-                .getRequestControls(), new Control[] { requestControl2Mock });
-        ldapContextMock.setRequestControls(new Control[] { requestControl2Mock,
-                requestControlMock });
+        SortControl existingControl = new SortControl(new String[] { "cn" }, true);
+        ldapContextControl.expectAndDefaultReturn(ldapContextMock.getRequestControls(),
+                new Control[] { existingControl });
+        ldapContextMock.setRequestControls(new Control[] { existingControl, requestControlMock });
 
         replay();
 
@@ -120,12 +121,11 @@ public class RequestControlDirContextProcessorTest extends TestCase {
         verify();
     }
 
-    public void testPreProcess_NoExistingControls() throws NamingException {
+    public void testPreProcessWithExistingControlOfSameClassShouldReplace() throws Exception {
         ldapContextControl.setDefaultMatcher(MockControl.ARRAY_MATCHER);
-        ldapContextControl.expectAndDefaultReturn(ldapContextMock
-                .getRequestControls(), new Control[0]);
-        ldapContextMock
-                .setRequestControls(new Control[] { requestControlMock });
+        ldapContextControl.expectAndDefaultReturn(ldapContextMock.getRequestControls(),
+                new Control[] { requestControl2Mock });
+        ldapContextMock.setRequestControls(new Control[] { requestControlMock });
 
         replay();
 
@@ -134,12 +134,24 @@ public class RequestControlDirContextProcessorTest extends TestCase {
         verify();
     }
 
-    public void testPreProcess_NullControls() throws NamingException {
+    public void testPreProcessWithExistingControlOfSameClassAndPropertyFalseShouldAdd() throws Exception {
         ldapContextControl.setDefaultMatcher(MockControl.ARRAY_MATCHER);
-        ldapContextControl.expectAndDefaultReturn(ldapContextMock
-                .getRequestControls(), null);
-        ldapContextMock
-                .setRequestControls(new Control[] { requestControlMock });
+        ldapContextControl.expectAndDefaultReturn(ldapContextMock.getRequestControls(),
+                new Control[] { requestControl2Mock });
+        ldapContextMock.setRequestControls(new Control[] { requestControl2Mock, requestControlMock });
+
+        replay();
+
+        tested.setReplaceSameControlEnabled(false);
+        tested.preProcess(ldapContextMock);
+
+        verify();
+    }
+
+    public void testPreProcessWithNoExistingControlsShouldAdd() throws NamingException {
+        ldapContextControl.setDefaultMatcher(MockControl.ARRAY_MATCHER);
+        ldapContextControl.expectAndDefaultReturn(ldapContextMock.getRequestControls(), new Control[0]);
+        ldapContextMock.setRequestControls(new Control[] { requestControlMock });
 
         replay();
 
@@ -148,11 +160,24 @@ public class RequestControlDirContextProcessorTest extends TestCase {
         verify();
     }
 
-    public void testPreProcess_NotLdapContext() throws Exception {
+    public void testPreProcessWithNullControlsShouldAdd() throws NamingException {
+        ldapContextControl.setDefaultMatcher(MockControl.ARRAY_MATCHER);
+        ldapContextControl.expectAndDefaultReturn(ldapContextMock.getRequestControls(), null);
+        ldapContextMock.setRequestControls(new Control[] { requestControlMock });
+
+        replay();
+
+        tested.preProcess(ldapContextMock);
+
+        verify();
+    }
+
+    public void testPreProcessWhenNotLdapContextShouldFail() throws Exception {
         try {
             tested.preProcess(dirContextMock);
             fail("IllegalArgumentException expected");
-        } catch (IllegalArgumentException expected) {
+        }
+        catch (IllegalArgumentException expected) {
             assertTrue(true);
         }
     }