From 7e44580c7556e84961db4ae6c399a9d6ae39d5ce Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Wed, 20 Jul 2011 17:42:05 +0100
Subject: [PATCH] Minor refactoring of aspects tests.

---
 .../aspectj/AspectJInterceptorTests.java      | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/samples/aspectj/src/test/java/sample/aspectj/AspectJInterceptorTests.java b/samples/aspectj/src/test/java/sample/aspectj/AspectJInterceptorTests.java
index 40f618ac1b..b857968b93 100644
--- a/samples/aspectj/src/test/java/sample/aspectj/AspectJInterceptorTests.java
+++ b/samples/aspectj/src/test/java/sample/aspectj/AspectJInterceptorTests.java
@@ -16,6 +16,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:aspectj-context.xml")
 public class AspectJInterceptorTests {
+    private Authentication admin = new UsernamePasswordAuthenticationToken("test", "xxx", AuthorityUtils.createAuthorityList("ROLE_ADMIN"));
+    private Authentication user = new UsernamePasswordAuthenticationToken("test", "xxx", AuthorityUtils.createAuthorityList("ROLE_USER"));
 
     @Autowired
     private Service service;
@@ -35,17 +37,13 @@ public class AspectJInterceptorTests {
 
     @Test(expected = AccessDeniedException.class)
     public void testSecuredMethodWrongRole() throws Exception {
-        Authentication token = new UsernamePasswordAuthenticationToken("test", "xxx", AuthorityUtils
-                .createAuthorityList("ROLE_ADMIN"));
-        SecurityContextHolder.getContext().setAuthentication(token);
+        SecurityContextHolder.getContext().setAuthentication(admin);
         service.secureMethod();
     }
 
     @Test
     public void testSecuredMethodEverythingOk() throws Exception {
-        Authentication token = new UsernamePasswordAuthenticationToken("test", "xxx", AuthorityUtils
-                .createAuthorityList("ROLE_USER"));
-        SecurityContextHolder.getContext().setAuthentication(token);
+        SecurityContextHolder.getContext().setAuthentication(user);
         service.secureMethod();
     }
 
@@ -56,18 +54,21 @@ public class AspectJInterceptorTests {
 
     @Test(expected = AccessDeniedException.class)
     public void testSecuredClassWrongRole() throws Exception {
-        Authentication token = new UsernamePasswordAuthenticationToken("test", "xxx", AuthorityUtils
-                .createAuthorityList("ROLE_ADMIN"));
-        SecurityContextHolder.getContext().setAuthentication(token);
+        SecurityContextHolder.getContext().setAuthentication(admin);
         securedService.secureMethod();
     }
 
+    @Test(expected = AccessDeniedException.class)
+    public void testSecuredClassWrongRoleOnNewedInstance() throws Exception {
+        SecurityContextHolder.getContext().setAuthentication(admin);
+        new SecuredService().secureMethod();
+    }
+
     @Test
     public void testSecuredClassEverythingOk() throws Exception {
-        Authentication token = new UsernamePasswordAuthenticationToken("test", "xxx", AuthorityUtils
-                .createAuthorityList("ROLE_USER"));
-        SecurityContextHolder.getContext().setAuthentication(token);
+        SecurityContextHolder.getContext().setAuthentication(user);
         securedService.secureMethod();
+        new SecuredService().secureMethod();
     }
 
     @After