summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoracolyer <acolyer>2005-11-21 17:18:39 +0000
committeracolyer <acolyer>2005-11-21 17:18:39 +0000
commite5c3e7214edf3cd2ec84bc1e2b20ba93887b013a (patch)
treead082c28bd38116cf06a7bcbba3a64291f19fcae
parent5947ce663998ee3a8f332586175d287ad3f52f65 (diff)
downloadaspectj-e5c3e7214edf3cd2ec84bc1e2b20ba93887b013a.tar.gz
aspectj-e5c3e7214edf3cd2ec84bc1e2b20ba93887b013a.zip
tests for reflective reading of compiled binding pointcuts + ron's bug
-rw-r--r--tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java9
-rw-r--r--tests/src/org/aspectj/systemtest/ajc150/ajc150.xml11
2 files changed, 14 insertions, 6 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index 4a2ff9f6b..ff1f25e62 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -714,10 +714,13 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
runTest("no StackOverflowError with circular pcd in generic aspect - 2");
}
+ public void testNPEInThisJoinPointStaticPart() {
+ runTest("thisJoinPointStaticPart in if test");
+ }
-// public void testPointcutParsingOfCompiledPointcuts() {
-// runTest("pointcut parsing with ajc compiled pointcut references");
-// }
+ public void testPointcutParsingOfCompiledPointcuts() {
+ runTest("pointcut parsing with ajc compiled pointcut references");
+ }
/*
* Load-time weaving bugs
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 8c9354fe4..ec3a692c8 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -52,14 +52,19 @@
<ajc-test dir="bugs150" pr="112756" title="pointcut expression containing 'assert'">
<compile files="Pr112756.aj" options="-warn:assertIdentifier -Xdev:Pinpoint"/>
</ajc-test>
-
+
<ajc-test dir="bugs150" pr="117296" title="self bounding generic types">
<compile files="PropertySupport.java" options="-1.5"/>
</ajc-test>
+
+ <ajc-test dir="bugs150" pr="113368" title="thisJoinPointStaticPart in if test">
+ <compile files="Pr113368.aj"/>
+ <run class="Pr113368"/>
+ </ajc-test>
<ajc-test dir="java5/reflection" title="pointcut parsing with ajc compiled pointcut references">
- <compile files="PointcutLibrary.aj,ReflectOnAjcCompiledPointcuts.java"></compile>
- <run class="ReflectOnAjcCompiledPointcuts" classpath=".;../lib/aspectj/aspectjtools.jar"/>
+ <compile files="PointcutLibrary.aj,ReflectOnAjcCompiledPointcuts.java" options="-1.5"></compile>
+ <run class="ReflectOnAjcCompiledPointcuts" classpath="../lib/bcel/bcel.jar"/>
</ajc-test>
<ajc-test dir="bugs150/pr114436" title="ClassFormatError binary weaving perthis">