Bug 150487 "Tracing and Logging Framework" (WeavingAdaptorMessageHandler delegates and traces)

4 files changed, 56 insertions, 11 deletions

diff --git a/tests/src/org/aspectj/systemtest/tracing/TracingTests.java b/tests/src/org/aspectj/systemtest/tracing/TracingTests.java
index e782e0887..1eb7924bf 100644
--- a/tests/src/org/aspectj/systemtest/tracing/TracingTests.java
+++ b/tests/src/org/aspectj/systemtest/tracing/TracingTests.java
@@ -34,8 +34,8 @@ public class TracingTests extends org.aspectj.testing.XMLBasedAjcTestCase {
   		runTest("Default tracing");
 	}
 	
-	public void testDefaultTracingMessageHandler () {
-  		runTest("Default TraceMessageHandler");
+	public void testTraceMessages () {
+  		runTest("Trace messages");
 	}
 
 }
diff --git a/tests/src/org/aspectj/systemtest/tracing/tracing.xml b/tests/src/org/aspectj/systemtest/tracing/tracing.xml
index b0dca8d8c..a9f64bd69 100644
--- a/tests/src/org/aspectj/systemtest/tracing/tracing.xml
+++ b/tests/src/org/aspectj/systemtest/tracing/tracing.xml
@@ -7,35 +7,54 @@
         <compile
         	files="TracingTest.java"
         />
-        <ant file="ant.xml" target="Tracing" verbose="true"/>
+        <ant file="ant.xml" target="Tracing" verbose="true">
+        	<stdout>
+                <line text="? TracingTest.main() trace="/>
+            </stdout>
+		</ant>      
     </ajc-test>
 
 	<ajc-test dir="tracing" title="Default tracing" keywords="tracing">
         <compile
         	files="DefaultTracingTest.java"
         />
-        <ant file="ant.xml" target="Default tracing" verbose="true"/>
+        <ant file="ant.xml" target="Default tracing" verbose="true">
+        	<stdout>
+                <line text="? DefaultTracingTest.main() trace=org.aspectj.weaver.tools.DefaultTrace"/>
+            </stdout>
+		</ant>        
     </ajc-test>
 
-	<ajc-test dir="tracing" title="Default TraceMessageHandler" keywords="tracing">
+	<ajc-test dir="tracing" title="Trace messages" keywords="tracing">
         <compile
-        	files="HelloWorld.java, MyDefaultTraceMessageHandler.java"
+        	files="HelloWorld.java"
         />
         <compile
         	files="IncludedAspect.aj, ExcludedAspect.aj"
         />
-        <run class="HelloWorld" ltw="aop-defaulttracemessagehandler.xml">
+		<ant file="ant.xml" target="Trace messages" verbose="true">
         	<stdout>
                 <line text="Hello World!"/>
             </stdout>
+            <!-- 
+            	Always get info messages even without -verbose because output determined
+                by tracing infrastructure.
+                 
+                Duplicate warning and error messages: first through trace then message 
+                writer
+            -->
         	<stderr>
+	  	    	<line text="info AspectJ Weaver Version DEVELOPMENT built on"/>
+	  	    	<line text="info register classloader"/>
+	  	    	<line text="info using configuration"/>
 	  	    	<line text="info register aspect IncludedAspect"/>
 	  	    	<line text="warning aspect ExcludedAspect exluded"/>
+	  	    	<line text="warning aspect ExcludedAspect exluded"/>
+	  	    	<line text="error Cannot find m_parent aspect"/>
 	  	    	<line text="error Cannot find m_parent aspect"/>
-	  	    	<line text="error Concrete-aspect 'IncludedMissingAspect' could not be registered"/>
-	  	    	<line text="info weaving 'HelloWorld'"/>
+	  	    	<line text="warning register definition failed"/>
+	  	    	<line text="warning register definition failed"/>
             </stderr>
-        </run>
+        </ant>
     </ajc-test>
-
 </suite>
diff --git a/tests/tracing/ant.xml b/tests/tracing/ant.xml
index f7852949e..b0b7a9e17 100644
--- a/tests/tracing/ant.xml
+++ b/tests/tracing/ant.xml
@@ -24,4 +24,17 @@
         </java>
     </target>
 
+    <target name="Trace messages">
+        <copy file="${aj.root}/tests/tracing/aop-tracemessages.xml"
+              tofile="${aj.sandbox}/META-INF/aop.xml"/>
+        <java fork="yes" classname="HelloWorld" failonerror="yes">
+            <classpath refid="aj.path"/>
+            <jvmarg value="-Dorg.aspectj.tracing.factory=default"/>
+            <jvmarg value="-Dorg.aspectj.tracing.messages=true"/>
+            <!-- use META-INF/aop.xml style -->
+            <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
+<!--            <jvmarg line="${jdwp}"/>-->
+        </java>
+    </target>
+
 </project>
diff --git a/tests/tracing/aop-tracemessages.xml b/tests/tracing/aop-tracemessages.xml
new file mode 100644
index 000000000..4f5e36a5a
--- /dev/null
+++ b/tests/tracing/aop-tracemessages.xml
@@ -0,0 +1,13 @@
+<aspectj>
+	<aspects>
+		<aspect name="IncludedAspect"/>
+		<aspect name="ExcludedAspect"/>
+		
+        <concrete-aspect name="IncludedMissingAspect" extends="MissingAbstractAspect">
+        	<pointcut name="pointcut" expression="within(*)"/>
+        </concrete-aspect>
+		
+		<include within="Included*"/>
+	</aspects>
+    <weaver options="-Xlint:warning"/>
+</aspectj>
\ No newline at end of file