From 6d08e80a1dafca840cd732b8349fda1f595cfa4e Mon Sep 17 00:00:00 2001 From: Minwoo Jung Date: Wed, 15 Oct 2014 11:35:35 +0900 Subject: [PATCH] [#17] recovery fail test --- .../navercorp/pinpoint/web/alarm/ProcessorTest.java | 4 +--- .../navercorp/pinpoint/web/alarm/ReaderTest.java | 1 - .../web/alarm/filter/GcCountCheckerTest.java | 13 ++++++++----- .../web/alarm/filter/HeapUsageRateCheckerTest.java | 12 ++++++++---- .../alarm/filter/JvmCpuUsageRateCheckerTest.java | 2 +- .../web/alarm/filter/ResponseCountCheckerTest.java | 7 ------- 6 files changed, 18 insertions(+), 21 deletions(-) diff --git a/web/src/test/java/com/navercorp/pinpoint/web/alarm/ProcessorTest.java b/web/src/test/java/com/navercorp/pinpoint/web/alarm/ProcessorTest.java index f8baa38e6..b7847aaa4 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/alarm/ProcessorTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/alarm/ProcessorTest.java @@ -9,7 +9,6 @@ import java.util.List; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -30,8 +29,7 @@ public class ProcessorTest { private static final String SERVICE_NAME = "local_tomcat"; - @Autowired - AlarmProcessor processor; + AlarmProcessor processor = new AlarmProcessor(); private static MapResponseDao mockMapResponseDAO; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/alarm/ReaderTest.java b/web/src/test/java/com/navercorp/pinpoint/web/alarm/ReaderTest.java index 3a3fb339c..69c7dfed9 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/alarm/ReaderTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/alarm/ReaderTest.java @@ -14,7 +14,6 @@ import org.springframework.batch.core.StepExecution; import org.springframework.batch.item.ExecutionContext; import com.nhn.pinpoint.common.ServiceType; -import com.nhn.pinpoint.web.alarm.DataCollectorFactory.DataCollectorCategory; import com.nhn.pinpoint.web.alarm.collector.DataCollector; import com.nhn.pinpoint.web.alarm.collector.ResponseTimeDataCollector; import com.nhn.pinpoint.web.alarm.vo.Rule; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/alarm/filter/GcCountCheckerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/alarm/filter/GcCountCheckerTest.java index 6f3753ef5..699104ac2 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/alarm/filter/GcCountCheckerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/alarm/filter/GcCountCheckerTest.java @@ -9,8 +9,8 @@ import org.junit.BeforeClass; import org.junit.Test; import com.nhn.pinpoint.common.ServiceType; +import com.nhn.pinpoint.common.bo.AgentStatCpuLoadBo; import com.nhn.pinpoint.common.bo.AgentStatMemoryGcBo; -import com.nhn.pinpoint.common.bo.AgentStatMemoryGcBo.Builder; import com.nhn.pinpoint.web.alarm.CheckerCategory; import com.nhn.pinpoint.web.alarm.DataCollectorFactory; import com.nhn.pinpoint.web.alarm.DataCollectorFactory.DataCollectorCategory; @@ -41,13 +41,16 @@ public class GcCountCheckerTest { public List scanAgentStatList(String agentId, Range range) { List AgentStatList = new LinkedList(); - for (int i = 1; i < 37; i++) { - Builder builder = new Builder("AGETNT_NAME", 0L, 1L); - builder.jvmGcOldCount(i); - AgentStatMemoryGcBo memoryBo = builder.build(); + for (int i = 36; i > 0; i--) { + AgentStatMemoryGcBo.Builder memoryBuilder = new AgentStatMemoryGcBo.Builder("AGETNT_NAME", 0L, 1L); + memoryBuilder.jvmGcOldCount(i); + AgentStatMemoryGcBo memoryBo = memoryBuilder.build(); + AgentStatCpuLoadBo.Builder cpuBuilder = new AgentStatCpuLoadBo.Builder("AGETNT_NAME", 0L, 1L); + AgentStatCpuLoadBo cpuLoadBo = cpuBuilder.build(); AgentStat stat = new AgentStat(); stat.setMemoryGc(memoryBo); + stat.setCpuLoad(cpuLoadBo); AgentStatList.add(stat); } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/alarm/filter/HeapUsageRateCheckerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/alarm/filter/HeapUsageRateCheckerTest.java index 6b2c3d98a..d6471db42 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/alarm/filter/HeapUsageRateCheckerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/alarm/filter/HeapUsageRateCheckerTest.java @@ -13,6 +13,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import com.nhn.pinpoint.common.ServiceType; +import com.nhn.pinpoint.common.bo.AgentStatCpuLoadBo; import com.nhn.pinpoint.common.bo.AgentStatMemoryGcBo; import com.nhn.pinpoint.common.bo.AgentStatMemoryGcBo.Builder; import com.nhn.pinpoint.web.alarm.CheckerCategory; @@ -47,13 +48,16 @@ public class HeapUsageRateCheckerTest { List AgentStatList = new LinkedList(); for (int i = 0; i < 36; i++) { - Builder builder = new Builder("AGETNT_NAME", 0L, 1L); - builder.jvmMemoryHeapUsed(70L); - builder.jvmMemoryHeapMax(100L); - AgentStatMemoryGcBo memoryBo = builder.build(); + AgentStatMemoryGcBo.Builder memoryBuilder = new AgentStatMemoryGcBo.Builder("AGETNT_NAME", 0L, 1L); + memoryBuilder.jvmMemoryHeapUsed(70L); + memoryBuilder.jvmMemoryHeapMax(100L); + AgentStatMemoryGcBo memoryBo = memoryBuilder.build(); + AgentStatCpuLoadBo.Builder cpuBuilder = new AgentStatCpuLoadBo.Builder("AGETNT_NAME", 0L, 1L); + AgentStatCpuLoadBo cpuLoadBo = cpuBuilder.build(); AgentStat stat = new AgentStat(); stat.setMemoryGc(memoryBo); + stat.setCpuLoad(cpuLoadBo); AgentStatList.add(stat); } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/alarm/filter/JvmCpuUsageRateCheckerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/alarm/filter/JvmCpuUsageRateCheckerTest.java index af0a44000..d32409ce9 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/alarm/filter/JvmCpuUsageRateCheckerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/alarm/filter/JvmCpuUsageRateCheckerTest.java @@ -42,7 +42,7 @@ public class JvmCpuUsageRateCheckerTest { for (int i = 0; i < 36; i++) { AgentStatCpuLoadBo.Builder cpuLoadBoBuilder = new AgentStatCpuLoadBo.Builder("AGETNT_NAME", 0L, 1L); - cpuLoadBoBuilder.jvmCpuLoad(60); + cpuLoadBoBuilder.jvmCpuLoad(0.6); AgentStatCpuLoadBo cpuLoadBo = cpuLoadBoBuilder.build(); AgentStatMemoryGcBo.Builder memoryGcBobuilder = new AgentStatMemoryGcBo.Builder("AGETNT_NAME", 0L, 1L); diff --git a/web/src/test/java/com/navercorp/pinpoint/web/alarm/filter/ResponseCountCheckerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/alarm/filter/ResponseCountCheckerTest.java index 704912585..10966e189 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/alarm/filter/ResponseCountCheckerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/alarm/filter/ResponseCountCheckerTest.java @@ -86,11 +86,4 @@ public class ResponseCountCheckerTest { filter.check(); assertFalse(filter.isDetected()); } - - @Test - public void test() { - double val = -1; - int i = (int) val; - System.out.println(val); - } }