Merge branch 'biz' of github.com:dianping/cat into biz

cat-consumer/src/test/java/com/dianping/cat/consumer/event/EventAnalyzerTest.java

@@ -26,7 +26,9 @@ public class EventAnalyzerTest extends ComponentTestCase {
 	@Before
 	public void setUp() throws Exception {
 		super.setUp();
-		m_timestamp = System.currentTimeMillis() - System.currentTimeMillis() % (3600 * 1000);
+		long currentTimeMillis = System.currentTimeMillis();
+
+		m_timestamp = currentTimeMillis - currentTimeMillis % (3600 * 1000);
 
 		m_analyzer = (EventAnalyzer) lookup(MessageAnalyzer.class, EventAnalyzer.ID);
 	}
@@ -62,7 +64,8 @@ public class EventAnalyzerTest extends ComponentTestCase {
 			t2.setStatus(Message.SUCCESS);
 		}
 
-		Message event1 = new DefaultEvent("test2", "fail");
+		DefaultEvent event1 = new DefaultEvent("test2", "fail");
+		event1.setTimestamp(m_timestamp + 5 * 60 * 1000);
 
 		t2.addChild(event1);
 		t2.complete();
@@ -76,7 +79,8 @@ public class EventAnalyzerTest extends ComponentTestCase {
 			t.setStatus(Message.SUCCESS);
 		}
 
-		Message event = new DefaultEvent("test1", "success");
+		DefaultEvent event = new DefaultEvent("test1", "success");
+		event.setTimestamp(m_timestamp + 5 * 60 * 1000);
 		event.setStatus(Message.SUCCESS);
 		t.addChild(event);
 

cat-consumer/src/test/resources/com/dianping/cat/consumer/event/event_analyzer.xml

@@ -7,14 +7,14 @@
          <failMessageUrl>1</failMessageUrl>
          <name id="fail" totalCount="1000" failCount="1000" failPercent="100.00">
             <failMessageUrl>1</failMessageUrl>
-            <range value="55" count="1000" fails="1000"/>
+            <range value="5" count="1000" fails="1000"/>
          </name>
       </type>
       <type id="test1" totalCount="1000" failCount="0" failPercent="0.00">
          <successMessageUrl>1</successMessageUrl>
          <name id="success" totalCount="1000" failCount="0" failPercent="0.00">
             <successMessageUrl>1</successMessageUrl>
-            <range value="55" count="1000" fails="0"/>
+            <range value="5" count="1000" fails="0"/>
          </name>
       </type>
    </machine>