From 789be71d8c6f45d1450259af77b592f38a9f2109 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Thu, 27 Nov 2008 10:41:08 +0000
Subject: [PATCH] SEC-398: Rolled back addition of erroneous test method for
 this issue (the fix was incorrect and the test method does nothing useful).

---
 ...pSessionContextIntegrationFilterTests.java | 57 +------------------
 1 file changed, 1 insertion(+), 56 deletions(-)

diff --git a/core/src/test/java/org/springframework/security/context/HttpSessionContextIntegrationFilterTests.java b/core/src/test/java/org/springframework/security/context/HttpSessionContextIntegrationFilterTests.java
index 4e7d5803a5..93ce5b280e 100644
--- a/core/src/test/java/org/springframework/security/context/HttpSessionContextIntegrationFilterTests.java
+++ b/core/src/test/java/org/springframework/security/context/HttpSessionContextIntegrationFilterTests.java
@@ -38,8 +38,7 @@ import javax.servlet.ServletResponse;
  * Tests {@link HttpSessionContextIntegrationFilter}.
  *
  * @author Ben Alex
- * @version $Id: HttpSessionContextIntegrationFilterTests.java 1858 2007-05-24
- *          02:04:47Z benalex $
+ * @version $Id$
  */
 public class HttpSessionContextIntegrationFilterTests extends TestCase {
     // Build an Authentication object we simulate came from HttpSession
@@ -268,30 +267,6 @@ public class HttpSessionContextIntegrationFilterTests extends TestCase {
         assertEquals(updatedPrincipal, ((SecurityContext) context).getAuthentication());
     }
 
-    public void testConcurrentThreadsLazilyChangeFilterAppliedValueToTrue() throws Exception {
-        // Build a Context to store in HttpSession (simulating prior request)
-        SecurityContext sc = new SecurityContextImpl();
-        sc.setAuthentication(sessionPrincipal);
-
-        MockHttpServletRequest request = new MockHttpServletRequest();
-        request.getSession().setAttribute(
-                HttpSessionContextIntegrationFilter.SPRING_SECURITY_CONTEXT_KEY,
-                sc);
-        MockHttpServletResponse response = new MockHttpServletResponse();
-
-        // Prepare filter
-        HttpSessionContextIntegrationFilter filter = new HttpSessionContextIntegrationFilter();
-        filter.setContextClass(SecurityContextImpl.class);
-        filter.afterPropertiesSet();
-
-        for (int i = 0; i < 3; i++) {
-            ThreadRunner runner = new ThreadRunner(request, response, filter,
-                    new MockFilterChain(sessionPrincipal, null, null));
-            runner.start();
-        }
-
-    }
-
     //~ Inner Classes ==================================================================================================
 
     private class MockFilterChain extends TestCase implements FilterChain {
@@ -324,34 +299,4 @@ public class HttpSessionContextIntegrationFilterTests extends TestCase {
 
         }
     }
-
-    private static class ThreadRunner extends Thread {
-        private MockHttpServletRequest request;
-        private MockHttpServletResponse response;
-        private HttpSessionContextIntegrationFilter filter;
-        private MockFilterChain chain;
-
-        public ThreadRunner(MockHttpServletRequest request,
-                MockHttpServletResponse response,
-                HttpSessionContextIntegrationFilter filter,
-                MockFilterChain chain) {
-            this.request = request;
-            this.response = response;
-            this.filter = filter;
-            this.chain = chain;
-        }
-
-        public void run() {
-            try {
-                // Execute filter
-                executeFilterInContainerSimulator(new MockFilterConfig(), filter, request, response, chain);
-
-                // Check the session is not null
-                assertNotNull(request.getSession(false));
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-    }
 }