From f4eb15b08b4f9f042d087507f24503e87f9077a0 Mon Sep 17 00:00:00 2001
From: Ben Alex <ben.alex@springsource.com>
Date: Mon, 24 Mar 2008 23:10:01 +0000
Subject: [PATCH] SEC-428: Tests to prove proxy-target-class="true" works.

---
 core/pom.xml                                       |  7 ++++++-
 ...ethodSecurityInterceptorWithAopConfigTests.java | 12 +++++++-----
 pom.xml                                            | 14 ++++++++++++++
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index d601dce7de..d51bf65302 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -55,7 +55,6 @@
 	    <dependency>
 	        <groupId>org.aspectj</groupId>
 		    <artifactId>aspectjweaver</artifactId>
-		    <version>1.5.4</version>
 		    <scope>test</scope>
 		    <optional>true</optional>
 	    </dependency>	    
@@ -64,6 +63,12 @@
             <artifactId>spring-ldap</artifactId>
             <optional>true</optional>
         </dependency>
+	    <dependency>
+	        <groupId>cglib</groupId>
+		    <artifactId>cglib-nodep</artifactId>
+		    <scope>test</scope>
+		    <optional>true</optional>
+	    </dependency>	    
         <dependency>
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache</artifactId>
diff --git a/core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java b/core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java
index 337cd9b5d7..2e1ec4add1 100644
--- a/core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java
+++ b/core/src/test/java/org/springframework/security/intercept/method/aopalliance/MethodSecurityInterceptorWithAopConfigTests.java
@@ -13,6 +13,7 @@ import org.springframework.security.util.InMemoryXmlApplicationContext;
  * Tests for SEC-428. 
  * 
  * @author Luke Taylor 
+ * @author Ben Alex
  */
 public class MethodSecurityInterceptorWithAopConfigTests {
     static final String AUTH_PROVIDER_XML =
@@ -39,7 +40,8 @@ public class MethodSecurityInterceptorWithAopConfigTests {
     
     @After
     public void closeAppContext() {
-        if (appContext != null) {
+        SecurityContextHolder.clearContext();
+    	if (appContext != null) {
             appContext.close();
             appContext = null;
         }
@@ -48,7 +50,7 @@ public class MethodSecurityInterceptorWithAopConfigTests {
     @Test(expected=AuthenticationCredentialsNotFoundException.class)
     public void securityInterceptorIsAppliedWhenUsedWithAopConfig() {
         setContext(
-                "<aop:config>" +
+                "<aop:config proxy-target-class=\"true\">" +
         		"     <aop:pointcut id='targetMethods' expression='execution(* org.springframework.security.TargetObject.*(..))'/>" +
         		"     <aop:advisor advice-ref='securityInterceptor' pointcut-ref='targetMethods' />" +
         		"</aop:config>" +
@@ -56,9 +58,9 @@ public class MethodSecurityInterceptorWithAopConfigTests {
         		"<b:bean id='securityInterceptor' class='org.springframework.security.intercept.method.aopalliance.MethodSecurityInterceptor' autowire='byType' >" +
         		"     <b:property name='objectDefinitionSource'>" +
                 "       <b:value>" +
-                            "org.springframework.security.ITargetObject.makeLower*=ROLE_A\n" +
-                            "org.springframework.security.ITargetObject.makeUpper*=ROLE_A\n" +
-                            "org.springframework.security.ITargetObject.computeHashCode*=ROLE_B\n" +
+                            "org.springframework.security.TargetObject.makeLower*=ROLE_A\n" +
+                            "org.springframework.security.TargetObject.makeUpper*=ROLE_A\n" +
+                            "org.springframework.security.TargetObject.computeHashCode*=ROLE_B\n" +
                 "       </b:value>" +
                 "     </b:property>" +
         		"</b:bean>" +
diff --git a/pom.xml b/pom.xml
index 3f1442b6e1..22d3b14752 100644
--- a/pom.xml
+++ b/pom.xml
@@ -659,6 +659,13 @@
 		<artifactId>spring-ldap</artifactId>
 		<version>1.2.1</version>
 	    </dependency>
+	    <dependency>
+	        <groupId>org.aspectj</groupId>
+		<artifactId>aspectjweaver</artifactId>
+		<scope>test</scope>
+		<optional>true</optional>
+		<version>1.5.4</version>
+	    </dependency>	    
 	    <dependency>
 	        <groupId>aspectj</groupId>
 	    	<artifactId>aspectjrt</artifactId>
@@ -669,6 +676,13 @@
                 <artifactId>spring-webmvc</artifactId>
                 <version>${spring.version}</version>                
             </dependency>            
+	    <dependency>
+	        <groupId>cglib</groupId>
+		<artifactId>cglib-nodep</artifactId>
+		<scope>test</scope>
+		<optional>true</optional>
+		<version>2.1_3</version>
+	    </dependency>	    
             <dependency>
                 <groupId>log4j</groupId>
                 <artifactId>log4j</artifactId>