test and fix for pr106554: staticinitialization and PTW

2 files changed, 13 insertions, 0 deletions

diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index bbecd104e..5ca0b5775 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -97,6 +97,8 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   	runTest("compiler error when mixing inheritance, overriding and polymorphism");
   }
   
+  public void testPerTypeWithin_pr106554() {runTest("Problem in staticinitialization with pertypewithin aspect");}
+  
   public void testPerTypeWithinMissesNamedInnerTypes() {
   	runTest("pertypewithin() handing of inner classes (1)");
   }
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index 1014ea653..85257f841 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -554,6 +554,17 @@
 	   <message kind="weave" text="Join point 'method-execution(void C.m3())' in Type 'C' (AroundAdvice.aj:14) advised by before advice from 'ErrorHandling' (AroundAdvice.aj:8)"/>
 	 </compile>
     </ajc-test>
+    
+    <ajc-test dir="bugs150/pr106554" pr="106554" title="Problem in staticinitialization with pertypewithin aspect">
+        <compile files="A.aj" options="-showWeaveInfo">
+          <message kind="weave" text="Join point 'staticinitialization(void A.&lt;clinit&gt;())' in Type 'A' (A.aj:1) advised by before advice from 'StopsInit' (A.aj:21)"/>
+        </compile>
+        <run class="A">
+          <stdout>
+            <line text="test = 1"/>
+          </stdout>
+        </run>
+    </ajc-test> 
 
     <ajc-test dir="bugs150/SimpleInsuranceFailure" title="raw and generic type conversion with itd cons">
         <compile files="" options=" -emacssym, -sourceroots ." >