From ffc92dd6db1ac49de4f6396ff0e38834c7344cde Mon Sep 17 00:00:00 2001
From: mwebster <mwebster>
Date: Mon, 2 Oct 2006 10:01:44 +0000
Subject: [PATCH] Bug 158205 "NullPointerException when weaving with bootstrap
 agent" (improve declare parents LTW tests)

---
 .../weaver/loadtime/DefaultMessageHandler.java | 18 +++++++++++++-----
 .../java5/ataspectj/ataspectj/aop-decptest.xml |  2 +-
 .../systemtest/ajc150/ataspectj/ltw.xml        | 10 +++++++++-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/loadtime/src/org/aspectj/weaver/loadtime/DefaultMessageHandler.java b/loadtime/src/org/aspectj/weaver/loadtime/DefaultMessageHandler.java
index df06ee773..6589663fd 100644
--- a/loadtime/src/org/aspectj/weaver/loadtime/DefaultMessageHandler.java
+++ b/loadtime/src/org/aspectj/weaver/loadtime/DefaultMessageHandler.java
@@ -29,11 +29,19 @@ public class DefaultMessageHandler implements IMessageHandler {
         if (isIgnoring(message.getKind())) {
     		return false;
     	} else {
-            if (message.getKind().isSameOrLessThan(IMessage.INFO)) {
-                return SYSTEM_OUT.handleMessage(message);
-            } else {
-                return SYSTEM_ERR.handleMessage(message);
-            }
+    		/*
+    		 * TODO maw We ship this class but don't use or document it. Changed
+    		 * to use stderr instead of stdout to allow improvements to LTW tests.
+    		 * Currently many pass whether or not LTW occurs because they are
+    		 * already woven. Some changed to check for appropriate weaving messages
+    		 * as well as absence of warnings or errors. 
+    		 */
+    		return SYSTEM_ERR.handleMessage(message);
+//            if (message.getKind().isSameOrLessThan(IMessage.INFO)) {
+//                return SYSTEM_OUT.handleMessage(message);
+//            } else {
+//                return SYSTEM_ERR.handleMessage(message);
+//            }
         }
     }
 
diff --git a/tests/java5/ataspectj/ataspectj/aop-decptest.xml b/tests/java5/ataspectj/ataspectj/aop-decptest.xml
index 3e607df7d..f602f40be 100644
--- a/tests/java5/ataspectj/ataspectj/aop-decptest.xml
+++ b/tests/java5/ataspectj/ataspectj/aop-decptest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <aspectj>
-    <weaver options="-XmessageHandlerClass:ataspectj.TestHelper -1.5 -Xlint:ignore"/>
+    <weaver options="-XmessageHandlerClass:ataspectj.TestHelper -1.5 -Xlint:ignore -showWeaveInfo"/>
     <aspects>
         <aspect name="ataspectj.DeclareParentsImplementsTest.TestAspect"/>
         <aspect name="ataspectj.DeclareParentsInterfaceTest.TestAspect"/>
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml
index a27ecd482..2fb728485 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ataspectj/ltw.xml
@@ -245,7 +245,15 @@
                 options="-1.5"
                 />
         <!--<run class="ataspectj.DeclareParentsInterfaceTest" ltw="ataspectj/aop-decptest.xml"/>-->
-        <ant file="ajc-ant.xml" target="ltw.Decp" verbose="true"/>
+        <ant file="ajc-ant.xml" target="ltw.Decp" verbose="true">
+        	<stderr>
+                <line text="weaveinfo Extending interface set for type 'ataspectj.DeclareParentsInterfaceTest$Target' (DeclareParentsInterfaceTest.java) to include 'ataspectj.DeclareParentsInterfaceTest$Marker' (DeclareParentsInterfaceTest.java)"/>
+                <line text="weaveinfo Join point 'method-execution(void ataspectj.DeclareParentsInterfaceTest$Target.target())' in Type 'ataspectj.DeclareParentsInterfaceTest$Target' (DeclareParentsInterfaceTest.java:27) advised by before advice from 'ataspectj.DeclareParentsInterfaceTest$TestAspect' (DeclareParentsInterfaceTest.java)"/>
+                <line text="weaveinfo Extending interface set for type 'ataspectj.DeclareParentsImplementsTest$Target' (DeclareParentsImplementsTest.java) to include 'ataspectj.DeclareParentsImplementsTest$Introduced' (DeclareParentsImplementsTest.java)"/>
+                <line text="weaveinfo Type 'ataspectj.DeclareParentsImplementsTest$Target' (DeclareParentsImplementsTest.java) has intertyped method from 'ataspectj.DeclareParentsImplementsTest$TestAspect' (DeclareParentsImplementsTest.java:'void ataspectj.DeclareParentsImplementsTest$Introduced.intro()')"/>
+                <line text="weaveinfo Join point 'method-execution(void ataspectj.DeclareParentsImplementsTest$Implementation.intro())' in Type 'ataspectj.DeclareParentsImplementsTest$Implementation' (DeclareParentsImplementsTest.java:47) advised by before advice from 'ataspectj.DeclareParentsImplementsTest$TestAspect' (DeclareParentsImplementsTest.java)"/>
+            </stderr>
+        </ant>
     </ajc-test>
 
     <ajc-test dir="java5/ataspectj" title="LTW Decp2">
-- 
2.39.5