From e65303f1f9a09185a28aaa216ed1ff5e672c401b Mon Sep 17 00:00:00 2001 From: minwoo Date: Thu, 23 Jun 2022 18:59:15 +0900 Subject: [PATCH] [#8004] fix test fail --- .../dao/mysql/MysqlMetricTagDaoTest.java | 75 ------------------- .../MysqlSystemMetricDataTypeDaoTest.java | 61 --------------- .../collector/dao/mysql/MysqlTestConfig.java | 18 ----- .../dao/pinot/PinotSystemMetricDaoTest.java | 3 +- 4 files changed, 1 insertion(+), 156 deletions(-) delete mode 100644 metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlMetricTagDaoTest.java delete mode 100644 metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlSystemMetricDataTypeDaoTest.java delete mode 100644 metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlTestConfig.java diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlMetricTagDaoTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlMetricTagDaoTest.java deleted file mode 100644 index 5aec6ae26c19..000000000000 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlMetricTagDaoTest.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.navercorp.pinpoint.metric.collector.dao.mysql; - -import com.navercorp.pinpoint.metric.common.model.MetricTag; -import com.navercorp.pinpoint.metric.common.model.MetricTagCollection; -import com.navercorp.pinpoint.metric.common.model.MetricTagKey; -import com.navercorp.pinpoint.metric.common.model.Tag; -import org.junit.Assert; -import org.junit.Ignore; -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.TestPropertySource; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author minwoo.jung - */ - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = MysqlTestConfig.class) -@TestPropertySource(properties = {"pinpoint.profiles.active=local"}) -@WebAppConfiguration -@Transactional -@Ignore -public class MysqlMetricTagDaoTest { - - @Autowired - private MysqlMetricTagDao mysqlMetricTagDao; - - @Test - public void insertAndSelectTest() { - String hostGroupName = "applicationId"; - String hostName = "hostName"; - String metricName = "metricName"; - String fieldName = "fieldName"; - - List tagList = new ArrayList<>(5); - tagList.add(new Tag("key1", "value1")); - tagList.add(new Tag("key2", "value2")); - tagList.add(new Tag("key3", "value3")); - tagList.add(new Tag("key4", "value4")); - tagList.add(new Tag("key5", "value5")); - tagList.add(new Tag("key6", "value6")); - - MetricTag metricTag = new MetricTag(hostGroupName, hostName, metricName, fieldName, tagList); - mysqlMetricTagDao.insertMetricTag(metricTag); - - MetricTagCollection metricTagCollection = mysqlMetricTagDao.selectMetricTag(new MetricTagKey(hostGroupName, hostName, metricName, fieldName)); - Assert.assertEquals(metricTagCollection.getMetricTagList().size(), 1); - - mysqlMetricTagDao.insertMetricTag(metricTag); - MetricTagCollection metricTagCollection2 = mysqlMetricTagDao.selectMetricTag(new MetricTagKey(hostGroupName, hostName, metricName, fieldName)); - Assert.assertEquals(metricTagCollection2.getMetricTagList().size(), 1); - - List tagList2 = new ArrayList<>(5); - tagList2.add(new Tag("A_key1", "A_value1")); - tagList2.add(new Tag("A_key2", "A_value2")); - tagList2.add(new Tag("A_key3", "A_value3")); - tagList2.add(new Tag("A_key4", "A_value4")); - tagList2.add(new Tag("A_key5", "A_value5")); - tagList2.add(new Tag("A_key6", "A_value6")); - - MetricTag metricTag2 = new MetricTag(hostGroupName, hostName, metricName, fieldName, tagList2); - mysqlMetricTagDao.insertMetricTag(metricTag2); - - MetricTagCollection metricTagCollection3 = mysqlMetricTagDao.selectMetricTag(new MetricTagKey(hostGroupName, hostName, metricName, fieldName)); - Assert.assertEquals(metricTagCollection3.getMetricTagList().size(), 2); - } -} \ No newline at end of file diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlSystemMetricDataTypeDaoTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlSystemMetricDataTypeDaoTest.java deleted file mode 100644 index 13ad417d6d08..000000000000 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlSystemMetricDataTypeDaoTest.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.navercorp.pinpoint.metric.collector.dao.mysql; - - -import com.navercorp.pinpoint.metric.common.model.MetricData; -import com.navercorp.pinpoint.metric.common.model.MetricDataName; -import com.navercorp.pinpoint.metric.common.model.MetricDataType; -import org.junit.Assert; -import org.junit.Ignore; -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.TestPropertySource; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; -import org.springframework.transaction.annotation.Transactional; - -/** - * @author minwoo.jung - */ -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = MysqlTestConfig.class) -@TestPropertySource(properties = {"pinpoint.profiles.active=local"}) -@WebAppConfiguration -@Transactional -@Ignore -public class MysqlSystemMetricDataTypeDaoTest { - - @Autowired - private MysqlSystemMetricDataTypeDao systemMetricDataTypeDao; - - @Test - public void insertSelectTest() { - MetricData metricData1 = new MetricData("metricName1", "fieldName1", MetricDataType.DOUBLE); - MetricData metricData2 = new MetricData("metricName2", "fieldName2", MetricDataType.LONG); - systemMetricDataTypeDao.updateMetricDataType(metricData1); - systemMetricDataTypeDao.updateMetricDataType(metricData2); - - MetricData metricData1Result = systemMetricDataTypeDao.selectMetricDataType(new MetricDataName(metricData1.getMetricName(), metricData1.getFieldName())); - Assert.assertEquals(metricData1Result.getMetricDataType(), metricData1.getMetricDataType()); - - MetricData metricData2Result = systemMetricDataTypeDao.selectMetricDataType(new MetricDataName(metricData2.getMetricName(), metricData2.getFieldName())); - Assert.assertEquals(metricData2Result.getMetricDataType(), metricData2.getMetricDataType()); - } - - @Test - public void upsertTest() { - MetricData metricData1 = new MetricData("metricName1", "fieldName1", MetricDataType.DOUBLE); - MetricData metricData2 = new MetricData("metricName2", "fieldName2", MetricDataType.LONG); - systemMetricDataTypeDao.updateMetricDataType(metricData1); - systemMetricDataTypeDao.updateMetricDataType(metricData2); - systemMetricDataTypeDao.updateMetricDataType(metricData1); - systemMetricDataTypeDao.updateMetricDataType(metricData2); - - MetricData metricData1Result = systemMetricDataTypeDao.selectMetricDataType(new MetricDataName(metricData1.getMetricName(), metricData1.getFieldName())); - MetricData metricData2Result = systemMetricDataTypeDao.selectMetricDataType(new MetricDataName(metricData2.getMetricName(), metricData2.getFieldName())); - Assert.assertNotNull(metricData1Result); - Assert.assertNotNull(metricData2Result); - } - -} \ No newline at end of file diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlTestConfig.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlTestConfig.java deleted file mode 100644 index 604dfce5aff1..000000000000 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/mysql/MysqlTestConfig.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.navercorp.pinpoint.metric.collector.dao.mysql; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.ImportResource; -import org.springframework.context.annotation.PropertySource; -import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; - -@ImportResource({"classpath:pinot-collector/applicationContext-collector-pinot.xml"}) -@PropertySource({"classpath:/pinot-collector/profiles/${pinpoint.profiles.active}/jdbc.properties", "classpath:/pinot-collector/kafka-producer-factory.properties", "classpath:/pinot-collector/kafka-topic.properties"}) -@Configuration() -public class MysqlTestConfig { - - @Bean - public static PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() { - return new PropertySourcesPlaceholderConfigurer(); - } -} diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/pinot/PinotSystemMetricDaoTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/pinot/PinotSystemMetricDaoTest.java index c99991595a97..2b38527188cb 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/pinot/PinotSystemMetricDaoTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/dao/pinot/PinotSystemMetricDaoTest.java @@ -42,7 +42,6 @@ /** * @author Hyunjoon Cho */ -@Ignore public class PinotSystemMetricDaoTest { private final static String TOPIC = "test-topic"; @@ -66,7 +65,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable { logger.info("Sending View {}", sendCount.getSendCount()); return null; } - }).when(kafkaTemplate).send(anyString(), any(SystemMetricView.class)); + }).when(kafkaTemplate).send(anyString(), anyString(), any(SystemMetricView.class)); } @Test