refactor tests package

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

@@ -4,18 +4,18 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import com.dianping.cat.consumer.advanced.CrossInfoTest;
-import com.dianping.cat.consumer.advanced.DatabaseParserTest;
-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.CrossInfoTest;
 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.MatrixModelTest;
 import com.dianping.cat.consumer.matrix.MatrixReportMergerTest;
+import com.dianping.cat.consumer.sql.DatabaseParserTest;
 import com.dianping.cat.consumer.sql.SqlAnalyzerTest;
+import com.dianping.cat.consumer.sql.SqlParsersTest;
 import com.dianping.cat.consumer.sql.SqlReportMergerTest;
 
 @RunWith(Suite.class)

cat-consumer-advanced/src/test/java/com/dianping/cat/consumer/advanced/CrossInfoTest.java → cat-consumer-advanced/src/test/java/com/dianping/cat/consumer/cross/CrossInfoTest.java

-package com.dianping.cat.consumer.advanced;
+package com.dianping.cat.consumer.cross;
 
 import junit.framework.Assert;
 

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

-package com.dianping.cat.consumer.advanced;
+package com.dianping.cat.consumer.matrix;
 
 import junit.framework.Assert;
 

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

-package com.dianping.cat.consumer.advanced;
+package com.dianping.cat.consumer.sql;
 
 import junit.framework.Assert;
 

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

-package com.dianping.cat.consumer.advanced;
+package com.dianping.cat.consumer.sql;
 
 import java.util.Arrays;
 import java.util.List;

cat-consumer-advanced/src/test/resources/com/dianping/cat/consumer/advanced/database-report.xml

-<database-report database="CAT" connect-url="jdbc://10.1.1.220:3306/cat"
-	startTime="2012-06-18 14:00:00" endTime="2012-06-18 14:59:59">
-	<databaseName>CAT1</databaseName>
-	<databaseName>CAT2</databaseName>
-	<domain id="Cat">
-		<table id="HostInfo" totalCount="111507" failCount="0"
-			failPercent="0.00" avg="0.0" sum="1937.0" tps="0.00">
-			<method id="select" totalCount="1" failCount="0" failPercent="0.00"
-				avg="0.0" sum="0.9" tps="0.00"></method>
-			<method id="insert" totalCount="1" failCount="0" failPercent="0.00"
-				avg="0.0" sum="0.9" tps="0.00"></method>
-		</table>
-		<table></table>
-	</domain>
-	<domain></domain>
-</database-report>
-
-
-

cat-consumer-advanced/src/test/resources/com/dianping/cat/consumer/advanced/dependency-report.xml

-<dependency-report domain="Cat" startTime="2012-05-16 16:00:00"
-	endTime="2012-05-16 16:59:59">
-	<segment id="1" exception-count="0">
-		<index name="URL" total-count="1234" error-count="123" sum="123.0" avg="123.0"></index>
-		<index name="Cache" total-count="1234" error-count="123" sum="123.0" avg="123.0"></index>
-		
-		<dependency type="PigeonService" target="UserService"
-			total-count="1" avg="1.0" error-count="1" />
-		<dependency type="PigeonCall" target="UserService" total-count="1"
-			avg="1.0" error-count="1" />
-		<dependency type="Database" target="UserService" total-count="1"
-			avg="1.0" error-count="1" />
-		<dependency type="MemoryCache" target="UserService" total-count="1"
-			avg="1.0" error-count="1" />
-		<dependency type="HttpCall"  target="UserService" total-count="1"
-			avg="1.0" error-count="1" />
-	</segment>
-	<segment></segment>
-</dependency-report>

cat-consumer-advanced/src/test/resources/com/dianping/cat/consumer/advanced/matrix-report.xml

-<matrix-report domain="Cat" startTime="2012-05-16 16:00:00"	endTime="2012-05-16 16:59:59">
-	<domain>Cat1</domain>
-	<domain>Cat</domain>
-	<matrix type="URL" name="/index" count="100" totalTime="500.0"  >
-		<ratio type="SQL" count="1" min="1" max="2" totalCount="150"  totalTime="400.0"/>
-		<ratio/>
-	</matrix>
-	<matrix>
-	</matrix>
-</matrix-report>
\ No newline at end of file