From 02c1f02f2ab9c67588ec20e8308b1836b790d6b8 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Fri, 25 Jun 2010 13:36:08 +0100
Subject: [PATCH] SEC-1493: Fix broken tests in 3.0.x branch

---
 ...AuthenticationManagerBeanDefinitionParserTests.java | 10 +++++-----
 .../security/authentication/ProviderManagerTests.java  |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/src/test/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParserTests.java b/config/src/test/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParserTests.java
index 142d200df1..8e85b02a1e 100644
--- a/config/src/test/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParserTests.java
+++ b/config/src/test/java/org/springframework/security/config/authentication/AuthenticationManagerBeanDefinitionParserTests.java
@@ -54,17 +54,17 @@ public class AuthenticationManagerBeanDefinitionParserTests {
     }
 
     @Test
-    public void credentialsAreClearedByDefault() throws Exception {
-        setContext(CONTEXT, "3.1");
+    public void credentialsAreNotClearedByDefault() throws Exception {
+        setContext(CONTEXT, "3.0");
         ProviderManager pm = (ProviderManager) appContext.getBeansOfType(ProviderManager.class).values().toArray()[0];
-        assertTrue(pm.isEraseCredentialsAfterAuthentication());
+        assertFalse(pm.isEraseCredentialsAfterAuthentication());
     }
 
     @Test
     public void clearCredentialsPropertyIsRespected() throws Exception {
-        setContext("<authentication-manager erase-credentials='false'/>", "3.1");
+        setContext("<authentication-manager erase-credentials='true'/>", "3.0.3");
         ProviderManager pm = (ProviderManager) appContext.getBeansOfType(ProviderManager.class).values().toArray()[0];
-        assertFalse(pm.isEraseCredentialsAfterAuthentication());
+        assertTrue(pm.isEraseCredentialsAfterAuthentication());
     }
 
     private void setContext(String context, String version) {
diff --git a/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java b/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java
index 0113f60aa1..c71c002f0f 100644
--- a/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java
+++ b/core/src/test/java/org/springframework/security/authentication/ProviderManagerTests.java
@@ -54,16 +54,16 @@ public class ProviderManagerTests {
     }
 
     @Test
-    public void credentialsAreClearedByDefault() throws Exception {
+    public void credentialsAreNotClearedByDefault() throws Exception {
         UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken("Test", "Password");
         ProviderManager mgr = makeProviderManager();
         Authentication result = mgr.authenticate(token);
-        assertNull(result.getCredentials());
+        assertNotNull(result.getCredentials());
 
-        mgr.setEraseCredentialsAfterAuthentication(false);
+        mgr.setEraseCredentialsAfterAuthentication(true);
         token = new UsernamePasswordAuthenticationToken("Test", "Password");
         result = mgr.authenticate(token);
-        assertNotNull(result.getCredentials());
+        assertNull(result.getCredentials());
     }
 
     @Test