diff options
| author | acolyer <acolyer> | 2006-05-16 15:43:08 +0000 |
|---|---|---|
| committer | acolyer <acolyer> | 2006-05-16 15:43:08 +0000 |
| commit | b166a7e6163889eb951f82655f0f49bfc26a49f0 (patch) | |
| tree | 2801163d063b198536b71b39d9c0a340d9f753fc /tests/src | |
| parent | fc7db25dad5d302221669c7cfdb4890f061d2e9e (diff) | |
| download | aspectj-b166a7e6163889eb951f82655f0f49bfc26a49f0.tar.gz aspectj-b166a7e6163889eb951f82655f0f49bfc26a49f0.zip | |
tests and fix for pr130722, 138219
Diffstat (limited to 'tests/src')
3 files changed, 14 insertions, 3 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc150/GenericITDsDesign.java b/tests/src/org/aspectj/systemtest/ajc150/GenericITDsDesign.java index 2a1bb9ac5..e389df79c 100644 --- a/tests/src/org/aspectj/systemtest/ajc150/GenericITDsDesign.java +++ b/tests/src/org/aspectj/systemtest/ajc150/GenericITDsDesign.java @@ -81,7 +81,7 @@ public class GenericITDsDesign extends XMLBasedAjcTestCase { System.getProperty("java.class.path")); recentWorld = new BcelWorld(cp.toString()); ReferenceType resolvedType = (ReferenceType)recentWorld.resolve(classname); - CrosscuttingMembers cmembers = resolvedType.collectCrosscuttingMembers(); + CrosscuttingMembers cmembers = resolvedType.collectCrosscuttingMembers(true); List tmungers = cmembers.getTypeMungers(); return tmungers; } diff --git a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java index 67b599c87..460be02cd 100644 --- a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java +++ b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java @@ -44,7 +44,8 @@ public class Ajc152Tests extends org.aspectj.testing.XMLBasedAjcTestCase { // known failures, uncomment when working. public void testReferencePCutInDeclareWarning_pr138215() { runTest("Reference pointcut fails inside @DeclareWarning");} -// public void testReferencePCutInPerClause_pr138219() { runTest("Can't use a FQ Reference pointcut in any pointcut expression referenced by a per-clause");} + public void testReferencePCutInPerClause_pr138219() { runTest("Can't use a FQ Reference pointcut in any pointcut expression referenced by a per-clause");} + public void testReferencePCutInPerClause_pr130722() { runTest("FQ Reference pointcut from perclause ref pc"); } // public void testDoubleAnnotationMatching_pr138223() { runTest("Double at annotation matching (no binding)");} public void testSuperCallsInAtAspectJAdvice_pr139749() { runTest("Super calls in @AspectJ advice");} diff --git a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml index ee5ec2ded..6378b42ca 100644 --- a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml +++ b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml @@ -202,8 +202,18 @@ </ajc-test> <ajc-test dir="bugs152/pr138219" pr="138219" title="Can't use a FQ Reference pointcut in any pointcut expression referenced by a per-clause"> - <compile files="PerThisWithReference.aj,SomeOtherType.aj" options="-1.5"> + <compile files="PerThisWithReference.aj,SomeOtherType.aj,RegularPCWithReference.aj" options="-1.5"> </compile> + <run class="PerThisWithReference"> + <stdout> + <line text="before PerThisWithReference:1"/> + <line text="before PerThisWithReference:2"/> + </stdout> + </run> + </ajc-test> + + <ajc-test dir="bugs152/pr130722" pr="130722" title="FQ Reference pointcut from perclause ref pc"> + <compile files="test/Test.java,test/PointcutConsumer.aj,test1/PointcutProvider.aj"/> </ajc-test> <ajc-test dir="bugs152/pr138220" pr="138220" title="@Aspect with reference pointcut in perclause"> |