From 2aac0a2e476d4c5bda5b9e2c5ea24ef337aa3388 Mon Sep 17 00:00:00 2001 From: mwebster Date: Mon, 14 Aug 2006 15:53:09 +0000 Subject: [PATCH] Bug 150487 "Tracing and Logging Framework" (remove TraceMessageHandler) --- .../weaver/loadtime/TraceMessageHandler.java | 81 ------------------- .../aspectj/loadtime/LoadtimeModuleTests.java | 4 +- .../loadtime/TraceMessageHandlerTest.java | 58 ------------- .../tracing/MyDefaultTraceMessageHandler.java | 12 --- .../aop-defaulttracemessagehandler.xml | 13 --- 5 files changed, 1 insertion(+), 167 deletions(-) delete mode 100644 loadtime/src/org/aspectj/weaver/loadtime/TraceMessageHandler.java delete mode 100644 loadtime/testsrc/org/aspectj/weaver/loadtime/TraceMessageHandlerTest.java delete mode 100644 tests/tracing/MyDefaultTraceMessageHandler.java delete mode 100644 tests/tracing/aop-defaulttracemessagehandler.xml diff --git a/loadtime/src/org/aspectj/weaver/loadtime/TraceMessageHandler.java b/loadtime/src/org/aspectj/weaver/loadtime/TraceMessageHandler.java deleted file mode 100644 index b661bc799..000000000 --- a/loadtime/src/org/aspectj/weaver/loadtime/TraceMessageHandler.java +++ /dev/null @@ -1,81 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Matthew Webster - initial implementation - *******************************************************************************/ -package org.aspectj.weaver.loadtime; - -import org.aspectj.bridge.AbortException; -import org.aspectj.bridge.IMessage; -import org.aspectj.bridge.IMessageHandler; -import org.aspectj.bridge.WeaveMessage; -import org.aspectj.bridge.IMessage.Kind; -import org.aspectj.weaver.tools.Trace; -import org.aspectj.weaver.tools.TraceFactory; - -public class TraceMessageHandler implements IMessageHandler { - - private Trace trace; - - public TraceMessageHandler () { - this(TraceFactory.getTraceFactory().getTrace(TraceMessageHandler.class)); - } - - /** - * Used for testing - * - */ - protected TraceMessageHandler (Trace t) { - this.trace = t; - } - - /* Ignore this and defer all decisions about what we log to the Trace - * configuration - */ - public void dontIgnore(Kind kind) { - } - - public boolean handleMessage(IMessage message) throws AbortException { - if (message instanceof WeaveMessage) { - trace.debug(render(message)); - } - else if (message.isDebug()) { - trace.debug(render(message)); - } - else if (message.isInfo()) { - trace.info(render(message)); - } - else if (message.isWarning()) { - trace.warn(render(message),message.getThrown()); - } - else if (message.isError()) { - trace.error(render(message),message.getThrown()); - } - else if (message.isFailed()) { - trace.fatal(render(message),message.getThrown()); - } - else if (message.isAbort()) { - trace.fatal(render(message),message.getThrown()); - } - else return false; - - return true; - } - - /* Ignore this and defer all decisions about what we log to the Trace - * configuration - */ - public boolean isIgnoring(Kind kind) { - return false; - } - - protected String render(IMessage message) { - return message.toString(); - } - -} diff --git a/loadtime/testsrc/org/aspectj/loadtime/LoadtimeModuleTests.java b/loadtime/testsrc/org/aspectj/loadtime/LoadtimeModuleTests.java index bfd89b8de..5683e5a8b 100644 --- a/loadtime/testsrc/org/aspectj/loadtime/LoadtimeModuleTests.java +++ b/loadtime/testsrc/org/aspectj/loadtime/LoadtimeModuleTests.java @@ -11,15 +11,14 @@ package org.aspectj.loadtime; * Alexandre Vasseur initial implementation *******************************************************************************/ -import junit.framework.TestCase; import junit.framework.Test; +import junit.framework.TestCase; import junit.framework.TestSuite; import junit.textui.TestRunner; import org.aspectj.weaver.loadtime.AjTest; import org.aspectj.weaver.loadtime.ClassLoaderWeavingAdaptorTest; import org.aspectj.weaver.loadtime.JRockitAgentTest; -import org.aspectj.weaver.loadtime.TraceMessageHandlerTest; import org.aspectj.weaver.loadtime.WeavingContextTest; import org.aspectj.weaver.loadtime.WeavingURLClassLoaderTest; import org.aspectj.weaver.loadtime.test.DocumentParserTest; @@ -36,7 +35,6 @@ public class LoadtimeModuleTests extends TestCase { suite.addTestSuite(AjTest.class); suite.addTestSuite(ClassLoaderWeavingAdaptorTest.class); suite.addTestSuite(JRockitAgentTest.class); - suite.addTestSuite(TraceMessageHandlerTest.class); suite.addTestSuite(WeavingContextTest.class); suite.addTestSuite(WeavingURLClassLoaderTest.class); return suite; diff --git a/loadtime/testsrc/org/aspectj/weaver/loadtime/TraceMessageHandlerTest.java b/loadtime/testsrc/org/aspectj/weaver/loadtime/TraceMessageHandlerTest.java deleted file mode 100644 index 7bd499a44..000000000 --- a/loadtime/testsrc/org/aspectj/weaver/loadtime/TraceMessageHandlerTest.java +++ /dev/null @@ -1,58 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Matthew Webster - initial implementation - *******************************************************************************/ -package org.aspectj.weaver.loadtime; - -import junit.framework.TestCase; - -import org.aspectj.bridge.IMessage; -import org.aspectj.bridge.MessageUtil; -import org.aspectj.bridge.IMessage.Kind; - -public class TraceMessageHandlerTest extends TestCase { - - private TraceMessageHandler messageHandler; - - protected void setUp() throws Exception { - super.setUp(); - messageHandler = new TraceMessageHandler(); - } - - public void testTraceMessageHandler() { - TraceMessageHandler tmh = new TraceMessageHandler(); - } - - public void testDontIgnore() { - Kind kind = IMessage.WEAVEINFO; - messageHandler.dontIgnore(kind); - boolean b = messageHandler.isIgnoring(kind); - assertFalse("Don't filter message kinds",b); - } - - public void testHandleMessageInfo () { - IMessage message = MessageUtil.info("testHandleMessage"); - boolean b = messageHandler.handleMessage(message); - assertTrue("Message not handled",b); - } - - public void testIsIgnoring() { - Kind kind = IMessage.WEAVEINFO; - boolean b = messageHandler.isIgnoring(kind); - assertFalse("Don't filter message kinds",b); - } - - public void testRender() { - String text = "testRender"; - IMessage message = MessageUtil.info(text); - String s = messageHandler.render(message); - assertTrue("Message not rendered correctly",s.indexOf(text) != -1); - } - -} diff --git a/tests/tracing/MyDefaultTraceMessageHandler.java b/tests/tracing/MyDefaultTraceMessageHandler.java deleted file mode 100644 index b617568a6..000000000 --- a/tests/tracing/MyDefaultTraceMessageHandler.java +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index bf1a587ee..000000000 --- a/tests/tracing/aop-defaulttracemessagehandler.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file -- 2.39.5