summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2008-05-05 18:55:49 +0000
committeraclement <aclement>2008-05-05 18:55:49 +0000
commit4988216b02b9b9f360f970772adb613ee33b8e0d (patch)
treeac2039c2bb78ae29b7935ad6f5975da942d47d42
parentd7d315bedcf39f75067a7dbabd9109c03ccbc67c (diff)
downloadaspectj-4988216b02b9b9f360f970772adb613ee33b8e0d.tar.gz
aspectj-4988216b02b9b9f360f970772adb613ee33b8e0d.zip
230134: tests and fixes - move cflow caches from static state to crosscuttingmembers for the aspect, fixing their lifecycle.
-rw-r--r--tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java1
-rw-r--r--tests/src/org/aspectj/systemtest/ajc161/ajc161.xml15
2 files changed, 13 insertions, 3 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java b/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java
index 8d1badc21..7f0f6fd49 100644
--- a/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc161/Ajc161Tests.java
@@ -19,6 +19,7 @@ import org.aspectj.testing.XMLBasedAjcTestCase;
public class Ajc161Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
// AspectJ1.6.1
+ public void testLtwInheritedCflow_pr230134() { runTest("ltw inherited cflow"); }
public void testAroundAdviceOnFieldSet_pr229910() { runTest("around advice on field set"); }
public void testPipelineCompilationGenericReturnType_pr226567() { runTest("pipeline compilation and generic return type"); }
diff --git a/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml b/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml
index 210df6462..f864b64b2 100644
--- a/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml
+++ b/tests/src/org/aspectj/systemtest/ajc161/ajc161.xml
@@ -3,15 +3,24 @@
<!-- AspectJ v1.6.1 Tests -->
<suite>
+ <ajc-test dir="bugs161/pr230134" title="ltw inherited cflow">
+ <compile files="HW.java"/>
+ <compile files="SimpleTracing.java Tracing.java HelloWorldTracing.java" outjar="foo.jar"/>
+ <run class="hello.HW" classpath="$sandbox/foo.jar" ltw="aop.xml">
+ <stdout>
+ <line text="Hello World"/>
+ </stdout>
+ </run>
+ </ajc-test>
+
<ajc-test dir="bugs161/pr229910" title="around advice on field set">
<compile files="Test.java" options="-1.5"/>
<run class="Test"/>
- </ajc-test>
+ </ajc-test>
<ajc-test dir="bugs161/pr226567" title="pipeline compilation and generic return type">
<compile files="BarAspect.aj Foo.java Bar.java" options="-1.5"/>
<compile files="BarAspect.aj Bar.java Foo.java" options="-1.5"/>
- </ajc-test>
-
+ </ajc-test>
</suite> \ No newline at end of file