fix test failures

cat-client/src/test/java/com/dianping/cat/servlet/CatFilterTest.java

@@ -16,8 +16,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.webapp.WebAppContext;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 import org.unidal.helper.Files;
 import org.unidal.helper.Joiners;
@@ -31,17 +29,6 @@ import com.dianping.cat.message.Transaction;
 import junit.framework.Assert;
 
 public class CatFilterTest extends JettyServer {
-	@After
-	public void after() throws Exception {
-		super.stopServer();
-	}
-
-	@Before
-	public void before() throws Exception {
-		System.setProperty("devMode", "true");
-		super.startServer();
-	}
-
 	@Override
 	protected String getContextPath() {
 		return "/mock";

cat-client/src/test/resources/com/dianping/cat/configuration/config.xml

 <?xml version="1.0" encoding="utf-8"?>
 <config mode="client" enabled="true" dev-mode="false" xmlns:xsi="http://www.w3.org/2001/XMLSchema" xsi:noNamespaceSchemaLocation="config.xsd">
-   <base-log-dir>target/catlog</base-log-dir>
+   <base-log-dir>target/cat</base-log-dir>
    <servers>
       <server ip="192.168.8.21" port="2280" http-port="8080" enabled="true"/>
       <server ip="192.168.8.22" port="2281" http-port="8080" enabled="false"/>

cat-consumer/src/main/java/com/dianping/cat/consumer/state/StateAnalyzer.java

@@ -6,11 +6,13 @@ import java.util.Map.Entry;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.unidal.lookup.annotation.Inject;
+import org.unidal.lookup.annotation.Named;
 import org.unidal.lookup.logging.LogEnabled;
 import org.unidal.lookup.logging.Logger;
 
 import com.dianping.cat.Constants;
 import com.dianping.cat.analysis.AbstractMessageAnalyzer;
+import com.dianping.cat.analysis.MessageAnalyzer;
 import com.dianping.cat.config.server.ServerFilterConfigManager;
 import com.dianping.cat.configuration.NetworkInterfaceManager;
 import com.dianping.cat.consumer.state.model.entity.Detail;
@@ -19,11 +21,12 @@ import com.dianping.cat.consumer.state.model.entity.Message;
 import com.dianping.cat.consumer.state.model.entity.ProcessDomain;
 import com.dianping.cat.consumer.state.model.entity.StateReport;
 import com.dianping.cat.message.spi.MessageTree;
-import com.dianping.cat.report.ReportManager;
 import com.dianping.cat.report.DefaultReportManager.StoragePolicy;
+import com.dianping.cat.report.ReportManager;
 import com.dianping.cat.statistic.ServerStatistic.Statistic;
 import com.dianping.cat.statistic.ServerStatisticManager;
 
+@Named(type = MessageAnalyzer.class, value = StateAnalyzer.ID, instantiationStrategy = Named.PER_LOOKUP)
 public class StateAnalyzer extends AbstractMessageAnalyzer<StateReport> implements LogEnabled {
 	public static final String ID = "state";
 
@@ -36,7 +39,6 @@ public class StateAnalyzer extends AbstractMessageAnalyzer<StateReport> implemen
 	@Inject
 	private ServerFilterConfigManager m_serverFilterConfigManager;
 
-	@Inject
 	private String m_ip = NetworkInterfaceManager.INSTANCE.getLocalHostAddress();
 
 	private Machine buildStateInfo(Machine machine) {
@@ -209,4 +211,8 @@ public class StateAnalyzer extends AbstractMessageAnalyzer<StateReport> implemen
 			machine.findOrCreateProcessDomain(domain).addIp(ip);
 		}
 	}
+	
+	public void setIp(String ip) {
+		m_ip = ip;
+	}
 }

cat-consumer/src/test/java/com/dianping/cat/consumer/state/StateAnalyzerTest.java

@@ -30,7 +30,7 @@ public class StateAnalyzerTest extends ComponentTestCase {
 		Date date = sdf.parse("20120101 00:00:00:00");
 
 		m_analyzer = (StateAnalyzer) lookup(MessageAnalyzer.class, StateAnalyzer.ID);
-		
+		m_analyzer.setIp("192.168.1.1");
 		m_analyzer.initialize(date.getTime(), Constants.HOUR, Constants.MINUTE * 5);
 	}
 

cat-consumer/src/test/java/com/dianping/cat/consumer/state/Configurator.java → cat-consumer/src/test/java/com/dianping/cat/consumer/state/StateAnalyzerTestConfigurator.java

@@ -4,50 +4,50 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.unidal.lookup.annotation.Inject;
+import org.unidal.lookup.annotation.Named;
 import org.unidal.lookup.configuration.AbstractResourceConfigurator;
 import org.unidal.lookup.configuration.Component;
 
 import com.dianping.cat.Constants;
-import com.dianping.cat.analysis.MessageAnalyzer;
-import com.dianping.cat.config.server.ServerConfigManager;
 import com.dianping.cat.consumer.MockReportManager;
 import com.dianping.cat.consumer.state.model.entity.StateReport;
 import com.dianping.cat.report.ReportDelegate;
 import com.dianping.cat.report.ReportManager;
-import com.dianping.cat.statistic.ServerStatisticManager;
-
-public class Configurator extends AbstractResourceConfigurator {
 
+public class StateAnalyzerTestConfigurator extends AbstractResourceConfigurator {
 	public static void main(String[] args) {
-		generatePlexusComponentsXmlFile(new Configurator());
-	}
-
-	protected Class<?> getTestClass() {
-		return StateAnalyzerTest.class;
+		generatePlexusComponentsXmlFile(new StateAnalyzerTestConfigurator());
 	}
 
 	@Override
 	public List<Component> defineComponents() {
 		List<Component> all = new ArrayList<Component>();
-		final String ID = StateAnalyzer.ID;
 
-		all.add(C(ReportManager.class, ID, MockStateReportManager.class)//
-		      .req(ReportDelegate.class, ID));
-		all.add(C(ReportDelegate.class, ID, ExtendedStateDelegate.class));
-		all.add(C(MessageAnalyzer.class, ID, StateAnalyzer.class).req(ReportManager.class, ID)
-		      .req(ServerConfigManager.class, ServerStatisticManager.class).config(E("m_ip").value("192.168.1.1")));
+		all.add(A(MockStateReportManager.class));
+		all.add(A(ExtendedStateDelegate.class));
+		all.add(A(StateAnalyzer.class));
 
 		return all;
 	}
 
+	protected Class<?> getTestClass() {
+		return StateAnalyzerTest.class;
+	}
+
+	@Named(type = ReportDelegate.class, value = StateAnalyzer.ID)
 	public static class ExtendedStateDelegate extends StateDelegate {
 	}
 
+	@Named(type = ReportManager.class, value = StateAnalyzer.ID)
 	public static class MockStateReportManager extends MockReportManager<StateReport> {
+		@Inject(StateAnalyzer.ID)
+		private ReportDelegate<StateReport> m_delegate;
+
 		private StateReport m_report;
 
-		@Inject
-		private ReportDelegate<StateReport> m_delegate;
+		@Override
+		public void destory() {
+		}
 
 		@Override
 		public StateReport getHourlyReport(long startTime, String domain, boolean createIfNotExist) {
@@ -57,10 +57,5 @@ public class Configurator extends AbstractResourceConfigurator {
 
 			return m_report;
 		}
-
-		@Override
-      public void destory() {
-      }
 	}
-	
 }

cat-consumer/src/test/resources/com/dianping/cat/consumer/state/StateAnalyzerTest.xml

+<?xml version="1.0" encoding="utf-8"?>
 <plexus>
 	<components>
 		<component>
 			<role>com.dianping.cat.report.ReportManager</role>
 			<role-hint>state</role-hint>
-			<implementation>com.dianping.cat.consumer.state.Configurator$MockStateReportManager</implementation>
+			<implementation>com.dianping.cat.consumer.state.StateAnalyzerTestConfigurator$MockStateReportManager</implementation>
 			<requirements>
 				<requirement>
 					<role>com.dianping.cat.report.ReportDelegate</role>
@@ -14,25 +15,34 @@
 		<component>
 			<role>com.dianping.cat.report.ReportDelegate</role>
 			<role-hint>state</role-hint>
-			<implementation>com.dianping.cat.consumer.state.Configurator$ExtendedStateDelegate</implementation>
+			<implementation>com.dianping.cat.consumer.state.StateAnalyzerTestConfigurator$ExtendedStateDelegate</implementation>
+			<requirements>
+				<requirement>
+					<role>com.dianping.cat.task.TaskManager</role>
+				</requirement>
+				<requirement>
+					<role>com.dianping.cat.report.ReportBucketManager</role>
+				</requirement>
+			</requirements>
 		</component>
 		<component>
 			<role>com.dianping.cat.analysis.MessageAnalyzer</role>
 			<role-hint>state</role-hint>
 			<implementation>com.dianping.cat.consumer.state.StateAnalyzer</implementation>
-			<configuration>
-				<m_ip>192.168.1.1</m_ip>
-			</configuration>
+			<instantiation-strategy>per-lookup</instantiation-strategy>
 			<requirements>
 				<requirement>
 					<role>com.dianping.cat.report.ReportManager</role>
 					<role-hint>state</role-hint>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.config.server.ServerConfigManager</role>
+					<role>com.dianping.cat.statistic.ServerStatisticManager</role>
 				</requirement>
 				<requirement>
-					<role>com.dianping.cat.statistic.ServerStatisticManager</role>
+					<role>com.dianping.cat.config.server.ServerFilterConfigManager</role>
+				</requirement>
+				<requirement>
+					<role>com.dianping.cat.config.server.ServerConfigManager</role>
 				</requirement>
 			</requirements>
 		</component>

cat-home/src/test/java/com/dianping/cat/TestServer.java

 package com.dianping.cat;
 
+import java.util.EnumSet;
+
+import javax.servlet.DispatcherType;
+
+import org.eclipse.jetty.servlets.GzipFilter;
 import org.eclipse.jetty.webapp.WebAppContext;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -10,7 +15,6 @@ import org.unidal.test.jetty.JettyServer;
 public class TestServer extends JettyServer {
 	public static void main(String[] args) throws Exception {
 		TestServer server = new TestServer();
-		System.setProperty("devMode", "true");
 		server.startServer();
 		server.startWebApp();
 		server.stopServer();
@@ -28,7 +32,7 @@ public class TestServer extends JettyServer {
 
 	@Override
 	protected void postConfigure(WebAppContext context) {
-		//context.addFilter(GzipFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
+		context.addFilter(GzipFilter.class, "/*", EnumSet.of(DispatcherType.REQUEST));
 	}
 
 	@Test