diff --git a/cat-consumer/src/test/java/com/dianping/cat/consumer/MockReportManager.java b/cat-consumer/src/test/java/com/dianping/cat/consumer/MockReportManager.java index 8b9a0c3b741ea71b3eae11f73be410e017e1c19d..47b17c27eaa1df143a9f10d266272f555e8abf49 100644 --- a/cat-consumer/src/test/java/com/dianping/cat/consumer/MockReportManager.java +++ b/cat-consumer/src/test/java/com/dianping/cat/consumer/MockReportManager.java @@ -44,7 +44,6 @@ public class MockReportManager implements ReportManager { if (m_report == null) { m_report = m_delegate.makeReport(domain, startTime, Constants.HOUR); } - return m_report; } diff --git a/cat-consumer/src/test/java/com/dianping/cat/consumer/event/EventAnalyzerTest.java b/cat-consumer/src/test/java/com/dianping/cat/consumer/event/EventAnalyzerTest.java index d703ac236cf61de558a39d106480a30aa2a00834..4e6733ba825c1853b6c9bce34911e8762a97ce47 100644 --- a/cat-consumer/src/test/java/com/dianping/cat/consumer/event/EventAnalyzerTest.java +++ b/cat-consumer/src/test/java/com/dianping/cat/consumer/event/EventAnalyzerTest.java @@ -1,5 +1,8 @@ package com.dianping.cat.consumer.event; +import java.text.SimpleDateFormat; +import java.util.Date; + import junit.framework.Assert; import org.junit.Before; @@ -7,6 +10,7 @@ import org.junit.Test; import org.unidal.helper.Files; import org.unidal.lookup.ComponentTestCase; +import com.dianping.cat.Constants; import com.dianping.cat.analysis.MessageAnalyzer; import com.dianping.cat.consumer.event.model.entity.EventReport; import com.dianping.cat.message.Message; @@ -31,6 +35,10 @@ public class EventAnalyzerTest extends ComponentTestCase { m_timestamp = currentTimeMillis - currentTimeMillis % (3600 * 1000); m_analyzer = (EventAnalyzer) lookup(MessageAnalyzer.class, EventAnalyzer.ID); + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd HH:mm"); + Date date = sdf.parse("20120101 00:00"); + + m_analyzer.initialize(date.getTime(), Constants.HOUR, Constants.MINUTE * 5); } @Test diff --git a/cat-consumer/src/test/java/com/dianping/cat/consumer/transaction/TransactionAnalyzerTest.java b/cat-consumer/src/test/java/com/dianping/cat/consumer/transaction/TransactionAnalyzerTest.java index 21c98ff38f4b95f85637baa7971bc279aba83120..33794ed651be7f9a66a10e876a7f8af498d17bb2 100644 --- a/cat-consumer/src/test/java/com/dianping/cat/consumer/transaction/TransactionAnalyzerTest.java +++ b/cat-consumer/src/test/java/com/dianping/cat/consumer/transaction/TransactionAnalyzerTest.java @@ -1,5 +1,8 @@ package com.dianping.cat.consumer.transaction; +import java.text.SimpleDateFormat; +import java.util.Date; + import junit.framework.Assert; import org.junit.Before; @@ -7,6 +10,7 @@ import org.junit.Test; import org.unidal.helper.Files; import org.unidal.lookup.ComponentTestCase; +import com.dianping.cat.Constants; import com.dianping.cat.analysis.MessageAnalyzer; import com.dianping.cat.consumer.transaction.model.entity.TransactionReport; import com.dianping.cat.message.Message; @@ -29,6 +33,10 @@ public class TransactionAnalyzerTest extends ComponentTestCase { try { m_analyzer = (TransactionAnalyzer) lookup(MessageAnalyzer.class, TransactionAnalyzer.ID); + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd HH:mm"); + Date date = sdf.parse("20120101 00:00"); + + m_analyzer.initialize(date.getTime(), Constants.HOUR, Constants.MINUTE * 5); } catch (Exception e) { e.printStackTrace(); } @@ -46,8 +54,7 @@ public class TransactionAnalyzerTest extends ComponentTestCase { report.accept(new TransactionStatisticsComputer()); - String expected = Files.forIO().readFrom(getClass().getResourceAsStream("transaction_analyzer.xml"), - "utf-8"); + String expected = Files.forIO().readFrom(getClass().getResourceAsStream("transaction_analyzer.xml"), "utf-8"); Assert.assertEquals(expected.replaceAll("\r", ""), report.toString().replaceAll("\r", "")); } diff --git a/cat-consumer/src/test/resources/com/dianping/cat/consumer/event/event_analyzer.xml b/cat-consumer/src/test/resources/com/dianping/cat/consumer/event/event_analyzer.xml index 260d66ceaff42e13154f1e773cf3a7482cb2af69..9b4b3e37ffdeca2622d930728aa6701e31e6e0d5 100644 --- a/cat-consumer/src/test/resources/com/dianping/cat/consumer/event/event_analyzer.xml +++ b/cat-consumer/src/test/resources/com/dianping/cat/consumer/event/event_analyzer.xml @@ -1,5 +1,5 @@ - + group 192.168.1.1 diff --git a/cat-consumer/src/test/resources/com/dianping/cat/consumer/transaction/transaction_analyzer.xml b/cat-consumer/src/test/resources/com/dianping/cat/consumer/transaction/transaction_analyzer.xml index d0e0ad39d6060d2a2c6d1871af9c1f1cad0c54c6..1c235926cee6429072fc7492e782632b6e5d3f8a 100644 --- a/cat-consumer/src/test/resources/com/dianping/cat/consumer/transaction/transaction_analyzer.xml +++ b/cat-consumer/src/test/resources/com/dianping/cat/consumer/transaction/transaction_analyzer.xml @@ -1,5 +1,5 @@ - + group 192.168.1.1 diff --git a/cat-core/src/main/java/com/dianping/cat/Constants.java b/cat-core/src/main/java/com/dianping/cat/Constants.java index 670f01087956069a928469c8d42c672700cb4acf..091c3cec3c5cbb8f5d19adb7942c9239363fc77d 100644 --- a/cat-core/src/main/java/com/dianping/cat/Constants.java +++ b/cat-core/src/main/java/com/dianping/cat/Constants.java @@ -5,6 +5,8 @@ public class Constants { public static final String CAT = "Cat"; + public static final long MINUTE = 60 * 1000L; + public static final long HOUR = 60 * 60 * 1000L; public static final long DAY = 24 * HOUR; @@ -20,6 +22,6 @@ public class Constants { public static final String REPORT_UTILIZATION = "utilization"; public static final String REPORT_HEAVY = "heavy"; - + public static final String REPORT_ABTEST = "abtest"; }