Bug 150487 "Tracing and Logging Framework" (TraceMessageHandler)

6 files changed, 56 insertions, 0 deletions

diff --git a/tests/src/org/aspectj/systemtest/tracing/TracingTests.java b/tests/src/org/aspectj/systemtest/tracing/TracingTests.java
index 0153d757d..e782e0887 100644
--- a/tests/src/org/aspectj/systemtest/tracing/TracingTests.java
+++ b/tests/src/org/aspectj/systemtest/tracing/TracingTests.java
@@ -33,5 +33,9 @@ public class TracingTests extends org.aspectj.testing.XMLBasedAjcTestCase {
 	public void testDefaultTracing () {
   		runTest("Default tracing");
 	}
+	
+	public void testDefaultTracingMessageHandler () {
+  		runTest("Default TraceMessageHandler");
+	}
 
 }
diff --git a/tests/src/org/aspectj/systemtest/tracing/tracing.xml b/tests/src/org/aspectj/systemtest/tracing/tracing.xml
index 8528761ca..b0dca8d8c 100644
--- a/tests/src/org/aspectj/systemtest/tracing/tracing.xml
+++ b/tests/src/org/aspectj/systemtest/tracing/tracing.xml
@@ -17,4 +17,25 @@
         <ant file="ant.xml" target="Default tracing" verbose="true"/>
     </ajc-test>
 
+	<ajc-test dir="tracing" title="Default TraceMessageHandler" keywords="tracing">
+        <compile
+        	files="HelloWorld.java, MyDefaultTraceMessageHandler.java"
+        />
+        <compile
+        	files="IncludedAspect.aj, ExcludedAspect.aj"
+        />
+        <run class="HelloWorld" ltw="aop-defaulttracemessagehandler.xml">
+        	<stdout>
+                <line text="Hello World!"/>
+            </stdout>
+        	<stderr>
+	  	    	<line text="info register aspect IncludedAspect"/>
+	  	    	<line text="warning aspect ExcludedAspect exluded"/>
+	  	    	<line text="error Cannot find m_parent aspect"/>
+	  	    	<line text="error Concrete-aspect 'IncludedMissingAspect' could not be registered"/>
+	  	    	<line text="info weaving 'HelloWorld'"/>
+            </stderr>
+        </run>
+    </ajc-test>
+
 </suite>
diff --git a/tests/tracing/ExcludedAspect.aj b/tests/tracing/ExcludedAspect.aj
new file mode 100644
index 000000000..13cf4b753
--- /dev/null
+++ b/tests/tracing/ExcludedAspect.aj
@@ -0,0 +1,3 @@
+public aspect ExcludedAspect {
+	
+}
\ No newline at end of file
diff --git a/tests/tracing/IncludedAspect.aj b/tests/tracing/IncludedAspect.aj
new file mode 100644
index 000000000..3bd4d7007
--- /dev/null
+++ b/tests/tracing/IncludedAspect.aj
@@ -0,0 +1,3 @@
+public aspect IncludedAspect {
+	
+}
\ No newline at end of file
diff --git a/tests/tracing/MyDefaultTraceMessageHandler.java b/tests/tracing/MyDefaultTraceMessageHandler.java
new file mode 100644
index 000000000..b617568a6
--- /dev/null
+++ b/tests/tracing/MyDefaultTraceMessageHandler.java
@@ -0,0 +1,12 @@
+import org.aspectj.weaver.loadtime.TraceMessageHandler;
+import org.aspectj.weaver.tools.*;
+
+public class MyDefaultTraceMessageHandler extends TraceMessageHandler {
+	
+	private static Trace trace = new DefaultTrace(MyDefaultTraceMessageHandler.class);
+	
+	public MyDefaultTraceMessageHandler () {
+		super(trace);
+		trace.setTraceEnabled(true);
+	}
+}
\ No newline at end of file
diff --git a/tests/tracing/aop-defaulttracemessagehandler.xml b/tests/tracing/aop-defaulttracemessagehandler.xml
new file mode 100644
index 000000000..bf1a587ee
--- /dev/null
+++ b/tests/tracing/aop-defaulttracemessagehandler.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="-verbose -Xlint:warning -XmessageHandlerClass:MyDefaultTraceMessageHandler"/>
+</aspectj>
\ No newline at end of file