From 15930e7f92e2d4be1866509a8550373a4bcea978 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Thu, 16 Feb 2006 09:04:45 +0000
Subject: tests and (slightly reworked) fix for 125699 from Helen. @AJ bug with
 inherited advice from code style aspects.

---
 .../src/org/aspectj/systemtest/ajc151/Ajc151Tests.java |  2 ++
 tests/src/org/aspectj/systemtest/ajc151/ajc151.xml     | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'tests/src')

diff --git a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
index b15102fa2..7a64444b9 100644
--- a/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc151/Ajc151Tests.java
@@ -39,6 +39,8 @@ public class Ajc151Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   //public void testExposingWithintype_enh123423() { runTest("exposing withintype");}
   //public void testMissingImport_pr127299() { runTest("missing import gives funny message");}
   public void testUnusedInterfaceMessage_pr120527() { runTest("incorrect unused interface message");}
+  public void testAtAspectInheritsAdviceWithTJPAndThis_pr125699 () { runTest("inherit advice with this() and thisJoinPoint");  }
+  public void testAtAspectInheritsAdviceWithTJPAndThis_pr125699_2 () {runTest("inherit advice with this() and thisJoinPoint - 2");  }
   
   public void testMixingNumbersOfTypeParameters_pr125080()   { 
 	  runTest("mixing numbers of type parameters");    
diff --git a/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml b/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
index 140d66e22..de0488dbd 100644
--- a/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
+++ b/tests/src/org/aspectj/systemtest/ajc151/ajc151.xml
@@ -133,10 +133,22 @@
         <run class="HelloWorld" ltw="aop-tracing.xml"/>
     </ajc-test>
     
-    <ajc-test dir="bugs151/pr125699" title="inherit adivce with this() and thisJoinPoint">
-        <compile files="Tracing.aj, TestTracing.aj, AtTestTracing.java" options="-1.5"/>
+    <ajc-test dir="bugs151/pr125699" title="inherit advice with this() and thisJoinPoint">
+        <compile files="Tracing.aj, TestTracing.aj, AtTestTracing.java" options="-1.5">
+          <message kind="warning" line="13" text="advice defined in Tracing has not been applied [Xlint:adviceDidNotMatch]"/>
+          <message kind="warning" line="8" text="advice defined in Tracing has not been applied [Xlint:adviceDidNotMatch]"/>
+          <message kind="warning" line="3" text="advice defined in Tracing has not been applied [Xlint:adviceDidNotMatch]"/>
+        </compile>
     </ajc-test>
-    
+
+    <ajc-test dir="bugs151/pr125699" title="inherit advice with this() and thisJoinPoint - 2">
+        <compile files="Tracing.aj, SubAbstractTracing.aj, SubAtAj.java" options="-1.5">
+          <message kind="warning" line="13" text="advice defined in Tracing has not been applied [Xlint:adviceDidNotMatch]"/>
+          <message kind="warning" line="8" text="advice defined in Tracing has not been applied [Xlint:adviceDidNotMatch]"/>
+          <message kind="warning" line="3" text="advice defined in Tracing has not been applied [Xlint:adviceDidNotMatch]"/>
+        </compile>
+    </ajc-test>
+
     <ajc-test dir="bugs151/pr125810" title="warning when inherited pointcut not made concrete">
         <compile files="SuperAspect.aj, SubAspect.aj, SubAtAspect.java" options="-1.5">
           <message kind="error" line="3" text="inherited abstract pointcut SuperAspect.scope() is not made concrete in SubAspect"/>
-- 
cgit v1.2.3