fix test cases

cat-consumer/src/main/java/com/dianping/cat/consumer/failure/FailureReportAnalyzer.java

@@ -67,6 +67,7 @@ public class FailureReportAnalyzer extends AbstractMessageAnalyzer<FailureReport
 		if (m_handlers == null) {
 			m_handlers = new ArrayList<FailureReportAnalyzer.Handler>();
 		}
+
 		m_handlers.add(handler);
 	}
 

cat-consumer/src/test/java/com/dianping/cat/consumer/failure/FailureAnalyzerStoreTest.java

 package com.dianping.cat.consumer.failure;
 
 import java.io.File;
+import java.util.regex.Pattern;
 
 import junit.framework.Assert;
 
@@ -9,9 +10,11 @@ import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
 import com.dianping.cat.consumer.AnalyzerFactory;
+import com.dianping.cat.consumer.failure.FailureReportAnalyzer.Handler;
 import com.dianping.cat.consumer.failure.model.entity.FailureReport;
 import com.dianping.cat.consumer.failure.model.transform.DefaultJsonBuilder;
 import com.dianping.cat.message.internal.DefaultTransaction;
+import com.dianping.cat.message.spi.MessagePathBuilder;
 import com.dianping.cat.message.spi.MessageTree;
 import com.dianping.cat.message.spi.internal.DefaultMessageTree;
 import com.site.helper.Files;
@@ -19,6 +22,16 @@ import com.site.lookup.ComponentTestCase;
 
 @RunWith(JUnit4.class)
 public class FailureAnalyzerStoreTest extends ComponentTestCase {
+	@Test
+	public void testLookup() throws Exception {
+		Handler failure = lookup(Handler.class, "failure-handler");
+		Handler longUrl = lookup(Handler.class, "long-url-handler");
+
+		// make sure all handlers could be looked up successfully
+		Assert.assertNotNull(failure);
+		Assert.assertNotNull(longUrl);
+	}
+
 	@Test
 	public void testJson() throws Exception {
 		long current = 1327470645035L;
@@ -26,6 +39,7 @@ public class FailureAnalyzerStoreTest extends ComponentTestCase {
 		long extraTime = 5 * 60 * 1000;
 		long start = current - current % (60 * 60 * 1000);
 
+		MessagePathBuilder pathBuilder = lookup(MessagePathBuilder.class);
 		AnalyzerFactory factory = lookup(AnalyzerFactory.class);
 		FailureReportAnalyzer analyzer = (FailureReportAnalyzer) factory.create("failure", start, duration, "domain1",
 		      extraTime);
@@ -55,6 +69,9 @@ public class FailureAnalyzerStoreTest extends ComponentTestCase {
 
 		String json = builder.getString();
 		String expected = Files.forIO().readFrom(getResourceFile("failure.json"), "utf-8");
+		String baseDir = pathBuilder.getLogViewBaseDir().toString();
+
+		json = json.replaceAll(Pattern.quote(baseDir), "./target/catlog");
 
 		Assert.assertEquals("Check json content!", expected.replace("\r", ""), json.replace("\r", ""));
 	}

cat-consumer/src/test/resources/com/dianping/cat/consumer/failure/failure.json

@@ -25,19 +25,19 @@
          "entries": [
             {
                "type": "LongUrl",
-               "path": "file:/Users/qmwu/project/tracking/cat-consumer/target/catlog/20120125/middleware/MessageId0",
+               "path": "file:./target/catlog/20120125/13/middleware/MessageId0.html",
                "threadId": "Thread0",
                "text": "A1B1"
             },
             {
                "type": "LongUrl",
-               "path": "file:/Users/qmwu/project/tracking/cat-consumer/target/catlog/20120125/middleware/MessageId0",
+               "path": "file:./target/catlog/20120125/13/middleware/MessageId0.html",
                "threadId": "Thread0",
                "text": "A1B1"
             },
             {
                "type": "LongUrl",
-               "path": "file:/Users/qmwu/project/tracking/cat-consumer/target/catlog/20120125/middleware/MessageId0",
+               "path": "file:./target/catlog/20120125/13/middleware/MessageId0.html",
                "threadId": "Thread0",
                "text": "A1B1"
             }
@@ -48,19 +48,19 @@
          "entries": [
             {
                "type": "LongUrl",
-               "path": "file:/Users/qmwu/project/tracking/cat-consumer/target/catlog/20120125/middleware/MessageId1",
+               "path": "file:./target/catlog/20120125/13/middleware/MessageId1.html",
                "threadId": "Thread1",
                "text": "A1B1"
             },
             {
                "type": "LongUrl",
-               "path": "file:/Users/qmwu/project/tracking/cat-consumer/target/catlog/20120125/middleware/MessageId1",
+               "path": "file:./target/catlog/20120125/13/middleware/MessageId1.html",
                "threadId": "Thread1",
                "text": "A1B1"
             },
             {
                "type": "LongUrl",
-               "path": "file:/Users/qmwu/project/tracking/cat-consumer/target/catlog/20120125/middleware/MessageId1",
+               "path": "file:./target/catlog/20120125/13/middleware/MessageId1.html",
                "threadId": "Thread1",
                "text": "A1B1"
             }
@@ -71,19 +71,19 @@
          "entries": [
             {
                "type": "LongUrl",
-               "path": "file:/Users/qmwu/project/tracking/cat-consumer/target/catlog/20120125/middleware/MessageId2",
+               "path": "file:./target/catlog/20120125/13/middleware/MessageId2.html",
                "threadId": "Thread2",
                "text": "A1B1"
             },
             {
                "type": "LongUrl",
-               "path": "file:/Users/qmwu/project/tracking/cat-consumer/target/catlog/20120125/middleware/MessageId2",
+               "path": "file:./target/catlog/20120125/13/middleware/MessageId2.html",
                "threadId": "Thread2",
                "text": "A1B1"
             },
             {
                "type": "LongUrl",
-               "path": "file:/Users/qmwu/project/tracking/cat-consumer/target/catlog/20120125/middleware/MessageId2",
+               "path": "file:./target/catlog/20120125/13/middleware/MessageId2.html",
                "threadId": "Thread2",
                "text": "A1B1"
             }
@@ -94,19 +94,19 @@
          "entries": [
             {
                "type": "LongUrl",
-               "path": "file:/Users/qmwu/project/tracking/cat-consumer/target/catlog/20120125/middleware/MessageId3",
+               "path": "file:./target/catlog/20120125/13/middleware/MessageId3.html",
                "threadId": "Thread3",
                "text": "A1B1"
             },
             {
                "type": "LongUrl",
-               "path": "file:/Users/qmwu/project/tracking/cat-consumer/target/catlog/20120125/middleware/MessageId3",
+               "path": "file:./target/catlog/20120125/13/middleware/MessageId3.html",
                "threadId": "Thread3",
                "text": "A1B1"
             },
             {
                "type": "LongUrl",
-               "path": "file:/Users/qmwu/project/tracking/cat-consumer/target/catlog/20120125/middleware/MessageId3",
+               "path": "file:./target/catlog/20120125/13/middleware/MessageId3.html",
                "threadId": "Thread3",
                "text": "A1B1"
             }
@@ -117,19 +117,19 @@
          "entries": [
             {
                "type": "LongUrl",
-               "path": "file:/Users/qmwu/project/tracking/cat-consumer/target/catlog/20120125/middleware/MessageId4",
+               "path": "file:./target/catlog/20120125/13/middleware/MessageId4.html",
                "threadId": "Thread4",
                "text": "A1B1"
             },
             {
                "type": "LongUrl",
-               "path": "file:/Users/qmwu/project/tracking/cat-consumer/target/catlog/20120125/middleware/MessageId4",
+               "path": "file:./target/catlog/20120125/13/middleware/MessageId4.html",
                "threadId": "Thread4",
                "text": "A1B1"
             },
             {
                "type": "LongUrl",
-               "path": "file:/Users/qmwu/project/tracking/cat-consumer/target/catlog/20120125/middleware/MessageId4",
+               "path": "file:./target/catlog/20120125/13/middleware/MessageId4.html",
                "threadId": "Thread4",
                "text": "A1B1"
             }

cat-core/src/main/java/com/dianping/cat/message/internal/DefaultMessageManager.java

@@ -48,11 +48,6 @@ public class DefaultMessageManager extends ContainerHolder implements MessageMan
 	}
 
 	void flush(MessageTree tree) {
-		// if (m_manager == null) {
-		// throw new
-		// RuntimeException("Cat has not been initialized successfully, please call Cat.initialize() first!");
-		// }
-
 		if (m_manager != null) {
 			MessageSender sender = m_manager.getSender();
 
@@ -76,8 +71,8 @@ public class DefaultMessageManager extends ContainerHolder implements MessageMan
 		Context ctx = m_context.get();
 
 		if (ctx == null) {
-			throw new RuntimeException(
-			      "Cat has not been initialized successfully, please call Cal.setup(...) first for each thread.");
+			throw new RuntimeException("Cat has not been initialized successfully, "
+			      + "please call Cal.setup(...) first for each thread.");
 		} else {
 			return ctx;
 		}

cat-core/src/main/java/com/dianping/cat/message/spi/internal/DefaultMessagePathBuilder.java

@@ -46,7 +46,11 @@ public class DefaultMessagePathBuilder implements MessagePathBuilder, Initializa
 	@Override
 	public void initialize() throws InitializationException {
 		Config config = m_manager.getClientConfig();
-		
+
+		if (config == null) {
+			config = new Config();
+		}
+
 		String baseLogDir = config.getBaseLogDir();
 		String baseLogUrl = config.getBaseLogUrl();