From c7c41ced845b511798200143971fa595e0249af9 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@vmware.com>
Date: Wed, 18 Jul 2012 14:39:15 -0500
Subject: [PATCH] Added test to verify LogoutHandlers added to LogoutFilter

---
 .../config/http/RememberMeConfigTests.groovy    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/config/src/test/groovy/org/springframework/security/config/http/RememberMeConfigTests.groovy b/config/src/test/groovy/org/springframework/security/config/http/RememberMeConfigTests.groovy
index 20a64aa7e7..2b9042492a 100644
--- a/config/src/test/groovy/org/springframework/security/config/http/RememberMeConfigTests.groovy
+++ b/config/src/test/groovy/org/springframework/security/config/http/RememberMeConfigTests.groovy
@@ -23,6 +23,7 @@ import org.springframework.security.config.BeanIds
 import org.springframework.security.core.userdetails.MockUserDetailsService
 import org.springframework.security.util.FieldUtils
 import org.springframework.security.web.authentication.logout.LogoutFilter
+import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler
 import org.springframework.security.web.authentication.rememberme.InMemoryTokenRepositoryImpl
 import org.springframework.security.web.authentication.rememberme.JdbcTokenRepositoryImpl;
 import org.springframework.security.web.authentication.rememberme.PersistentTokenBasedRememberMeServices
@@ -110,6 +111,22 @@ class RememberMeConfigTests extends AbstractHttpConfigTests {
         rmp.key == "ourkey"
     }
 
+    def rememberMeAddsLogoutHandlerToLogoutFilter() {
+        httpAutoConfig () {
+            'remember-me'()
+        }
+        createAppContext(AUTH_PROVIDER_XML)
+
+        def rememberMeServices = rememberMeServices()
+        List logoutHandlers = getFilter(LogoutFilter.class).handlers
+
+        expect:
+        rememberMeServices
+        logoutHandlers.size() == 2
+        logoutHandlers.get(0) instanceof SecurityContextLogoutHandler
+        logoutHandlers.get(1) == rememberMeServices
+    }
+
     def rememberMeTokenValidityIsParsedCorrectly() {
         httpAutoConfig () {
             'remember-me'('key': 'ourkey', 'token-validity-seconds':'10000')