Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SPR-5307: Committing test but can't be uncommented until Spring depends on AspectJ 1.6.7

Browse Source
This commit is contained in:
Andy Clement
2009-10-07 02:54:44 +00:00
parent 0437305669
commit c9f0e68c82
1 changed files with 45 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
org.springframework.aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java
View File

@@ -18,6 +18,8 @@ package org.springframework.aop.aspectj.annotation;
import static org.junit.Assert.*; import static org.junit.Assert.*;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.UndeclaredThrowableException; import java.lang.reflect.UndeclaredThrowableException;
import java.rmi.RemoteException; import java.rmi.RemoteException;
@@ -406,7 +408,22 @@ public abstract class AbstractAspectJAdvisorFactoryTests {
CannotBeUnlocked.class); CannotBeUnlocked.class);
assertFalse("Type pattern must have excluded mixin", proxy instanceof Lockable); assertFalse("Type pattern must have excluded mixin", proxy instanceof Lockable);
} }
/* prereq AspectJ 1.6.7
@Test
public void testIntroductionBasedOnAnnotationMatch_Spr5307() {
AnnotatedTarget target = new AnnotatedTargetImpl();
List<Advisor> advisors = getFixture().getAdvisors(
new SingletonMetadataAwareAspectInstanceFactory(new MakeAnnotatedTypeModifiable(),"someBean"));
Object proxy = createProxy(target,
advisors,
AnnotatedTarget.class);
System.out.println(advisors.get(1));
assertTrue(proxy instanceof Lockable);
Lockable lockable = (Lockable)proxy;
lockable.locked();
}
*/
// TODO: Why does this test fail? It hasn't been run before, so it maybe never actually passed... // TODO: Why does this test fail? It hasn't been run before, so it maybe never actually passed...
public void XtestIntroductionWithArgumentBinding() { public void XtestIntroductionWithArgumentBinding() {
TestBean target = new TestBean(); TestBean target = new TestBean();
@@ -966,6 +983,21 @@ class MakeITestBeanModifiable extends AbstractMakeModifiable {
} }
/**
* Adds a declare parents pointcut - spr5307
* @author Andy Clement
* @since 3.0
*/
@Aspect
class MakeAnnotatedTypeModifiable extends AbstractMakeModifiable {
@DeclareParents(value = "(@org.springframework.aop.aspectj.annotation.Measured *)",
// @DeclareParents(value = "(@Measured *)", // this would be a nice alternative...
defaultImpl=DefaultLockable.class)
public static Lockable mixin;
}
/** /**
* Demonstrates introductions, AspectJ annotation style. * Demonstrates introductions, AspectJ annotation style.
@@ -1024,8 +1056,20 @@ interface Modifiable {
} }
/**
* Used as a target.
* @author Andy Clement
*/
interface AnnotatedTarget {
}
@Measured
class AnnotatedTargetImpl implements AnnotatedTarget {
}
@Retention(RetentionPolicy.RUNTIME)
@interface Measured {}
class NotLockable { class NotLockable {