add new unit tests into AllTest

cat-consumer-advanced/src/test/java/com/dianping/cat/consumer/AllTests.java

@@ -10,19 +10,29 @@ import com.dianping.cat.consumer.advanced.MatrixModelTest;
 import com.dianping.cat.consumer.advanced.SqlParsersTest;
 import com.dianping.cat.consumer.browser.BrowserReportMergerTest;
 import com.dianping.cat.consumer.cross.CrossAnalyzerTest;
+import com.dianping.cat.consumer.cross.CrossReportMergerTest;
 import com.dianping.cat.consumer.dependency.DependencyAnalyzerTest;
+import com.dianping.cat.consumer.dependency.DependencyReportMergerTest;
 import com.dianping.cat.consumer.matrix.MatrixAnalyzerTest;
+import com.dianping.cat.consumer.matrix.MatrixReportMergerTest;
 import com.dianping.cat.consumer.sql.SqlAnalyzerTest;
+import com.dianping.cat.consumer.sql.SqlReportMergerTest;
 
 @RunWith(Suite.class)
 @SuiteClasses({
 
 CrossInfoTest.class,
 
+CrossReportMergerTest.class,
+
 MatrixModelTest.class,
 
+MatrixReportMergerTest.class,
+
 SqlParsersTest.class,
 
+SqlReportMergerTest.class,
+
 DatabaseParserTest.class,
 
 BrowserReportMergerTest.class,
@@ -33,7 +43,9 @@ SqlAnalyzerTest.class,
 
 MatrixAnalyzerTest.class,
 
-DependencyAnalyzerTest.class
+DependencyAnalyzerTest.class,
+
+DependencyReportMergerTest.class
 
 })
 public class AllTests {

cat-consumer-advanced/src/test/java/com/dianping/cat/consumer/dependency/DependencyReportMergerTest.java

@@ -9,7 +9,7 @@ import com.dianping.cat.consumer.dependency.model.transform.DefaultSaxParser;
 
 public class DependencyReportMergerTest {
 	@Test
-	public void testTopReportMerge() throws Exception {
+	public void testDependencyReportMerge() throws Exception {
 		String oldXml = Files.forIO().readFrom(getClass().getResourceAsStream("dependency_analyzer.xml"), "utf-8");
 		String newXml = Files.forIO().readFrom(getClass().getResourceAsStream("dependency_analyzer.xml"), "utf-8");
 		DependencyReport reportOld = DefaultSaxParser.parse(oldXml);

cat-consumer-advanced/src/test/java/com/dianping/cat/consumer/matrix/MatrixReportMergerTest.java

@@ -9,7 +9,7 @@ import com.dianping.cat.consumer.matrix.model.transform.DefaultSaxParser;
 
 public class MatrixReportMergerTest {
 	@Test
-	public void testTopReportMerge() throws Exception {
+	public void testMatrixReportMerge() throws Exception {
 		String oldXml = Files.forIO().readFrom(getClass().getResourceAsStream("matrix_analyzer.xml"), "utf-8");
 		String newXml = Files.forIO().readFrom(getClass().getResourceAsStream("matrix_analyzer.xml"), "utf-8");
 		MatrixReport reportOld = DefaultSaxParser.parse(oldXml);

cat-consumer-advanced/src/test/java/com/dianping/cat/consumer/sql/SqlReportMergerTest.java

@@ -10,7 +10,7 @@ import com.dianping.cat.consumer.sql.model.transform.DefaultSaxParser;
 
 public class SqlReportMergerTest {
 	@Test
-	public void testTopReportMerge() throws Exception {
+	public void testSqlReportMerge() throws Exception {
 		String oldXml = Files.forIO().readFrom(getClass().getResourceAsStream("sql_analyzer.xml"), "utf-8");
 		String newXml = Files.forIO().readFrom(getClass().getResourceAsStream("sql_analyzer.xml"), "utf-8");
 		SqlReport reportOld = DefaultSaxParser.parse(oldXml);

cat-consumer/src/test/java/com/dianping/cat/consumer/AllTests.java

@@ -12,6 +12,7 @@ import com.dianping.cat.consumer.core.aggregation.DefaultFormatTest;
 import com.dianping.cat.consumer.event.EventAnalyzerTest;
 import com.dianping.cat.consumer.event.EventReportMergerTest;
 import com.dianping.cat.consumer.heartbeat.HeartbeatAnalyzerTest;
+import com.dianping.cat.consumer.heartbeat.HeartbeatReportMergerTest;
 import com.dianping.cat.consumer.problem.ProblemAnalyzerTest;
 import com.dianping.cat.consumer.problem.ProblemHandlerTest;
 import com.dianping.cat.consumer.problem.ProblemReportAggregationTest;
@@ -20,6 +21,7 @@ import com.dianping.cat.consumer.problem.ProblemReportTest;
 import com.dianping.cat.consumer.state.StateAnalyzerTest;
 import com.dianping.cat.consumer.state.StateReportMergerTest;
 import com.dianping.cat.consumer.top.TopAnalyzerTest;
+import com.dianping.cat.consumer.top.TopReportMergerTest;
 import com.dianping.cat.consumer.transaction.TransactionAnalyzerTest;
 import com.dianping.cat.consumer.transaction.TransactionReportFilterTest;
 import com.dianping.cat.consumer.transaction.TransactionReportMergerTest;
@@ -57,6 +59,8 @@ EventReportMergerTest.class,
 /* heartbeat */
 HeartbeatAnalyzerTest.class,
 
+HeartbeatReportMergerTest.class,
+
 /* state */
 StateAnalyzerTest.class,
 
@@ -65,6 +69,8 @@ StateReportMergerTest.class,
 /* top */
 TopAnalyzerTest.class,
 
+TopReportMergerTest.class,
+
 /* problem */
 ProblemReportAggregationTest.class,