test case fix

3 files changed, 6 insertions, 10 deletions

diff --git a/tests/java5/ataspectj/ataspectj/misuse/Test005.java b/tests/java5/ataspectj/ataspectj/misuse/Test005.java
index 428e002dd..b01bc06aa 100644
--- a/tests/java5/ataspectj/ataspectj/misuse/Test005.java
+++ b/tests/java5/ataspectj/ataspectj/misuse/Test005.java
@@ -3,8 +3,7 @@ package ataspectj.misuse;
 
 import org.aspectj.lang.annotation.*;
 
-@Aspect
-public class Test005 {
+public abstract class Test005 {
 
     @Aspect
     public static class Test005B extends Test005 {
diff --git a/tests/java5/ataspectj/ataspectj/misuse/Test006.java b/tests/java5/ataspectj/ataspectj/misuse/Test006.java
index 5b342b6a8..51670078d 100644
--- a/tests/java5/ataspectj/ataspectj/misuse/Test006.java
+++ b/tests/java5/ataspectj/ataspectj/misuse/Test006.java
@@ -6,7 +6,7 @@ package ataspectj.misuse;
 import org.aspectj.lang.annotation.*;
 
 @Aspect
-public class Test006{
+public abstract class Test006{
 }
 class Test006B extends Test006{
   @Before("call(* org..*(..))")
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/misuse.xml b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/misuse.xml
index 3b0731189..ede182eb4 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/misuse.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/misuse.xml
@@ -4,19 +4,16 @@
 
 <suite>
 
-    <comment>this one is ok - too simple - could be removed..</comment>
     <ajc-test dir="java5/ataspectj"
         pr="" title="@Aspect class extending @Aspect class">
         <compile files="ataspectj/misuse/Test005.java" options="-1.5 -Xdev:NoAtAspectJProcessing">
         </compile>
     </ajc-test>
 
-    <comment>just a warning - might be skept if further optimized in Aj5Attributes..</comment>
     <ajc-test dir="java5/ataspectj"
         pr="" title="class with @Before extending @Aspect class">
         <compile files="ataspectj/misuse/Test006.java" options="-1.5 -Xdev:NoAtAspectJProcessing">
-            <!-- FIXME AV - optim in place. Check and remove useless test -->
-            <!--<message kind="warning" line="11" text="Found @AspectJ annotations in a non @Aspect type 'ataspectj.misuse.Test006B'"/>-->
+            <message kind="error" line="11" text="class 'Test006B' can not extend aspect"/>
         </compile>
     </ajc-test>
 
@@ -24,7 +21,7 @@
     <ajc-test dir="java5/ataspectj"
         pr="" title="@Pointcut not returning void">
         <compile files="ataspectj/misuse/Test008.java" options="-1.5 -Xdev:NoAtAspectJProcessing">
-            <message kind="warning" line="9" text="Found @Pointcut on a method not returning void 'someCall()I'"/>
+            <message kind="warning" line="9" text="Found @Pointcut on a method not returning void"/>
         </compile>
     </ajc-test>
 
@@ -39,7 +36,7 @@
     <ajc-test dir="java5/ataspectj"
         pr="" title="@Pointcut with garbage string">
         <compile files="ataspectj/misuse/Test014.java" options="-1.5 -Xdev:NoAtAspectJProcessing -Xlint:ignore">
-            <message kind="error" line="7" text="Cannot parse @Pointcut 'call%dddd"/>
+            <message kind="error" line="7" text="Invalid pointcut 'call%dddd"/>
             <message kind="error" text="can't find referenced pointcut"/>
             <message kind="error" text="can't find pointcut"/>
             <message kind="error" text="@AfterThrowing: either 'value' or 'poincut' must be provided, not both"/>
@@ -53,7 +50,7 @@
     <ajc-test dir="java5/ataspectj"
         pr="" title="@Pointcut with throws clause">
         <compile files="ataspectj/misuse/Test016.java" options="-1.5 -Xdev:NoAtAspectJProcessing">
-            <message kind="warning" line="7" text="Found @Pointcut on a method throwing exception 'someCall()V'"/>
+            <message kind="warning" line="7" text="Found @Pointcut on a method throwing exception"/>
         </compile>
     </ajc-test>