From: acolyer <acolyer>
Date: Mon, 21 Nov 2005 17:18:39 +0000 (+0000)
Subject: tests for reflective reading of compiled binding pointcuts + ron's bug
X-Git-Tag: V1_5_0RC1~147
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e5c3e7214edf3cd2ec84bc1e2b20ba93887b013a;p=aspectj.git

tests for reflective reading of compiled binding pointcuts + ron's bug
---

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">