diff --git a/agent-plugins/proxy-apache/src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/apache/ApacheRequestParserTest.java b/agent-plugins/proxy-apache/src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/apache/ApacheRequestParserTest.java index a736ee9fa8b5..f38888c76085 100644 --- a/agent-plugins/proxy-apache/src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/apache/ApacheRequestParserTest.java +++ b/agent-plugins/proxy-apache/src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/apache/ApacheRequestParserTest.java @@ -17,9 +17,11 @@ package com.navercorp.pinpoint.agent.plugin.proxy.apache; import com.navercorp.pinpoint.profiler.context.recorder.proxy.ProxyRequestHeader; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/agent-plugins/proxy-app/src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/app/AppRequestParserTest.java b/agent-plugins/proxy-app/src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/app/AppRequestParserTest.java index 3ecaeeeef4ba..b456a3ef32d1 100644 --- a/agent-plugins/proxy-app/src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/app/AppRequestParserTest.java +++ b/agent-plugins/proxy-app/src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/app/AppRequestParserTest.java @@ -17,9 +17,11 @@ package com.navercorp.pinpoint.agent.plugin.proxy.app; import com.navercorp.pinpoint.profiler.context.recorder.proxy.ProxyRequestHeader; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/agent-plugins/proxy-nginx/src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/nginx/NginxRequestParserTest.java b/agent-plugins/proxy-nginx/src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/nginx/NginxRequestParserTest.java index 435e333f85c7..b47a882ce0e0 100644 --- a/agent-plugins/proxy-nginx/src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/nginx/NginxRequestParserTest.java +++ b/agent-plugins/proxy-nginx/src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/nginx/NginxRequestParserTest.java @@ -17,9 +17,10 @@ package com.navercorp.pinpoint.agent.plugin.proxy.nginx; import com.navercorp.pinpoint.profiler.context.recorder.proxy.ProxyRequestHeader; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/agent-plugins/proxy-user/src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/user/UserRequestParserTest.java b/agent-plugins/proxy-user/src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/user/UserRequestParserTest.java index 4497fb3fd5c6..8a0ce3a6e80f 100644 --- a/agent-plugins/proxy-user/src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/user/UserRequestParserTest.java +++ b/agent-plugins/proxy-user/src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/user/UserRequestParserTest.java @@ -19,9 +19,11 @@ import com.navercorp.pinpoint.profiler.context.recorder.proxy.ProxyRequestHeader; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class UserRequestParserTest { private final Logger logger = LogManager.getLogger(this.getClass()); diff --git a/agent/src/test/java/com/navercorp/pinpoint/plugin/config/PropertiesVerificationTest.java b/agent/src/test/java/com/navercorp/pinpoint/plugin/config/PropertiesVerificationTest.java index 072c8b5d272f..9f926b732748 100644 --- a/agent/src/test/java/com/navercorp/pinpoint/plugin/config/PropertiesVerificationTest.java +++ b/agent/src/test/java/com/navercorp/pinpoint/plugin/config/PropertiesVerificationTest.java @@ -17,8 +17,8 @@ package com.navercorp.pinpoint.plugin.config; import com.navercorp.pinpoint.common.util.PropertyUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -32,16 +32,16 @@ public void checkConfigTest() throws Exception { Properties properties = PropertyUtils.loadPropertyFromClassPath("pinpoint-root.config"); String collectorIp = properties.getProperty("profiler.collector.ip"); - Assert.assertEquals("127.0.0.1", collectorIp); + Assertions.assertEquals("127.0.0.1", collectorIp); collectorIp = properties.getProperty("profiler.collector.span.ip"); - Assert.assertEquals("${profiler.collector.ip}", collectorIp); + Assertions.assertEquals("${profiler.collector.ip}", collectorIp); collectorIp = properties.getProperty("profiler.collector.stat.ip"); - Assert.assertEquals("${profiler.collector.ip}", collectorIp); + Assertions.assertEquals("${profiler.collector.ip}", collectorIp); collectorIp = properties.getProperty("profiler.collector.tcp.ip"); - Assert.assertEquals("${profiler.collector.ip}", collectorIp); + Assertions.assertEquals("${profiler.collector.ip}", collectorIp); } } diff --git a/agent/src/test/java/com/navercorp/pinpoint/plugin/trace/TraceMetadataVerificationTest.java b/agent/src/test/java/com/navercorp/pinpoint/plugin/trace/TraceMetadataVerificationTest.java index 89c00a6b3930..3bc2114ee239 100644 --- a/agent/src/test/java/com/navercorp/pinpoint/plugin/trace/TraceMetadataVerificationTest.java +++ b/agent/src/test/java/com/navercorp/pinpoint/plugin/trace/TraceMetadataVerificationTest.java @@ -19,11 +19,11 @@ import com.navercorp.pinpoint.common.trace.TraceMetadataProvider; import com.navercorp.pinpoint.loader.plugins.PinpointPluginLoader; import com.navercorp.pinpoint.loader.plugins.trace.TraceMetadataProviderLoader; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.ErrorCollector; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; import java.io.IOException; import java.util.List; diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/BatchConfigurationTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/BatchConfigurationTest.java index 510b8ddebb06..e29648428dbc 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/BatchConfigurationTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/BatchConfigurationTest.java @@ -17,24 +17,23 @@ package com.navercorp.pinpoint.batch; import com.navercorp.pinpoint.batch.common.BatchConfiguration; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; 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.junit.jupiter.SpringExtension; import java.util.Arrays; - /** * @author Woonduk Kang(emeroad) */ @TestPropertySource(locations = "classpath:batch-root.properties", properties = {"batch.flink.server=1,2"}) @ContextConfiguration(classes = BatchConfiguration.class) -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) public class BatchConfigurationTest { @Autowired @@ -42,8 +41,8 @@ public class BatchConfigurationTest { @Test public void test() { - Assert.assertEquals("release", configuration.getBatchEnv()); - Assert.assertEquals(Arrays.asList("1", "2"), configuration.getFlinkServerList()); + Assertions.assertEquals("release", configuration.getBatchEnv()); + Assertions.assertEquals(Arrays.asList("1", "2"), configuration.getFlinkServerList()); } @Test @@ -54,9 +53,9 @@ public void cleanupInactiveAgentsConfigurationTest() { String cleanupInactiveAgentsCron = configuration.getCleanupInactiveAgentsCron(); int cleanupInactiveAgentsDurationDays = configuration.getCleanupInactiveAgentsDurationDays(); - Assert.assertEquals(false, enableCleanupInactiveAgents); - Assert.assertEquals("0 0 0 29 2 ?", cleanupInactiveAgentsCron); - Assert.assertEquals(30, cleanupInactiveAgentsDurationDays); + Assertions.assertEquals(false, enableCleanupInactiveAgents); + Assertions.assertEquals("0 0 0 29 2 ?", cleanupInactiveAgentsCron); + Assertions.assertEquals(30, cleanupInactiveAgentsDurationDays); } } \ No newline at end of file diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/DefaultDividerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/DefaultDividerTest.java index 88d9e910a7a1..5879734e956b 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/DefaultDividerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/DefaultDividerTest.java @@ -17,12 +17,12 @@ package com.navercorp.pinpoint.batch; import com.navercorp.pinpoint.batch.common.DefaultDivider; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.batch.item.ExecutionContext; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmJobTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmJobTest.java index e1509ab0c189..75a4409055cf 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmJobTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmJobTest.java @@ -27,25 +27,25 @@ import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class AlarmJobTest { - - public static void main(String[] args) throws Exception{ - GenericXmlApplicationContext applicationContext = new GenericXmlApplicationContext("/applicationContext-test.xml"); - JobLauncherTestUtils testLauncher = applicationContext.getBean(JobLauncherTestUtils.class); - - JobExecution jobExecution = testLauncher.launchJob(getParameters()); - BatchStatus status = jobExecution.getStatus(); - assertEquals(BatchStatus.COMPLETED, status); - - applicationContext.close(); - } - - private static JobParameters getParameters() { - Map parameters = new HashMap<>(); - parameters.put("schedule.scheduledFireTime", new JobParameter(new Date())); - return new JobParameters(parameters); - } + + public static void main(String[] args) throws Exception { + GenericXmlApplicationContext applicationContext = new GenericXmlApplicationContext("/applicationContext-test.xml"); + JobLauncherTestUtils testLauncher = applicationContext.getBean(JobLauncherTestUtils.class); + + JobExecution jobExecution = testLauncher.launchJob(getParameters()); + BatchStatus status = jobExecution.getStatus(); + assertEquals(BatchStatus.COMPLETED, status); + + applicationContext.close(); + } + + private static JobParameters getParameters() { + Map parameters = new HashMap<>(); + parameters.put("schedule.scheduledFireTime", new JobParameter(new Date())); + return new JobParameters(parameters); + } } diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmPartitionerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmPartitionerTest.java index 69cc0bd71257..bb0f3676d8f1 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmPartitionerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmPartitionerTest.java @@ -17,8 +17,8 @@ package com.navercorp.pinpoint.batch.alarm; import com.navercorp.pinpoint.web.dao.ApplicationIndexDao; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.springframework.batch.item.ExecutionContext; import java.util.Map; @@ -27,11 +27,11 @@ public class AlarmPartitionerTest { private static ApplicationIndexDao dao; - + @Test public void partitionTest() { AlarmPartitioner partitioner = new AlarmPartitioner(Optional.empty()); Map partitions = partitioner.partition(0); - Assert.assertEquals(1, partitions.size()); + Assertions.assertEquals(1, partitions.size()); } } diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmReaderTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmReaderTest.java index c2ffac4a3a99..9c043c30160d 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmReaderTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmReaderTest.java @@ -16,9 +16,9 @@ package com.navercorp.pinpoint.batch.alarm; -import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.batch.alarm.collector.DataCollector; import com.navercorp.pinpoint.batch.alarm.collector.ResponseTimeDataCollector; +import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.alarm.CheckerCategory; import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.web.alarm.vo.Rule; @@ -28,8 +28,8 @@ import com.navercorp.pinpoint.web.service.AlarmService; import com.navercorp.pinpoint.web.service.AlarmServiceImpl; import com.navercorp.pinpoint.web.vo.Application; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.springframework.batch.core.StepExecution; @@ -40,8 +40,8 @@ import java.util.List; import java.util.Map; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.Mockito.mock; @@ -54,7 +54,7 @@ public class AlarmReaderTest { private static DataCollectorFactory dataCollectorFactory; private static final String APP_NAME = "app"; private static final String SERVICE_TYPE = "tomcat"; - + @Test public void readTest() { StepExecution stepExecution = new StepExecution("alarmStep", null); @@ -65,10 +65,10 @@ public void readTest() { reader.beforeStep(stepExecution); - for(int i = 0; i < 7; i++) { + for (int i = 0; i < 7; i++) { assertNotNull(reader.read()); } - + assertNull(reader.read()); } @@ -77,20 +77,20 @@ public void readTest3() { StepExecution stepExecution = new StepExecution("alarmStep", null); ExecutionContext executionContext = new ExecutionContext(); stepExecution.setExecutionContext(executionContext); - + AlarmServiceImpl alarmService = new AlarmServiceImpl(mock(AlarmDao.class), mock(WebhookSendInfoDao.class)) { @Override public List selectRuleByApplicationId(String applicationId) { return new LinkedList<>(); } }; - + AlarmReader reader = new AlarmReader(dataCollectorFactory, applicationIndexDao, alarmService); reader.beforeStep(stepExecution); assertNull(reader.read()); } - - @BeforeClass + + @BeforeAll public static void beforeClass() { applicationIndexDao = new ApplicationIndexDao() { @@ -98,7 +98,7 @@ public static void beforeClass() { public List selectAllApplicationNames() { List apps = new LinkedList<>(); - for(int i = 0; i < 7; i++) { + for (int i = 0; i < 7; i++) { apps.add(new Application(APP_NAME + i, ServiceType.STAND_ALONE)); } return apps; @@ -111,23 +111,32 @@ public List selectApplicationName(String applicationName) { return apps; } - @Override public List selectAgentIds(String applicationName) {return null;} - @Override public void deleteApplicationName(String applicationName) { } + @Override + public List selectAgentIds(String applicationName) { + return null; + } @Override - public void deleteAgentIds(Map> applicationAgentIdMap) {} + public void deleteApplicationName(String applicationName) { + } + + @Override + public void deleteAgentIds(Map> applicationAgentIdMap) { + } + + @Override + public void deleteAgentId(String applicationName, String agentId) { + } - @Override public void deleteAgentId(String applicationName, String agentId) {} - }; alarmService = new AlarmServiceImpl(mock(AlarmDao.class), mock(WebhookSendInfoDao.class)) { - private final Map ruleMap ; + private final Map ruleMap; { ruleMap = new HashMap<>(); - for(int i = 0; i <=6; i++) { + for (int i = 0; i <= 6; i++) { ruleMap.put(APP_NAME + i, new Rule(APP_NAME + i, SERVICE_TYPE, CheckerCategory.SLOW_COUNT.getName(), 76, "testGroup", false, false, false, "")); } } @@ -139,7 +148,7 @@ public List selectRuleByApplicationId(String applicationId) { return rules; } }; - + dataCollectorFactory = mock(DataCollectorFactory.class); when(dataCollectorFactory.createDataCollector(any(), any(), anyLong())).thenAnswer(new Answer() { @Override diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmWriterIsolationTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmWriterIsolationTest.java index 10ef69735b8a..ad7a14ff9f48 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmWriterIsolationTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmWriterIsolationTest.java @@ -22,110 +22,119 @@ import com.navercorp.pinpoint.batch.service.AlarmService; import com.navercorp.pinpoint.web.alarm.CheckerCategory; import com.navercorp.pinpoint.web.alarm.vo.Rule; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; -import java.util.*; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Optional; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class AlarmWriterIsolationTest { private static final String APPLICATION_ID = "testService"; private static final String CHECKER_NAME = CheckerCategory.SLOW_COUNT.getName(); private static final String RULE_ID = "TEST_RULE"; - + private AlarmWriter writer; - + @Mock AlarmMessageSender alarmMessageSender; - + @Mock AlarmService alarmService; Map beforeCheckerResults; - - @Before + + @BeforeEach public void setUp() throws Exception { writer = new AlarmWriter(alarmMessageSender, alarmService, Optional.empty()); beforeCheckerResults = new HashMap<>(); } - + @Test public void whenSequenceCountIsLessThanTimingCountDoSendAlarm() throws Exception { // given Rule rule = getRuleStub(APPLICATION_ID, RULE_ID); - + AlarmChecker checker = getCheckerStub(rule, 1000L); - + List> checkers = new LinkedList<>(); checkers.add(checker); - + mockingAlarmService(getBeforeCheckerStub(0, 1)); mockingAlarmMessageSender(checker); - + // when writer.write(checkers); - + // then verify(alarmMessageSender, times(1)).sendSms(checker, 1, null); verify(alarmMessageSender, times(1)).sendEmail(checker, 1, null); } - + @Test + @MockitoSettings(strictness = Strictness.LENIENT) public void whenSequenceCountIsEqualToTimingCountDoNotSendAlarm() throws Exception { //given Rule rule = getRuleStub(APPLICATION_ID, RULE_ID); - + AlarmChecker checker = getCheckerStub(rule, 1000L); - + List> checkers = new LinkedList<>(); checkers.add(checker); - + mockingAlarmService(getBeforeCheckerStub(1, 1)); mockingAlarmMessageSender(checker); - + // when writer.write(checkers); - + // then verify(alarmMessageSender, times(0)).sendSms(checker, 1, null); verify(alarmMessageSender, times(0)).sendEmail(checker, 1, null); } - + private void mockingAlarmService(CheckerResult beforeCheckerFixture) { beforeCheckerResults.put(RULE_ID, beforeCheckerFixture); when(alarmService.selectBeforeCheckerResults(APPLICATION_ID)).thenReturn(beforeCheckerResults); } - + private void mockingAlarmMessageSender(AlarmChecker checker) { doNothing().when(alarmMessageSender).sendSms(checker, 1, null); doNothing().when(alarmMessageSender).sendEmail(checker, 1, null); } - + private Rule getRuleStub(String appliationId, String ruleId) { Rule rule = new Rule(appliationId, "tomcat", CHECKER_NAME, 100, "testGroup", true, true, true, ""); rule.setRuleId(ruleId); return rule; } - + private CheckerResult getBeforeCheckerStub(int sequenceCount, int timingCount) { return new CheckerResult(RULE_ID, APPLICATION_ID, CHECKER_NAME, true, sequenceCount, timingCount); } - + private AlarmChecker getCheckerStub(Rule rule, Long detectedValue) { return new SlowCountChecker(null, rule) { @Override public boolean isDetected() { return true; } - + @Override protected Long getDetectedValue() { return detectedValue; diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmWriterTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmWriterTest.java index 784a6102b9a3..52ba78d6ecc7 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmWriterTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/AlarmWriterTest.java @@ -20,45 +20,46 @@ import com.navercorp.pinpoint.batch.alarm.checker.SlowCountChecker; import com.navercorp.pinpoint.web.alarm.CheckerCategory; import com.navercorp.pinpoint.web.alarm.vo.Rule; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.LinkedList; import java.util.List; -@RunWith(SpringJUnit4ClassRunner.class) +@Disabled +@ExtendWith(SpringExtension.class) @ContextConfiguration("classpath:applicationContext-test.xml") public class AlarmWriterTest { @Autowired AlarmWriter writer; - - @Ignore + + @Disabled @Test public void smsSendTest() throws Exception { - Rule rule = new Rule("testService", "tomcat", CheckerCategory.SLOW_COUNT.getName(), 100, "testGroup", true, false, false,""); + Rule rule = new Rule("testService", "tomcat", CheckerCategory.SLOW_COUNT.getName(), 100, "testGroup", true, false, false, ""); SlowCountChecker checker = new SlowCountChecker(null, rule) { @Override public boolean isDetected() { return true; } - + @Override protected Long getDetectedValue() { return 10000L; } }; - + List> checkers = new LinkedList<>(); checkers.add(checker); writer.write(checkers); } - @Ignore + @Disabled @Test public void emailSendTest() throws Exception { Rule rule = new Rule("testService", "tomcat", CheckerCategory.SLOW_COUNT.getName(), 100, "testGroup", false, true, false, ""); @@ -67,16 +68,16 @@ public void emailSendTest() throws Exception { public boolean isDetected() { return true; } - + @Override protected Long getDetectedValue() { return 10000L; } }; - + List> checkers = new LinkedList<>(); checkers.add(checker); writer.write(checkers); } - + } diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/CheckerCategoryTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/CheckerCategoryTest.java index 4e278ed643d2..feff717b895b 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/CheckerCategoryTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/CheckerCategoryTest.java @@ -19,11 +19,11 @@ import com.navercorp.pinpoint.batch.alarm.checker.SlowCountChecker; import com.navercorp.pinpoint.web.alarm.CheckerCategory; import com.navercorp.pinpoint.web.alarm.vo.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; public class CheckerCategoryTest { private final CheckerRegistry registry = CheckerRegistry.newCheckerRegistry(); @@ -38,14 +38,14 @@ public void createCheckerTest() { SlowCountChecker checker = (SlowCountChecker) checkerFactory.createChecker(null, rule); rule = new Rule(null, "", CheckerCategory.SLOW_COUNT.getName(), 63, "testGroup", false, false, false, ""); SlowCountChecker checker2 = (SlowCountChecker) checkerFactory.createChecker(null, rule); - + assertNotSame(checker, checker2); - + assertNotNull(checker); - assertEquals(75, (int)checker.getRule().getThreshold()); - + assertEquals(75, (int) checker.getRule().getThreshold()); + assertNotNull(checker2); - assertEquals(63, (int)checker2.getRule().getThreshold()); + assertEquals(63, (int) checker2.getRule().getThreshold()); } - + } diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/DataSourceConnectionUsageRateCheckerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/DataSourceConnectionUsageRateCheckerTest.java index d551d00a4c9a..66f56c4c3d43 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/DataSourceConnectionUsageRateCheckerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/DataSourceConnectionUsageRateCheckerTest.java @@ -16,26 +16,26 @@ package com.navercorp.pinpoint.batch.alarm.checker; -import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; +import com.navercorp.pinpoint.batch.alarm.collector.DataSourceDataCollector; import com.navercorp.pinpoint.common.server.bo.stat.DataSourceBo; import com.navercorp.pinpoint.common.server.bo.stat.DataSourceListBo; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.util.CollectionUtils; import com.navercorp.pinpoint.common.util.StringUtils; import com.navercorp.pinpoint.web.alarm.CheckerCategory; -import com.navercorp.pinpoint.batch.alarm.collector.DataSourceDataCollector; +import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.web.alarm.vo.Rule; import com.navercorp.pinpoint.web.dao.ApplicationIndexDao; import com.navercorp.pinpoint.web.dao.stat.AgentStatDao; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; import org.apache.commons.lang3.RandomUtils; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.ArrayList; import java.util.Arrays; @@ -46,7 +46,7 @@ /** * @author Taejin Koo */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class DataSourceConnectionUsageRateCheckerTest { private static final String APPLICATION_NAME = "local_service"; @@ -67,7 +67,7 @@ public class DataSourceConnectionUsageRateCheckerTest { @Mock private ApplicationIndexDao mockApplicationIndexDao; - @Before + @BeforeEach public void before() { when(mockApplicationIndexDao.selectAgentIds(APPLICATION_NAME)).thenReturn(Arrays.asList(AGENT_ID)); @@ -89,13 +89,13 @@ public void checkTest1() { DataSourceDataCollector collector = new DataSourceDataCollector(DataCollectorCategory.DATA_SOURCE_STAT, application, mockDataSourceDao, mockApplicationIndexDao, CURRENT_TIME_MILLIS, INTERVAL_MILLIS); DataSourceConnectionUsageRateChecker checker = new DataSourceConnectionUsageRateChecker(collector, rule); checker.check(); - Assert.assertTrue(checker.isDetected()); + Assertions.assertTrue(checker.isDetected()); String emailMessage = checker.getEmailMessage(); - Assert.assertTrue(StringUtils.hasLength(emailMessage)); + Assertions.assertTrue(StringUtils.hasLength(emailMessage)); List smsMessage = checker.getSmsMessage(); - Assert.assertEquals(2, smsMessage.size()); + Assertions.assertEquals(2, smsMessage.size()); } @Test @@ -106,13 +106,13 @@ public void checkTest2() { DataSourceDataCollector collector = new DataSourceDataCollector(DataCollectorCategory.DATA_SOURCE_STAT, application, mockDataSourceDao, mockApplicationIndexDao, CURRENT_TIME_MILLIS, INTERVAL_MILLIS); DataSourceConnectionUsageRateChecker checker = new DataSourceConnectionUsageRateChecker(collector, rule); checker.check(); - Assert.assertFalse(checker.isDetected()); + Assertions.assertFalse(checker.isDetected()); String emailMessage = checker.getEmailMessage(); - Assert.assertTrue(StringUtils.isEmpty(emailMessage)); + Assertions.assertTrue(StringUtils.isEmpty(emailMessage)); List smsMessage = checker.getSmsMessage(); - Assert.assertTrue(CollectionUtils.isEmpty(smsMessage)); + Assertions.assertTrue(CollectionUtils.isEmpty(smsMessage)); } private DataSourceListBo createDataSourceListBo(int id, int activeConnectionSize, int maxConnectionSize, int numValues) { diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/DeadlockCheckerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/DeadlockCheckerTest.java index de701b9cb2c0..a977701a9b61 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/DeadlockCheckerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/DeadlockCheckerTest.java @@ -16,25 +16,25 @@ package com.navercorp.pinpoint.batch.alarm.checker; -import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; +import com.navercorp.pinpoint.batch.alarm.collector.AgentEventDataCollector; import com.navercorp.pinpoint.common.server.bo.event.AgentEventBo; import com.navercorp.pinpoint.common.server.util.AgentEventType; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.util.StringUtils; import com.navercorp.pinpoint.web.alarm.CheckerCategory; -import com.navercorp.pinpoint.batch.alarm.collector.AgentEventDataCollector; +import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.web.alarm.vo.Rule; import com.navercorp.pinpoint.web.dao.AgentEventDao; import com.navercorp.pinpoint.web.dao.ApplicationIndexDao; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; import org.apache.commons.lang3.RandomUtils; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Arrays; import java.util.Collections; @@ -45,7 +45,7 @@ /** * @author Taejin Koo */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class DeadlockCheckerTest { private static final String APPLICATION_NAME = "local_service"; @@ -68,7 +68,7 @@ public class DeadlockCheckerTest { @Mock private ApplicationIndexDao mockApplicationIndexDao; - @Before + @BeforeEach public void before() { when(mockApplicationIndexDao.selectAgentIds(APPLICATION_NAME)).thenReturn(Arrays.asList(AGENT_ID_1, AGENT_ID_2, AGENT_ID_3)); } @@ -90,13 +90,13 @@ public void checkTest1() { AgentEventDataCollector dataCollector = new AgentEventDataCollector(DataCollectorCategory.AGENT_EVENT, application, mockAgentEventDao, mockApplicationIndexDao, CURRENT_TIME_MILLIS, INTERVAL_MILLIS); DeadlockChecker checker = new DeadlockChecker(dataCollector, rule); checker.check(); - Assert.assertTrue(checker.isDetected()); + Assertions.assertTrue(checker.isDetected()); String emailMessage = checker.getEmailMessage(); - Assert.assertTrue(StringUtils.hasLength(emailMessage)); + Assertions.assertTrue(StringUtils.hasLength(emailMessage)); List smsMessage = checker.getSmsMessage(); - Assert.assertEquals(1, smsMessage.size()); + Assertions.assertEquals(1, smsMessage.size()); } @Test @@ -112,13 +112,13 @@ public void checkTest2() { AgentEventDataCollector dataCollector = new AgentEventDataCollector(DataCollectorCategory.AGENT_EVENT, application, mockAgentEventDao, mockApplicationIndexDao, CURRENT_TIME_MILLIS, INTERVAL_MILLIS); DeadlockChecker checker = new DeadlockChecker(dataCollector, rule); checker.check(); - Assert.assertFalse(checker.isDetected()); + Assertions.assertFalse(checker.isDetected()); String emailMessage = checker.getEmailMessage(); - Assert.assertTrue(StringUtils.isEmpty(emailMessage)); + Assertions.assertTrue(StringUtils.isEmpty(emailMessage)); List smsMessage = checker.getSmsMessage(); - Assert.assertTrue(smsMessage.isEmpty()); + Assertions.assertTrue(smsMessage.isEmpty()); } private AgentEventBo createAgentEvent(String agentId, long eventTimestamp, AgentEventType agentEventType) { diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ErrorCountCheckerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ErrorCountCheckerTest.java index 869a21c2b1e3..5fafb85355d9 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ErrorCountCheckerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ErrorCountCheckerTest.java @@ -16,36 +16,36 @@ package com.navercorp.pinpoint.batch.alarm.checker; -import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; +import com.navercorp.pinpoint.batch.alarm.collector.ResponseTimeDataCollector; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.alarm.CheckerCategory; -import com.navercorp.pinpoint.batch.alarm.collector.ResponseTimeDataCollector; +import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.web.alarm.vo.Rule; import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram; import com.navercorp.pinpoint.web.dao.MapResponseDao; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.vo.ResponseTime; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.LinkedList; import java.util.List; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ErrorCountCheckerTest { - + private static final String SERVICE_NAME = "local_service"; private static final String SERVICE_TYPE = "tomcat"; - + private static MapResponseDao mockMapResponseDAO; - - @BeforeClass + + @BeforeAll public static void before() { mockMapResponseDAO = new MapResponseDao() { - + @Override public List selectResponseTime(Application application, Range range) { List list = new LinkedList<>(); @@ -54,8 +54,8 @@ public List selectResponseTime(Application application, Range rang list.add(responseTime); TimeHistogram histogram = null; - for (int i=0 ; i < 5; i++) { - for (int j=0 ; j < 5; j++) { + for (int i = 0; i < 5; i++) { + for (int j = 0; j < 5; j++) { histogram = new TimeHistogram(ServiceType.STAND_ALONE, timeStamp); histogram.addCallCountByElapsedTime(1000, false); histogram.addCallCountByElapsedTime(3000, false); @@ -64,10 +64,10 @@ public List selectResponseTime(Application application, Range rang histogram.addCallCountByElapsedTime(1000, true); responseTime.addResponseTime("agent_" + i + "_" + j, histogram); } - + timeStamp += 1; } - + return list; } }; @@ -82,11 +82,11 @@ public void checkTest1() { ResponseTimeDataCollector collector = new ResponseTimeDataCollector(DataCollectorCategory.RESPONSE_TIME, application, mockMapResponseDAO, System.currentTimeMillis(), 300000); Rule rule = new Rule(SERVICE_NAME, SERVICE_TYPE, CheckerCategory.ERROR_COUNT.getName(), 74, "testGroup", false, false, false, ""); ErrorCountChecker filter = new ErrorCountChecker(collector, rule); - + filter.check(); assertTrue(filter.isDetected()); } - + /* * alert conditions not satisfied */ @@ -96,7 +96,7 @@ public void checkTest2() { ResponseTimeDataCollector collector = new ResponseTimeDataCollector(DataCollectorCategory.RESPONSE_TIME, application, mockMapResponseDAO, System.currentTimeMillis(), 300000); Rule rule = new Rule(SERVICE_NAME, SERVICE_TYPE, CheckerCategory.ERROR_COUNT.getName(), 76, "testGroup", false, false, false, ""); ErrorCountChecker filter = new ErrorCountChecker(collector, rule); - + filter.check(); assertFalse(filter.isDetected()); } diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ErrorCountToCalleCheckerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ErrorCountToCalleCheckerTest.java index 9a708539e54b..aa2a641fb4b4 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ErrorCountToCalleCheckerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ErrorCountToCalleCheckerTest.java @@ -16,10 +16,11 @@ package com.navercorp.pinpoint.batch.alarm.checker; -import com.navercorp.pinpoint.web.alarm.CheckerCategory; -import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.batch.alarm.collector.MapStatisticsCallerDataCollector; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.web.alarm.CheckerCategory; +import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.web.alarm.vo.Rule; import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkCallDataMap; @@ -27,17 +28,16 @@ import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap; import com.navercorp.pinpoint.web.dao.MapStatisticsCallerDao; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.BeforeClass; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collection; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ErrorCountToCalleCheckerTest { @@ -47,74 +47,74 @@ public class ErrorCountToCalleCheckerTest { private static final String TO_SERVICE_NAME = "to_local_service"; private static final String SERVICE_TYPE = "tomcat"; public static MapStatisticsCallerDao dao; - - @BeforeClass + + @BeforeAll public static void before() { dao = new MapStatisticsCallerDao() { - + @Override public LinkDataMap selectCaller(Application callerApplication, Range range) { long timeStamp = 1409814914298L; LinkDataMap linkDataMap = new LinkDataMap(); Application fromApplication = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); - for (int i = 1 ; i < 6 ; i++) { + for (int i = 1; i < 6; i++) { LinkCallDataMap linkCallDataMap = new LinkCallDataMap(); Application toApplication = new Application(TO_SERVICE_NAME + i, ServiceType.STAND_ALONE); Collection timeHistogramList = new ArrayList<>(); - - for (int j = 1 ; j < 11 ; j++) { + + for (int j = 1; j < 11; j++) { TimeHistogram timeHistogram = new TimeHistogram(ServiceType.STAND_ALONE, timeStamp); - + if (j % 2 == 0) { logger.debug("ERROR"); timeHistogram.addCallCountByElapsedTime(1000, true); } else { timeHistogram.addCallCountByElapsedTime(1000, false); } - + timeHistogramList.add(timeHistogram); } - + linkCallDataMap.addCallData(fromApplication.getName(), fromApplication.getServiceType(), toApplication.getName(), toApplication.getServiceType(), timeHistogramList); LinkData linkData = new LinkData(fromApplication, toApplication); linkData.setLinkCallDataMap(linkCallDataMap); linkDataMap.addLinkData(linkData); } - + return linkDataMap; } }; } - + @Test public void checkTest() { Application application = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); MapStatisticsCallerDataCollector dataCollector = new MapStatisticsCallerDataCollector(DataCollectorCategory.CALLER_STAT, application, dao, System.currentTimeMillis(), 300000); Rule rule = new Rule(FROM_SERVICE_NAME, SERVICE_TYPE, CheckerCategory.ERROR_COUNT_TO_CALLEE.getName(), 5, "testGroup", false, false, false, TO_SERVICE_NAME + 1); ErrorCountToCalleeChecker checker = new ErrorCountToCalleeChecker(dataCollector, rule); - + checker.check(); assertTrue(checker.isDetected()); } - + @Test public void checkTest2() { Application application = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); MapStatisticsCallerDataCollector dataCollector = new MapStatisticsCallerDataCollector(DataCollectorCategory.CALLER_STAT, application, dao, System.currentTimeMillis(), 300000); Rule rule = new Rule(FROM_SERVICE_NAME, SERVICE_TYPE, CheckerCategory.ERROR_COUNT_TO_CALLEE.getName(), 6, "testGroup", false, false, false, TO_SERVICE_NAME + 1); ErrorCountToCalleeChecker checker = new ErrorCountToCalleeChecker(dataCollector, rule); - + checker.check(); assertFalse(checker.isDetected()); } - + @Test public void checkTest3() { Application application = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); MapStatisticsCallerDataCollector dataCollector = new MapStatisticsCallerDataCollector(DataCollectorCategory.CALLER_STAT, application, dao, System.currentTimeMillis(), 300000); Rule rule = new Rule(FROM_SERVICE_NAME, SERVICE_TYPE, CheckerCategory.ERROR_COUNT_TO_CALLEE.getName(), 5, "testGroup", false, false, false, TO_SERVICE_NAME + 2); ErrorCountToCalleeChecker checker = new ErrorCountToCalleeChecker(dataCollector, rule); - + checker.check(); assertTrue(checker.isDetected()); } diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ErrorRateCheckerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ErrorRateCheckerTest.java index 5d9ced9b0659..12f08704f7a5 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ErrorRateCheckerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ErrorRateCheckerTest.java @@ -16,36 +16,36 @@ package com.navercorp.pinpoint.batch.alarm.checker; -import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; +import com.navercorp.pinpoint.batch.alarm.collector.ResponseTimeDataCollector; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.alarm.CheckerCategory; -import com.navercorp.pinpoint.batch.alarm.collector.ResponseTimeDataCollector; +import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.web.alarm.vo.Rule; import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram; import com.navercorp.pinpoint.web.dao.MapResponseDao; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.vo.ResponseTime; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.LinkedList; import java.util.List; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ErrorRateCheckerTest { - + private static final String SERVICE_NAME = "local_service"; private static final String SERVICE_TYPE = "tomcat"; - + private static MapResponseDao mockMapResponseDAO; - - @BeforeClass + + @BeforeAll public static void before() { mockMapResponseDAO = new MapResponseDao() { - + @Override public List selectResponseTime(Application application, Range range) { List list = new LinkedList<>(); @@ -54,8 +54,8 @@ public List selectResponseTime(Application application, Range rang list.add(responseTime); TimeHistogram histogram = null; - for (int i=0 ; i < 5; i++) { - for (int j=0 ; j < 5; j++) { + for (int i = 0; i < 5; i++) { + for (int j = 0; j < 5; j++) { histogram = new TimeHistogram(ServiceType.STAND_ALONE, timeStamp); histogram.addCallCountByElapsedTime(1000, false); histogram.addCallCountByElapsedTime(3000, false); @@ -64,10 +64,10 @@ public List selectResponseTime(Application application, Range rang histogram.addCallCountByElapsedTime(1000, true); responseTime.addResponseTime("agent_" + i + "_" + j, histogram); } - + timeStamp += 1; } - + return list; } }; @@ -82,11 +82,11 @@ public void checkTest1() { ResponseTimeDataCollector collector = new ResponseTimeDataCollector(DataCollectorCategory.RESPONSE_TIME, application, mockMapResponseDAO, System.currentTimeMillis(), 300000); Rule rule = new Rule(SERVICE_NAME, SERVICE_TYPE, CheckerCategory.ERROR_RATE.getName(), 60, "testGroup", false, false, false, ""); ErrorRateChecker filter = new ErrorRateChecker(collector, rule); - + filter.check(); assertTrue(filter.isDetected()); } - + /* * alert conditions not satisfied */ @@ -96,7 +96,7 @@ public void checkTest2() { ResponseTimeDataCollector collector = new ResponseTimeDataCollector(DataCollectorCategory.RESPONSE_TIME, application, mockMapResponseDAO, System.currentTimeMillis(), 300000); Rule rule = new Rule(SERVICE_NAME, SERVICE_TYPE, CheckerCategory.ERROR_RATE.getName(), 61, "testGroup", false, false, false, ""); ErrorRateChecker filter = new ErrorRateChecker(collector, rule); - + filter.check(); assertFalse(filter.isDetected()); } diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ErrorRateToCalleCheckerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ErrorRateToCalleCheckerTest.java index f46286d6dde6..95dbdf40776b 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ErrorRateToCalleCheckerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ErrorRateToCalleCheckerTest.java @@ -16,10 +16,11 @@ package com.navercorp.pinpoint.batch.alarm.checker; -import com.navercorp.pinpoint.web.alarm.CheckerCategory; -import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.batch.alarm.collector.MapStatisticsCallerDataCollector; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.web.alarm.CheckerCategory; +import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.web.alarm.vo.Rule; import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkCallDataMap; @@ -27,25 +28,24 @@ import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap; import com.navercorp.pinpoint.web.dao.MapStatisticsCallerDao; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collection; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ErrorRateToCalleCheckerTest { private static final String FROM_SERVICE_NAME = "from_local_service"; private static final String TO_SERVICE_NAME = "to_local_service"; private static final String SERVICE_TYPE = "tomcat"; - + public static MapStatisticsCallerDao dao; - - @BeforeClass + + @BeforeAll public static void before() { dao = new MapStatisticsCallerDao() { @@ -54,12 +54,12 @@ public LinkDataMap selectCaller(Application callerApplication, Range range) { long timeStamp = 1409814914298L; LinkDataMap linkDataMap = new LinkDataMap(); Application fromApplication = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); - for (int i = 1 ; i < 6 ; i++) { + for (int i = 1; i < 6; i++) { LinkCallDataMap linkCallDataMap = new LinkCallDataMap(); Application toApplication = new Application(TO_SERVICE_NAME + i, ServiceType.STAND_ALONE); Collection timeHistogramList = new ArrayList<>(); - - for (int j = 1 ; j < 11 ; j++) { + + for (int j = 1; j < 11; j++) { TimeHistogram timeHistogram = new TimeHistogram(ServiceType.STAND_ALONE, timeStamp); if (j % 2 == 0) { @@ -67,50 +67,50 @@ public LinkDataMap selectCaller(Application callerApplication, Range range) { } else { timeHistogram.addCallCountByElapsedTime(1000, false); } - + timeHistogramList.add(timeHistogram); } - + linkCallDataMap.addCallData(fromApplication.getName(), fromApplication.getServiceType(), toApplication.getName(), toApplication.getServiceType(), timeHistogramList); LinkData linkData = new LinkData(fromApplication, toApplication); linkData.setLinkCallDataMap(linkCallDataMap); linkDataMap.addLinkData(linkData); } - + return linkDataMap; } }; } - + @Test public void checkTest() { Application application = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); MapStatisticsCallerDataCollector dataCollector = new MapStatisticsCallerDataCollector(DataCollectorCategory.CALLER_STAT, application, dao, System.currentTimeMillis(), 300000); Rule rule = new Rule(FROM_SERVICE_NAME, SERVICE_TYPE, CheckerCategory.ERROR_RATE_TO_CALLEE.getName(), 50, "testGroup", false, false, false, TO_SERVICE_NAME + 1); ErrorRateToCalleeChecker checker = new ErrorRateToCalleeChecker(dataCollector, rule); - + checker.check(); assertTrue(checker.isDetected()); } - + @Test public void checkTest2() { Application application = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); MapStatisticsCallerDataCollector dataCollector = new MapStatisticsCallerDataCollector(DataCollectorCategory.CALLER_STAT, application, dao, System.currentTimeMillis(), 300000); Rule rule = new Rule(FROM_SERVICE_NAME, SERVICE_TYPE, CheckerCategory.ERROR_RATE_TO_CALLEE.getName(), 51, "testGroup", false, false, false, TO_SERVICE_NAME + 1); ErrorRateToCalleeChecker checker = new ErrorRateToCalleeChecker(dataCollector, rule); - + checker.check(); assertFalse(checker.isDetected()); } - + @Test public void checkTest3() { Application application = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); MapStatisticsCallerDataCollector dataCollector = new MapStatisticsCallerDataCollector(DataCollectorCategory.CALLER_STAT, application, dao, System.currentTimeMillis(), 300000); Rule rule = new Rule(FROM_SERVICE_NAME, SERVICE_TYPE, CheckerCategory.ERROR_RATE_TO_CALLEE.getName(), 50, "testGroup", false, false, false, TO_SERVICE_NAME + 2); ErrorRateToCalleeChecker checker = new ErrorRateToCalleeChecker(dataCollector, rule); - + checker.check(); assertTrue(checker.isDetected()); } diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/FileDescriptorCheckerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/FileDescriptorCheckerTest.java index affe8698d37c..0fb0b8deb8de 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/FileDescriptorCheckerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/FileDescriptorCheckerTest.java @@ -16,16 +16,15 @@ package com.navercorp.pinpoint.batch.alarm.checker; - import com.navercorp.pinpoint.batch.alarm.collector.FileDescriptorDataCollector; import com.navercorp.pinpoint.web.alarm.vo.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/GcCountCheckerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/GcCountCheckerTest.java index 1a7b342bdbf6..1e44f96f53f4 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/GcCountCheckerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/GcCountCheckerTest.java @@ -19,12 +19,11 @@ import com.navercorp.pinpoint.common.server.bo.stat.AgentStatType; import com.navercorp.pinpoint.common.server.bo.stat.CpuLoadBo; import com.navercorp.pinpoint.common.server.bo.stat.JvmGcBo; -import com.navercorp.pinpoint.common.server.bo.stat.join.StatType; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.dao.ApplicationIndexDao; import com.navercorp.pinpoint.web.dao.stat.AgentStatDao; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.BeforeClass; +import org.junit.jupiter.api.BeforeAll; import java.util.Collections; import java.util.LinkedList; @@ -43,7 +42,7 @@ public class GcCountCheckerTest { private static AgentStatDao cpuLoadDao; - @BeforeClass + @BeforeAll public static void before() { jvmGcDao = new AgentStatDao<>() { @@ -55,13 +54,13 @@ public String getChartType() { @Override public List getAgentStatList(String agentId, Range range) { List jvmGcs = new LinkedList<>(); - + for (int i = 36; i > 0; i--) { JvmGcBo jvmGc = new JvmGcBo(); jvmGc.setGcOldCount(i); jvmGcs.add(jvmGc); } - + return jvmGcs; } @@ -130,7 +129,7 @@ public void deleteAgentId(String applicationName, String agentId) { }; } - + // @Test // public void checkTest1() { // Rule rule = new Rule(SERVICE_NAME, SERVICE_TYPE, CheckerCategory.GC_COUNT.getName(), 35, "testGroup", false, false, ""); diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/HeapUsageRateCheckerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/HeapUsageRateCheckerTest.java index dbafd0ab7589..2931affe4b77 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/HeapUsageRateCheckerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/HeapUsageRateCheckerTest.java @@ -16,29 +16,29 @@ package com.navercorp.pinpoint.batch.alarm.checker; -import com.navercorp.pinpoint.common.server.bo.stat.AgentStatType; -import com.navercorp.pinpoint.web.alarm.CheckerCategory; -import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.batch.alarm.DataCollectorFactory; import com.navercorp.pinpoint.batch.alarm.collector.AgentStatDataCollector; +import com.navercorp.pinpoint.common.server.bo.stat.AgentStatType; import com.navercorp.pinpoint.common.server.bo.stat.CpuLoadBo; import com.navercorp.pinpoint.common.server.bo.stat.JvmGcBo; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.web.alarm.CheckerCategory; +import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.web.alarm.vo.Rule; import com.navercorp.pinpoint.web.dao.ApplicationIndexDao; import com.navercorp.pinpoint.web.dao.stat.AgentStatDao; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class HeapUsageRateCheckerTest { @@ -51,7 +51,7 @@ public class HeapUsageRateCheckerTest { private static AgentStatDao cpuLoadDao; - @BeforeClass + @BeforeAll public static void before() { jvmGcDao = new AgentStatDao<>() { diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/JvmCpuUsageRateCheckerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/JvmCpuUsageRateCheckerTest.java index 65a1dd359709..57506ad6d762 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/JvmCpuUsageRateCheckerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/JvmCpuUsageRateCheckerTest.java @@ -16,29 +16,29 @@ package com.navercorp.pinpoint.batch.alarm.checker; -import com.navercorp.pinpoint.common.server.bo.stat.AgentStatType; -import com.navercorp.pinpoint.web.alarm.CheckerCategory; -import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.batch.alarm.DataCollectorFactory; import com.navercorp.pinpoint.batch.alarm.collector.AgentStatDataCollector; +import com.navercorp.pinpoint.common.server.bo.stat.AgentStatType; import com.navercorp.pinpoint.common.server.bo.stat.CpuLoadBo; import com.navercorp.pinpoint.common.server.bo.stat.JvmGcBo; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.web.alarm.CheckerCategory; +import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.web.alarm.vo.Rule; import com.navercorp.pinpoint.web.dao.ApplicationIndexDao; import com.navercorp.pinpoint.web.dao.stat.AgentStatDao; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class JvmCpuUsageRateCheckerTest { @@ -50,8 +50,8 @@ public class JvmCpuUsageRateCheckerTest { private static AgentStatDao jvmGcDao; private static AgentStatDao cpuLoadDao; - - @BeforeClass + + @BeforeAll public static void before() { jvmGcDao = new AgentStatDao<>() { @@ -79,13 +79,13 @@ public String getChartType() { public List getAgentStatList(String agentId, Range range) { List cpuLoads = new LinkedList<>(); - + for (int i = 0; i < 36; i++) { CpuLoadBo cpuLoad = new CpuLoadBo(); cpuLoad.setJvmCpuLoad(0.6); cpuLoads.add(cpuLoad); } - + return cpuLoads; } @@ -94,7 +94,7 @@ public boolean agentStatExists(String agentId, Range range) { return true; } }; - + applicationIndexDao = new ApplicationIndexDao() { @Override @@ -114,7 +114,7 @@ public List selectAgentIds(String applicationName) { agentIds.add("local_tomcat"); return agentIds; } - + throw new IllegalArgumentException(); } @@ -132,29 +132,29 @@ public void deleteAgentIds(Map> applicationAgentIdMap) { public void deleteAgentId(String applicationName, String agentId) { throw new UnsupportedOperationException(); } - + }; } - + @Test public void checkTest1() { Rule rule = new Rule(SERVICE_NAME, SERVICE_TYPE, CheckerCategory.JVM_CPU_USAGE_RATE.getName(), 60, "testGroup", false, false, false, ""); Application application = new Application(SERVICE_NAME, ServiceType.STAND_ALONE); AgentStatDataCollector collector = new AgentStatDataCollector(DataCollectorCategory.AGENT_STAT, application, jvmGcDao, cpuLoadDao, applicationIndexDao, System.currentTimeMillis(), DataCollectorFactory.SLOT_INTERVAL_FIVE_MIN); AgentChecker checker = new JvmCpuUsageRateChecker(collector, rule); - + checker.check(); assertTrue(checker.isDetected()); } - + @Test public void checkTest2() { Rule rule = new Rule(SERVICE_NAME, SERVICE_TYPE, CheckerCategory.JVM_CPU_USAGE_RATE.getName(), 61, "testGroup", false, false, false, ""); Application application = new Application(SERVICE_NAME, ServiceType.STAND_ALONE); AgentStatDataCollector collector = new AgentStatDataCollector(DataCollectorCategory.AGENT_STAT, application, jvmGcDao, cpuLoadDao, applicationIndexDao, System.currentTimeMillis(), DataCollectorFactory.SLOT_INTERVAL_FIVE_MIN); AgentChecker checker = new JvmCpuUsageRateChecker(collector, rule); - + checker.check(); assertFalse(checker.isDetected()); } diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ResponseCountCheckerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ResponseCountCheckerTest.java index af7e39e4263d..1adb93882eb0 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ResponseCountCheckerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/ResponseCountCheckerTest.java @@ -16,38 +16,38 @@ package com.navercorp.pinpoint.batch.alarm.checker; -import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; -import com.navercorp.pinpoint.common.trace.ServiceType; -import com.navercorp.pinpoint.web.alarm.CheckerCategory; import com.navercorp.pinpoint.batch.alarm.DataCollectorFactory; import com.navercorp.pinpoint.batch.alarm.collector.ResponseTimeDataCollector; +import com.navercorp.pinpoint.common.server.util.time.Range; +import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.web.alarm.CheckerCategory; +import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.web.alarm.vo.Rule; import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram; import com.navercorp.pinpoint.web.dao.MapResponseDao; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.vo.ResponseTime; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.LinkedList; import java.util.List; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ResponseCountCheckerTest { - + private static final String SERVICE_NAME = "local_service"; private static final String SERVICE_TYPE = "tomcat"; - + private static MapResponseDao mockMapResponseDAO; - - @BeforeClass + + @BeforeAll public static void before() { mockMapResponseDAO = new MapResponseDao() { - + @Override public List selectResponseTime(Application application, Range range) { List list = new LinkedList<>(); @@ -56,8 +56,8 @@ public List selectResponseTime(Application application, Range rang list.add(responseTime); TimeHistogram histogram = null; - for (int i=0 ; i < 5; i++) { - for (int j=0 ; j < 5; j++) { + for (int i = 0; i < 5; i++) { + for (int j = 0; j < 5; j++) { histogram = new TimeHistogram(ServiceType.STAND_ALONE, timeStamp); histogram.addCallCountByElapsedTime(1000, false); histogram.addCallCountByElapsedTime(3000, false); @@ -66,10 +66,10 @@ public List selectResponseTime(Application application, Range rang histogram.addCallCountByElapsedTime(1000, true); responseTime.addResponseTime("agent_" + i + "_" + j, histogram); } - + timeStamp += 1; } - + return list; } }; @@ -84,11 +84,11 @@ public void checkTest1() { ResponseTimeDataCollector collector = new ResponseTimeDataCollector(DataCollectorCategory.RESPONSE_TIME, application, mockMapResponseDAO, System.currentTimeMillis(), DataCollectorFactory.SLOT_INTERVAL_FIVE_MIN); Rule rule = new Rule(SERVICE_NAME, SERVICE_TYPE, CheckerCategory.TOTAL_COUNT.getName(), 125, "testGroup", false, false, false, ""); ResponseCountChecker filter = new ResponseCountChecker(collector, rule); - + filter.check(); assertTrue(filter.isDetected()); } - + /* * alert conditions not satisfied */ @@ -98,7 +98,7 @@ public void checkTest2() { ResponseTimeDataCollector collector = new ResponseTimeDataCollector(DataCollectorCategory.RESPONSE_TIME, application, mockMapResponseDAO, System.currentTimeMillis(), 300000); Rule rule = new Rule(SERVICE_NAME, SERVICE_TYPE, CheckerCategory.TOTAL_COUNT.getName(), 126, "testGroup", false, false, false, ""); ResponseCountChecker filter = new ResponseCountChecker(collector, rule); - + filter.check(); assertFalse(filter.isDetected()); } diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SlowCountCheckerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SlowCountCheckerTest.java index cba490023116..0162622aafff 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SlowCountCheckerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SlowCountCheckerTest.java @@ -16,36 +16,36 @@ package com.navercorp.pinpoint.batch.alarm.checker; -import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; +import com.navercorp.pinpoint.batch.alarm.collector.ResponseTimeDataCollector; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.alarm.CheckerCategory; -import com.navercorp.pinpoint.batch.alarm.collector.ResponseTimeDataCollector; +import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.web.alarm.vo.Rule; import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram; import com.navercorp.pinpoint.web.dao.MapResponseDao; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.vo.ResponseTime; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.LinkedList; import java.util.List; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class SlowCountCheckerTest { - - private static final String SERVICE_NAME = "local_service"; + + private static final String SERVICE_NAME = "local_service"; private static final String SERVICE_TYPE = "tomcat"; - + private static MapResponseDao mockMapResponseDAO; - - @BeforeClass + + @BeforeAll public static void before() { mockMapResponseDAO = new MapResponseDao() { - + @Override public List selectResponseTime(Application application, Range range) { List list = new LinkedList<>(); @@ -54,8 +54,8 @@ public List selectResponseTime(Application application, Range rang list.add(responseTime); TimeHistogram histogram = null; - for (int i=0 ; i < 5; i++) { - for (int j=0 ; j < 5; j++) { + for (int i = 0; i < 5; i++) { + for (int j = 0; j < 5; j++) { histogram = new TimeHistogram(ServiceType.STAND_ALONE, timeStamp); histogram.addCallCountByElapsedTime(1000, false); histogram.addCallCountByElapsedTime(3000, false); @@ -64,10 +64,10 @@ public List selectResponseTime(Application application, Range rang histogram.addCallCountByElapsedTime(7000, false); responseTime.addResponseTime("agent_" + i + "_" + j, histogram); } - + timeStamp += 1; } - + return list; } }; @@ -82,11 +82,11 @@ public void checkTest1() { ResponseTimeDataCollector collector = new ResponseTimeDataCollector(DataCollectorCategory.RESPONSE_TIME, application, mockMapResponseDAO, System.currentTimeMillis(), 300000); Rule rule = new Rule(SERVICE_NAME, SERVICE_TYPE, CheckerCategory.SLOW_COUNT.getName(), 74, "testGroup", false, false, false, ""); SlowCountChecker checker = new SlowCountChecker(collector, rule); - + checker.check(); assertTrue(checker.isDetected()); } - + /* * alert conditions not satisfied */ @@ -96,7 +96,7 @@ public void checkTest2() { ResponseTimeDataCollector collector = new ResponseTimeDataCollector(DataCollectorCategory.RESPONSE_TIME, application, mockMapResponseDAO, System.currentTimeMillis(), 300000); Rule rule = new Rule(SERVICE_NAME, SERVICE_TYPE, CheckerCategory.SLOW_COUNT.getName(), 76, "testGroup", false, false, false, ""); SlowCountChecker checker = new SlowCountChecker(collector, rule); - + checker.check(); assertFalse(checker.isDetected()); } diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SlowCountToCalleCheckerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SlowCountToCalleCheckerTest.java index 5bac96484551..eb2e41006a28 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SlowCountToCalleCheckerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SlowCountToCalleCheckerTest.java @@ -16,10 +16,11 @@ package com.navercorp.pinpoint.batch.alarm.checker; -import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; +import com.navercorp.pinpoint.batch.alarm.collector.MapStatisticsCallerDataCollector; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.alarm.CheckerCategory; -import com.navercorp.pinpoint.batch.alarm.collector.MapStatisticsCallerDataCollector; +import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.web.alarm.vo.Rule; import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkCallDataMap; @@ -27,24 +28,23 @@ import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap; import com.navercorp.pinpoint.web.dao.MapStatisticsCallerDao; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collection; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class SlowCountToCalleCheckerTest { - + private static final String FROM_SERVICE_NAME = "from_local_service"; private static final String TO_SERVICE_NAME = "to_local_service"; private static final String SERVICE_TYPE = "tomcat"; public static MapStatisticsCallerDao dao; - - @BeforeClass + + @BeforeAll public static void before() { dao = new MapStatisticsCallerDao() { @@ -53,57 +53,57 @@ public LinkDataMap selectCaller(Application callerApplication, Range range) { long timeStamp = 1409814914298L; LinkDataMap linkDataMap = new LinkDataMap(); Application fromApplication = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); - for (int i = 1 ; i < 6 ; i++) { + for (int i = 1; i < 6; i++) { LinkCallDataMap linkCallDataMap = new LinkCallDataMap(); Application toApplication = new Application(TO_SERVICE_NAME + i, ServiceType.STAND_ALONE); Collection timeHistogramList = new ArrayList<>(); - - for (int j = 1 ; j < 11 ; j++) { + + for (int j = 1; j < 11; j++) { TimeHistogram timeHistogram = new TimeHistogram(ServiceType.STAND_ALONE, timeStamp); timeHistogram.addCallCountByElapsedTime(i * j * 1000, false); timeHistogramList.add(timeHistogram); } - + linkCallDataMap.addCallData(fromApplication.getName(), fromApplication.getServiceType(), toApplication.getName(), toApplication.getServiceType(), timeHistogramList); LinkData linkData = new LinkData(fromApplication, toApplication); linkData.setLinkCallDataMap(linkCallDataMap); linkDataMap.addLinkData(linkData); } - + return linkDataMap; } }; } - + @Test public void checkTest() { Application application = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); MapStatisticsCallerDataCollector dataCollector = new MapStatisticsCallerDataCollector(DataCollectorCategory.CALLER_STAT, application, dao, System.currentTimeMillis(), 300000); Rule rule = new Rule(FROM_SERVICE_NAME, SERVICE_TYPE, CheckerCategory.SLOW_COUNT_TO_CALLEE.getName(), 7, "testGroup", false, false, false, TO_SERVICE_NAME + 1); SlowCountToCalleeChecker checker = new SlowCountToCalleeChecker(dataCollector, rule); - + checker.check(); assertTrue(checker.isDetected()); } - + @Test public void checkTest2() { Application application = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); MapStatisticsCallerDataCollector dataCollector = new MapStatisticsCallerDataCollector(DataCollectorCategory.CALLER_STAT, application, dao, System.currentTimeMillis(), 300000); Rule rule = new Rule(FROM_SERVICE_NAME, SERVICE_TYPE, CheckerCategory.SLOW_COUNT_TO_CALLEE.getName(), 8, "testGroup", false, false, false, TO_SERVICE_NAME + 1); SlowCountToCalleeChecker checker = new SlowCountToCalleeChecker(dataCollector, rule); - + checker.check(); assertFalse(checker.isDetected()); } - + @Test public void checkTest3() { Application application = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); MapStatisticsCallerDataCollector dataCollector = new MapStatisticsCallerDataCollector(DataCollectorCategory.CALLER_STAT, application, dao, System.currentTimeMillis(), 300000); Rule rule = new Rule(FROM_SERVICE_NAME, SERVICE_TYPE, CheckerCategory.SLOW_COUNT_TO_CALLEE.getName(), 9, "testGroup", false, false, false, TO_SERVICE_NAME + 2); SlowCountToCalleeChecker checker = new SlowCountToCalleeChecker(dataCollector, rule); - + checker.check(); assertTrue(checker.isDetected()); } diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SlowRateCheckerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SlowRateCheckerTest.java index 60d9f049b241..7ce2a7a109f4 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SlowRateCheckerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SlowRateCheckerTest.java @@ -16,36 +16,36 @@ package com.navercorp.pinpoint.batch.alarm.checker; -import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; +import com.navercorp.pinpoint.batch.alarm.collector.ResponseTimeDataCollector; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.alarm.CheckerCategory; -import com.navercorp.pinpoint.batch.alarm.collector.ResponseTimeDataCollector; +import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.web.alarm.vo.Rule; import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram; import com.navercorp.pinpoint.web.dao.MapResponseDao; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.vo.ResponseTime; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.LinkedList; import java.util.List; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class SlowRateCheckerTest { - - private static final String SERVICE_NAME = "local_service"; + + private static final String SERVICE_NAME = "local_service"; private static final String SERVICE_TYPE = "tomcat"; - + private static MapResponseDao mockMapResponseDAO; - - @BeforeClass + + @BeforeAll public static void before() { mockMapResponseDAO = new MapResponseDao() { - + @Override public List selectResponseTime(Application application, Range range) { List list = new LinkedList(); @@ -54,8 +54,8 @@ public List selectResponseTime(Application application, Range rang list.add(responseTime); TimeHistogram histogram = null; - for (int i=0 ; i < 5; i++) { - for (int j=0 ; j < 5; j++) { + for (int i = 0; i < 5; i++) { + for (int j = 0; j < 5; j++) { histogram = new TimeHistogram(ServiceType.STAND_ALONE, timeStamp); histogram.addCallCountByElapsedTime(1000, false); histogram.addCallCountByElapsedTime(3000, false); @@ -64,10 +64,10 @@ public List selectResponseTime(Application application, Range rang histogram.addCallCountByElapsedTime(7000, false); responseTime.addResponseTime("agent_" + i + "_" + j, histogram); } - + timeStamp += 1; } - + return list; } }; @@ -82,11 +82,11 @@ public void checkTest1() { ResponseTimeDataCollector collector = new ResponseTimeDataCollector(DataCollectorCategory.RESPONSE_TIME, application, mockMapResponseDAO, System.currentTimeMillis(), 300000); Rule rule = new Rule(SERVICE_NAME, SERVICE_TYPE, CheckerCategory.SLOW_RATE.getName(), 60, "testGroup", false, false, false, ""); SlowRateChecker filter = new SlowRateChecker(collector, rule); - + filter.check(); assertTrue(filter.isDetected()); } - + /* * not satisfied with alert condition */ @@ -96,7 +96,7 @@ public void checkTest2() { ResponseTimeDataCollector collector = new ResponseTimeDataCollector(DataCollectorCategory.RESPONSE_TIME, application, mockMapResponseDAO, System.currentTimeMillis(), 300000); Rule rule = new Rule(SERVICE_NAME, SERVICE_TYPE, CheckerCategory.SLOW_RATE.getName(), 61, "testGroup", false, false, false, ""); SlowRateChecker filter = new SlowRateChecker(collector, rule); - + filter.check(); assertFalse(filter.isDetected()); } diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SlowRateToCalleCheckerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SlowRateToCalleCheckerTest.java index 252099b2bfc5..ce32077aa9de 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SlowRateToCalleCheckerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SlowRateToCalleCheckerTest.java @@ -16,10 +16,11 @@ package com.navercorp.pinpoint.batch.alarm.checker; -import com.navercorp.pinpoint.web.alarm.CheckerCategory; -import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.batch.alarm.collector.MapStatisticsCallerDataCollector; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.web.alarm.CheckerCategory; +import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.web.alarm.vo.Rule; import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkCallDataMap; @@ -27,15 +28,14 @@ import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap; import com.navercorp.pinpoint.web.dao.MapStatisticsCallerDao; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collection; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class SlowRateToCalleCheckerTest { @@ -43,8 +43,8 @@ public class SlowRateToCalleCheckerTest { private static final String TO_SERVICE_NAME = "to_local_service"; private static final String SERVICE_TYPE = "tomcat"; public static MapStatisticsCallerDao dao; - - @BeforeClass + + @BeforeAll public static void before() { dao = new MapStatisticsCallerDao() { @@ -53,57 +53,57 @@ public LinkDataMap selectCaller(Application callerApplication, Range range) { long timeStamp = 1409814914298L; LinkDataMap linkDataMap = new LinkDataMap(); Application fromApplication = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); - for (int i = 1 ; i < 6 ; i++) { + for (int i = 1; i < 6; i++) { LinkCallDataMap linkCallDataMap = new LinkCallDataMap(); Application toApplication = new Application(TO_SERVICE_NAME + i, ServiceType.STAND_ALONE); Collection timeHistogramList = new ArrayList<>(); - - for (int j = 1 ; j < 11 ; j++) { + + for (int j = 1; j < 11; j++) { TimeHistogram timeHistogram = new TimeHistogram(ServiceType.STAND_ALONE, timeStamp); timeHistogram.addCallCountByElapsedTime(i * j * 1000, false); timeHistogramList.add(timeHistogram); } - + linkCallDataMap.addCallData(fromApplication.getName(), fromApplication.getServiceType(), toApplication.getName(), toApplication.getServiceType(), timeHistogramList); LinkData linkData = new LinkData(fromApplication, toApplication); linkData.setLinkCallDataMap(linkCallDataMap); linkDataMap.addLinkData(linkData); } - + return linkDataMap; } }; } - + @Test public void checkTest() { Application application = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); MapStatisticsCallerDataCollector dataCollector = new MapStatisticsCallerDataCollector(DataCollectorCategory.CALLER_STAT, application, dao, System.currentTimeMillis(), 300000); Rule rule = new Rule(FROM_SERVICE_NAME, SERVICE_TYPE, CheckerCategory.SLOW_RATE_TO_CALLEE.getName(), 70, "testGroup", false, false, false, TO_SERVICE_NAME + 1); SlowRateToCalleeChecker checker = new SlowRateToCalleeChecker(dataCollector, rule); - + checker.check(); assertTrue(checker.isDetected()); } - + @Test public void checkTest2() { Application application = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); MapStatisticsCallerDataCollector dataCollector = new MapStatisticsCallerDataCollector(DataCollectorCategory.CALLER_STAT, application, dao, System.currentTimeMillis(), 300000); Rule rule = new Rule(FROM_SERVICE_NAME, SERVICE_TYPE, CheckerCategory.SLOW_RATE_TO_CALLEE.getName(), 71, "testGroup", false, false, false, TO_SERVICE_NAME + 1); SlowRateToCalleeChecker checker = new SlowRateToCalleeChecker(dataCollector, rule); - + checker.check(); assertFalse(checker.isDetected()); } - + @Test public void checkTest3() { Application application = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); MapStatisticsCallerDataCollector dataCollector = new MapStatisticsCallerDataCollector(DataCollectorCategory.CALLER_STAT, application, dao, System.currentTimeMillis(), 300000); Rule rule = new Rule(FROM_SERVICE_NAME, SERVICE_TYPE, CheckerCategory.SLOW_RATE_TO_CALLEE.getName(), 90, "testGroup", false, false, false, TO_SERVICE_NAME + 2); SlowRateToCalleeChecker checker = new SlowRateToCalleeChecker(dataCollector, rule); - + checker.check(); assertTrue(checker.isDetected()); } diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SystemCpuUsageRateCheckerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SystemCpuUsageRateCheckerTest.java index dc8f712bc08b..2423bfdaaaba 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SystemCpuUsageRateCheckerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/SystemCpuUsageRateCheckerTest.java @@ -16,16 +16,15 @@ package com.navercorp.pinpoint.batch.alarm.checker; -import com.navercorp.pinpoint.batch.alarm.checker.SystemCpuUsageRateChecker; import com.navercorp.pinpoint.batch.alarm.collector.AgentStatDataCollector; import com.navercorp.pinpoint.web.alarm.vo.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/TotalCountToCalleeCheckerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/TotalCountToCalleeCheckerTest.java index eb53e4c1dd8a..ee367721c115 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/TotalCountToCalleeCheckerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/checker/TotalCountToCalleeCheckerTest.java @@ -16,10 +16,11 @@ package com.navercorp.pinpoint.batch.alarm.checker; -import com.navercorp.pinpoint.web.alarm.CheckerCategory; -import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.batch.alarm.collector.MapStatisticsCallerDataCollector; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.web.alarm.CheckerCategory; +import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.web.alarm.vo.Rule; import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkCallDataMap; @@ -27,24 +28,23 @@ import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap; import com.navercorp.pinpoint.web.dao.MapStatisticsCallerDao; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collection; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TotalCountToCalleeCheckerTest { - + private static final String FROM_SERVICE_NAME = "from_local_service"; private static final String TO_SERVICE_NAME = "to_local_service"; private static final String SERVICE_TYPE = "tomcat"; public static MapStatisticsCallerDao dao; - - @BeforeClass + + @BeforeAll public static void before() { dao = new MapStatisticsCallerDao() { @@ -53,57 +53,57 @@ public LinkDataMap selectCaller(Application callerApplication, Range range) { long timeStamp = 1409814914298L; LinkDataMap linkDataMap = new LinkDataMap(); Application fromApplication = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); - for (int i = 1 ; i < 6 ; i++) { + for (int i = 1; i < 6; i++) { LinkCallDataMap linkCallDataMap = new LinkCallDataMap(); Application toApplication = new Application(TO_SERVICE_NAME + i, ServiceType.STAND_ALONE); Collection timeHistogramList = new ArrayList<>(); - - for (int j = 1 ; j < 11 ; j++) { + + for (int j = 1; j < 11; j++) { TimeHistogram timeHistogram = new TimeHistogram(ServiceType.STAND_ALONE, timeStamp); timeHistogram.addCallCountByElapsedTime(i * j * 1000, false); timeHistogramList.add(timeHistogram); } - + linkCallDataMap.addCallData(fromApplication.getName(), fromApplication.getServiceType(), toApplication.getName(), toApplication.getServiceType(), timeHistogramList); LinkData linkData = new LinkData(fromApplication, toApplication); linkData.setLinkCallDataMap(linkCallDataMap); linkDataMap.addLinkData(linkData); } - + return linkDataMap; } }; } - + @Test public void checkTest() { Application application = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); MapStatisticsCallerDataCollector dataCollector = new MapStatisticsCallerDataCollector(DataCollectorCategory.CALLER_STAT, application, dao, System.currentTimeMillis(), 300000); Rule rule = new Rule(FROM_SERVICE_NAME, SERVICE_TYPE, CheckerCategory.TOTAL_COUNT_TO_CALLEE.getName(), 10, "testGroup", false, false, false, TO_SERVICE_NAME + 1); TotalCountToCalleeChecker checker = new TotalCountToCalleeChecker(dataCollector, rule); - + checker.check(); assertTrue(checker.isDetected()); } - + @Test public void checkTest2() { Application application = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); MapStatisticsCallerDataCollector dataCollector = new MapStatisticsCallerDataCollector(DataCollectorCategory.CALLER_STAT, application, dao, System.currentTimeMillis(), 300000); Rule rule = new Rule(FROM_SERVICE_NAME, SERVICE_TYPE, CheckerCategory.TOTAL_COUNT_TO_CALLEE.getName(), 11, "testGroup", false, false, false, TO_SERVICE_NAME + 1); TotalCountToCalleeChecker checker = new TotalCountToCalleeChecker(dataCollector, rule); - + checker.check(); assertFalse(checker.isDetected()); } - + @Test public void checkTest3() { Application application = new Application(FROM_SERVICE_NAME, ServiceType.STAND_ALONE); MapStatisticsCallerDataCollector dataCollector = new MapStatisticsCallerDataCollector(DataCollectorCategory.CALLER_STAT, application, dao, System.currentTimeMillis(), 300000); Rule rule = new Rule(FROM_SERVICE_NAME, SERVICE_TYPE, CheckerCategory.TOTAL_COUNT_TO_CALLEE.getName(), 10, "testGroup", false, false, false, TO_SERVICE_NAME + 2); TotalCountToCalleeChecker checker = new TotalCountToCalleeChecker(dataCollector, rule); - + checker.check(); assertTrue(checker.isDetected()); } diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/collector/FileDescriptorDataCollectorTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/collector/FileDescriptorDataCollectorTest.java index b01df5979f66..7c2eccfbb07b 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/collector/FileDescriptorDataCollectorTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/alarm/collector/FileDescriptorDataCollectorTest.java @@ -16,21 +16,21 @@ package com.navercorp.pinpoint.batch.alarm.collector; -import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; +import com.navercorp.pinpoint.batch.alarm.DataCollectorFactory; import com.navercorp.pinpoint.common.server.bo.stat.FileDescriptorBo; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; -import com.navercorp.pinpoint.batch.alarm.DataCollectorFactory; +import com.navercorp.pinpoint.web.alarm.DataCollectorCategory; import com.navercorp.pinpoint.web.dao.ApplicationIndexDao; import com.navercorp.pinpoint.web.dao.stat.AgentStatDao; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -82,7 +82,7 @@ public void collect() { FileDescriptorDataCollector fileDescriptorDataCollector = new FileDescriptorDataCollector(DataCollectorCategory.FILE_DESCRIPTOR, application, fileDescriptorDao, applicationIndexDao, timeStamp, DataCollectorFactory.SLOT_INTERVAL_FIVE_MIN); fileDescriptorDataCollector.collect(); Map fileDescriptorCount = fileDescriptorDataCollector.getFileDescriptorCount(); - assertEquals(fileDescriptorCount.size(),2); + assertEquals(fileDescriptorCount.size(), 2); assertEquals(fileDescriptorCount.get(agentId1), new Long(300L)); assertEquals(fileDescriptorCount.get(agentId2), new Long(350L)); } diff --git a/batch/src/test/java/com/navercorp/pinpoint/batch/job/AgentCountPartitionerTest.java b/batch/src/test/java/com/navercorp/pinpoint/batch/job/AgentCountPartitionerTest.java index 410594bb9a5a..4a9fa3785823 100644 --- a/batch/src/test/java/com/navercorp/pinpoint/batch/job/AgentCountPartitionerTest.java +++ b/batch/src/test/java/com/navercorp/pinpoint/batch/job/AgentCountPartitionerTest.java @@ -16,13 +16,13 @@ package com.navercorp.pinpoint.batch.job; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.batch.item.ExecutionContext; import java.util.Map; import java.util.Optional; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/async/AsyncContextAccessorUtilsTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/async/AsyncContextAccessorUtilsTest.java index c15938a3366e..21998204e8da 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/async/AsyncContextAccessorUtilsTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/async/AsyncContextAccessorUtilsTest.java @@ -1,10 +1,9 @@ package com.navercorp.pinpoint.bootstrap.async; import com.navercorp.pinpoint.bootstrap.context.AsyncContext; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -19,7 +18,7 @@ public void getAsyncContext() { Object[] args = {accessorMock}; AsyncContext asyncContext = AsyncContextAccessorUtils.getAsyncContext(args, 0); - Assert.assertNotNull(asyncContext); + Assertions.assertNotNull(asyncContext); } @Test @@ -27,7 +26,7 @@ public void getAsyncContext_null() { Object[] args = null; AsyncContext asyncContext = AsyncContextAccessorUtils.getAsyncContext(args, 0); - Assert.assertNull(asyncContext); + Assertions.assertNull(asyncContext); } @Test @@ -35,7 +34,7 @@ public void getAsyncContext_invalid_type() { Object[] args = {"Str"}; AsyncContext asyncContext = AsyncContextAccessorUtils.getAsyncContext(args, 0); - Assert.assertNull(asyncContext); + Assertions.assertNull(asyncContext); } @Test @@ -46,10 +45,10 @@ public void getAsyncContext_OOB() { Object[] args = {}; AsyncContext asyncContext0 = AsyncContextAccessorUtils.getAsyncContext(args, 0); - Assert.assertNull(asyncContext0); + Assertions.assertNull(asyncContext0); AsyncContext asyncContext1 = AsyncContextAccessorUtils.getAsyncContext(args, 1); - Assert.assertNull(asyncContext1); + Assertions.assertNull(asyncContext1); } @Test @@ -60,28 +59,28 @@ public void findAsyncContext() { Object[] args = {"foo", "bar", accessorMock}; AsyncContext asyncContext = AsyncContextAccessorUtils.findAsyncContext(args, 0); - Assert.assertNotNull(asyncContext); + Assertions.assertNotNull(asyncContext); asyncContext = AsyncContextAccessorUtils.findAsyncContext(args, 1); - Assert.assertNotNull(asyncContext); + Assertions.assertNotNull(asyncContext); asyncContext = AsyncContextAccessorUtils.findAsyncContext(args, 2); - Assert.assertNotNull(asyncContext); + Assertions.assertNotNull(asyncContext); asyncContext = AsyncContextAccessorUtils.findAsyncContext(args, 3); - Assert.assertNull(asyncContext); + Assertions.assertNull(asyncContext); asyncContext = AsyncContextAccessorUtils.findAsyncContext(args, 0, 2); - Assert.assertNotNull(asyncContext); + Assertions.assertNotNull(asyncContext); asyncContext = AsyncContextAccessorUtils.findAsyncContext(args, 1, 2); - Assert.assertNotNull(asyncContext); + Assertions.assertNotNull(asyncContext); asyncContext = AsyncContextAccessorUtils.findAsyncContext(args, 0, 1); - Assert.assertNull(asyncContext); + Assertions.assertNull(asyncContext); asyncContext = AsyncContextAccessorUtils.findAsyncContext(args, 2, 0); - Assert.assertNull(asyncContext); + Assertions.assertNull(asyncContext); } @Test @@ -89,7 +88,7 @@ public void findAsyncContext_null() { Object[] args = null; AsyncContext asyncContext = AsyncContextAccessorUtils.findAsyncContext(args, 0); - Assert.assertNull(asyncContext); + Assertions.assertNull(asyncContext); } @Test @@ -97,7 +96,7 @@ public void findAsyncContext_invalid_type() { Object[] args = {"Str"}; AsyncContext asyncContext = AsyncContextAccessorUtils.findAsyncContext(args, 0); - Assert.assertNull(asyncContext); + Assertions.assertNull(asyncContext); } @Test @@ -105,10 +104,10 @@ public void findAsyncContext_OOB() { Object[] args = {}; AsyncContext asyncContext0 = AsyncContextAccessorUtils.findAsyncContext(args, 0); - Assert.assertNull(asyncContext0); + Assertions.assertNull(asyncContext0); AsyncContext asyncContext1 = AsyncContextAccessorUtils.findAsyncContext(args, 1); - Assert.assertNull(asyncContext1); + Assertions.assertNull(asyncContext1); } @Test diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/BootLoaderTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/BootLoaderTest.java index 5eac9581b786..698cea24f967 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/BootLoaderTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/BootLoaderTest.java @@ -16,10 +16,10 @@ package com.navercorp.pinpoint.bootstrap.classloader; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URL; @@ -41,7 +41,7 @@ public void testFindResource() { String stringResource = getInternalName(String.class); URL url = bootLoader.findResource(stringResource); - Assert.assertNotNull(url); + Assertions.assertNotNull(url); } private BootLoader newBootLoader() { @@ -60,7 +60,7 @@ public void testFindResources() throws IOException { Enumeration bootstrapResources = bootLoader.findResources(stringResource); List list = Collections.list(bootstrapResources); - Assert.assertEquals(1, list.size()); + Assertions.assertEquals(1, list.size()); logger.debug("list:{}", list); } @@ -73,10 +73,10 @@ public void testBootstrapClassLoader() throws Exception { Class string1 = bootLoader.findBootstrapClassOrNull(classLoader, "java.lang.String"); Class string2 = Class.forName("java.lang.String", false, parent); - Assert.assertNotNull(string1); - Assert.assertNotNull(string2); - Assert.assertSame(string1, string2); - Assert.assertSame(string1.getClassLoader(), string2.getClassLoader()); + Assertions.assertNotNull(string1); + Assertions.assertNotNull(string2); + Assertions.assertSame(string1, string2); + Assertions.assertSame(string1.getClassLoader(), string2.getClassLoader()); this.getClass().getClassLoader(); ClassLoaderUtils.close(classLoader); diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/MergedEnumeration2Test.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/MergedEnumeration2Test.java index 23cd959e4cff..b88ecb543901 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/MergedEnumeration2Test.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/MergedEnumeration2Test.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.bootstrap.classloader; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; @@ -38,8 +38,8 @@ public void hasMoreElements() { List list = Collections.list(mergedEnumeration); - Assert.assertEquals(6, list.size()); - Assert.assertEquals(Arrays.asList("a", "b", "c", "1", "2", "3"), list); + Assertions.assertEquals(6, list.size()); + Assertions.assertEquals(Arrays.asList("a", "b", "c", "1", "2", "3"), list); } private Enumeration newEnumeration(T... t) { @@ -55,8 +55,8 @@ public void null0() { List list = Collections.list(mergedEnumeration); - Assert.assertEquals(3, list.size()); - Assert.assertEquals(Arrays.asList("1", "2", "3"), list); + Assertions.assertEquals(3, list.size()); + Assertions.assertEquals(Arrays.asList("1", "2", "3"), list); } @@ -69,8 +69,8 @@ public void null1() { List list = Collections.list(mergedEnumeration); - Assert.assertEquals(3, list.size()); - Assert.assertEquals(Arrays.asList("a", "b", "c"), list); + Assertions.assertEquals(3, list.size()); + Assertions.assertEquals(Arrays.asList("a", "b", "c"), list); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/ParallelClassLoaderTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/ParallelClassLoaderTest.java index eaf248fa2d1d..1d7154e1bca7 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/ParallelClassLoaderTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/ParallelClassLoaderTest.java @@ -17,14 +17,13 @@ package com.navercorp.pinpoint.bootstrap.classloader; import com.navercorp.pinpoint.common.util.CodeSourceUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.Closeable; import java.io.IOException; import java.net.URL; - /** * @author Taejin Koo */ @@ -48,25 +47,25 @@ private ClassLoader onLoadTest(Class classLoaderType, Class testClass) thr URL testClassJar = CodeSourceUtils.getCodeLocation(testClass); URL[] urls = {testClassJar}; ClassLoader cl = PinpointClassLoaderFactory.createClassLoader(this.getClass().getName(), urls, null, ProfilerLibs.PINPOINT_PROFILER_CLASS); - Assert.assertSame(cl.getClass(), classLoaderType); + Assertions.assertSame(cl.getClass(), classLoaderType); try { cl.loadClass("test"); - Assert.fail(); + Assertions.fail(); } catch (ClassNotFoundException ignored) { } Class selfLoadClass = cl.loadClass(testClass.getName()); - Assert.assertNotSame(testClass, selfLoadClass); - Assert.assertSame(cl, selfLoadClass.getClassLoader()); - Assert.assertSame(testClass.getClassLoader(), this.getClass().getClassLoader()); + Assertions.assertNotSame(testClass, selfLoadClass); + Assertions.assertSame(cl, selfLoadClass.getClassLoader()); + Assertions.assertSame(testClass.getClassLoader(), this.getClass().getClassLoader()); return cl; } private void close(ClassLoader classLoader) throws IOException { if (classLoader instanceof Closeable) { - ((Closeable)classLoader).close(); + ((Closeable) classLoader).close(); } } diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/PinpointClassLoaderTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/PinpointClassLoaderTest.java index 08a13532cd64..820ef40cada8 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/PinpointClassLoaderTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/PinpointClassLoaderTest.java @@ -17,12 +17,11 @@ package com.navercorp.pinpoint.bootstrap.classloader; import com.navercorp.pinpoint.common.util.CodeSourceUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.URL; - /** * @author emeroad */ @@ -44,18 +43,18 @@ private ClassLoader onLoadTest(Class classLoaderType, Class testClass) thr URL testClassJar = CodeSourceUtils.getCodeLocation(testClass); URL[] urls = {testClassJar}; ClassLoader cl = PinpointClassLoaderFactory.createClassLoader(this.getClass().getName(), urls, null, ProfilerLibs.PINPOINT_PROFILER_CLASS); - Assert.assertSame(cl.getClass(), classLoaderType); + Assertions.assertSame(cl.getClass(), classLoaderType); try { cl.loadClass("test"); - Assert.fail(); + Assertions.fail(); } catch (ClassNotFoundException ignored) { } Class selfLoadClass = cl.loadClass(testClass.getName()); - Assert.assertNotSame(testClass, selfLoadClass); - Assert.assertSame(cl, selfLoadClass.getClassLoader()); - Assert.assertSame(testClass.getClassLoader(), this.getClass().getClassLoader()); + Assertions.assertNotSame(testClass, selfLoadClass); + Assertions.assertSame(cl, selfLoadClass.getClassLoader()); + Assertions.assertSame(testClass.getClassLoader(), this.getClass().getClassLoader()); return cl; } diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/ProfilerLibClassTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/ProfilerLibClassTest.java index 036f24cc0bf9..fbed26224e78 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/ProfilerLibClassTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/classloader/ProfilerLibClassTest.java @@ -16,8 +16,9 @@ package com.navercorp.pinpoint.bootstrap.classloader; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + /** * @author Woonduk Kang(emeroad) */ @@ -26,6 +27,6 @@ public class ProfilerLibClassTest { @Test public void onLoadClass() { LibClass libClass = new ProfilerLibClass(ProfilerLibs.PINPOINT_PROFILER_CLASS); - Assert.assertTrue(libClass.onLoadClass("com.navercorp.pinpoint.profiler.XXX")); + Assertions.assertTrue(libClass.onLoadClass("com.navercorp.pinpoint.profiler.XXX")); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/DefaultProfilerConfigTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/DefaultProfilerConfigTest.java index c9bcb58564af..bbbe53afa701 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/DefaultProfilerConfigTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/DefaultProfilerConfigTest.java @@ -16,11 +16,11 @@ package com.navercorp.pinpoint.bootstrap.config; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hamcrest.CoreMatchers; import org.hamcrest.MatcherAssert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; +import org.junit.jupiter.api.Test; import java.io.InputStream; import java.util.Properties; diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/DumpTypeTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/DumpTypeTest.java index 4e4055510805..e36cd6fb03eb 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/DumpTypeTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/DumpTypeTest.java @@ -16,13 +16,10 @@ package com.navercorp.pinpoint.bootstrap.config; -import org.junit.Assert; - -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; - -import com.navercorp.pinpoint.bootstrap.config.DumpType; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -37,7 +34,7 @@ public void find() { try { DumpType.valueOf("error"); - Assert.fail("not found"); + Assertions.fail("not found"); } catch (IllegalArgumentException ignored) { } diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/ExcludeMethodFilterTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/ExcludeMethodFilterTest.java index 651796453f14..4c79b498cca5 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/ExcludeMethodFilterTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/ExcludeMethodFilterTest.java @@ -1,8 +1,9 @@ package com.navercorp.pinpoint.bootstrap.config; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ExcludeMethodFilterTest { diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/ExcludePathFilterTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/ExcludePathFilterTest.java index 9c9e13f8fd26..a4e30088230e 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/ExcludePathFilterTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/ExcludePathFilterTest.java @@ -17,10 +17,11 @@ package com.navercorp.pinpoint.bootstrap.config; import org.hamcrest.MatcherAssert; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import static com.navercorp.pinpoint.bootstrap.config.Filter.*; +import static com.navercorp.pinpoint.bootstrap.config.Filter.FILTERED; +import static com.navercorp.pinpoint.bootstrap.config.Filter.NOT_FILTERED; import static org.hamcrest.core.Is.is; /** @@ -118,47 +119,47 @@ public void testFilter_InvalidExcludeURL() { public void testFilter_emptyExcludeURL() { Filter filter = new ExcludePathFilter(""); - Assert.assertFalse(filter.filter("/monitor/l7check.html")); - Assert.assertFalse(filter.filter("test/l4check.html")); + Assertions.assertFalse(filter.filter("/monitor/l7check.html")); + Assertions.assertFalse(filter.filter("test/l4check.html")); - Assert.assertFalse(filter.filter("test/")); - Assert.assertFalse(filter.filter("test/l4check.htm")); + Assertions.assertFalse(filter.filter("test/")); + Assertions.assertFalse(filter.filter("test/l4check.htm")); } private void assertFilter(Filter filter) { - Assert.assertTrue(filter.filter("/monitor/l7check.html")); - Assert.assertTrue(filter.filter("test/l4check.html")); + Assertions.assertTrue(filter.filter("/monitor/l7check.html")); + Assertions.assertTrue(filter.filter("test/l4check.html")); - Assert.assertFalse(filter.filter("test/")); - Assert.assertFalse(filter.filter("test/l4check.htm")); + Assertions.assertFalse(filter.filter("test/")); + Assertions.assertFalse(filter.filter("test/l4check.htm")); - Assert.assertFalse(filter.filter(null)); - Assert.assertFalse(filter.filter("")); + Assertions.assertFalse(filter.filter(null)); + Assertions.assertFalse(filter.filter("")); } @Test public void antStylePath() { Filter filter = new ExcludePathFilter("/monitor/l7check.*,/*/l7check.*"); - Assert.assertTrue(filter.filter("/monitor/l7check.jsp")); - Assert.assertTrue(filter.filter("/monitor/l7check.html")); + Assertions.assertTrue(filter.filter("/monitor/l7check.jsp")); + Assertions.assertTrue(filter.filter("/monitor/l7check.html")); - Assert.assertFalse(filter.filter("/monitor/test.jsp")); + Assertions.assertFalse(filter.filter("/monitor/test.jsp")); - Assert.assertTrue(filter.filter("/*/l7check.html")); + Assertions.assertTrue(filter.filter("/*/l7check.html")); - Assert.assertFalse(filter.filter(null)); - Assert.assertFalse(filter.filter("")); + Assertions.assertFalse(filter.filter(null)); + Assertions.assertFalse(filter.filter("")); } @Test public void antstyle_equals_match() { Filter filter = new ExcludePathFilter("/monitor/stringEquals,/monitor/antstyle.*"); - Assert.assertTrue(filter.filter("/monitor/stringEquals")); - Assert.assertTrue(filter.filter("/monitor/antstyle.html")); + Assertions.assertTrue(filter.filter("/monitor/stringEquals")); + Assertions.assertTrue(filter.filter("/monitor/antstyle.html")); - Assert.assertFalse(filter.filter("/monitor/stringEquals.test")); - Assert.assertFalse(filter.filter("/monitor/antstyleXXX.html")); + Assertions.assertFalse(filter.filter("/monitor/stringEquals.test")); + Assertions.assertFalse(filter.filter("/monitor/antstyleXXX.html")); } } diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/HttpStatusCodeErrorsTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/HttpStatusCodeErrorsTest.java index 1b4b80eeabc7..99bc830b5e41 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/HttpStatusCodeErrorsTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/HttpStatusCodeErrorsTest.java @@ -16,11 +16,12 @@ package com.navercorp.pinpoint.bootstrap.config; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class HttpStatusCodeErrorsTest { @Test diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfilableClassFilterTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfilableClassFilterTest.java index 80658330eee0..adee479a5c8a 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfilableClassFilterTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfilableClassFilterTest.java @@ -16,11 +16,8 @@ package com.navercorp.pinpoint.bootstrap.config; -import org.junit.Assert; - -import org.junit.Test; - -import com.navercorp.pinpoint.bootstrap.config.ProfilableClassFilter; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; @@ -30,10 +27,10 @@ public class ProfilableClassFilterTest { public void testIsProfilableClassWithNoConfiguration() throws IOException { ProfilableClassFilter filter = new ProfilableClassFilter("com.navercorp.pinpoint.testweb.controller.*,com.navercorp.pinpoint.testweb.MyClass"); - Assert.assertFalse(filter.filter("com/navercorp/pinpoint/testweb/controllers/MyController")); - Assert.assertFalse(filter.filter("net/spider/king/wang/Jjang")); - Assert.assertFalse(filter.filter("com/navercorp/pinpoint/testweb2/controller/MyController")); - Assert.assertFalse(filter.filter("com/navercorp/pinpoint/testweb2/MyClass")); + Assertions.assertFalse(filter.filter("com/navercorp/pinpoint/testweb/controllers/MyController")); + Assertions.assertFalse(filter.filter("net/spider/king/wang/Jjang")); + Assertions.assertFalse(filter.filter("com/navercorp/pinpoint/testweb2/controller/MyController")); + Assertions.assertFalse(filter.filter("com/navercorp/pinpoint/testweb2/MyClass")); } /** @@ -48,12 +45,12 @@ public void testIsProfilableClassWithNoConfiguration() throws IOException { public void testIsProfilableClass() throws IOException { ProfilableClassFilter filter = new ProfilableClassFilter("com.navercorp.pinpoint.testweb.controller.*,com.navercorp.pinpoint.testweb.MyClass"); - Assert.assertTrue(filter.filter("com/navercorp/pinpoint/testweb/MyClass")); - Assert.assertTrue(filter.filter("com/navercorp/pinpoint/testweb/controller/MyController")); - Assert.assertTrue(filter.filter("com/navercorp/pinpoint/testweb/controller/customcontroller/MyCustomController")); + Assertions.assertTrue(filter.filter("com/navercorp/pinpoint/testweb/MyClass")); + Assertions.assertTrue(filter.filter("com/navercorp/pinpoint/testweb/controller/MyController")); + Assertions.assertTrue(filter.filter("com/navercorp/pinpoint/testweb/controller/customcontroller/MyCustomController")); - Assert.assertFalse(filter.filter("com/navercorp/pinpoint/testweb/MyUnknownClass")); - Assert.assertFalse(filter.filter("com/navercorp/pinpoint/testweb/controller2/MyController")); + Assertions.assertFalse(filter.filter("com/navercorp/pinpoint/testweb/MyUnknownClass")); + Assertions.assertFalse(filter.filter("com/navercorp/pinpoint/testweb/controller2/MyController")); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/ServerConfigTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/ServerConfigTest.java index 92170741efde..53c895f6e59c 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/ServerConfigTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/ServerConfigTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.bootstrap.config; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -36,7 +36,7 @@ public void isHidePinpointHeader() { ProfilerConfig profilerConfig = ProfilerConfigLoader.load(properties); ServerConfig serverConfig = new ServerConfig(profilerConfig); - Assert.assertFalse(serverConfig.isHidePinpointHeader(propertyName)); + Assertions.assertFalse(serverConfig.isHidePinpointHeader(propertyName)); } @Test @@ -49,7 +49,7 @@ public void isTraceRequestParam() { ProfilerConfig profilerConfig = ProfilerConfigLoader.load(properties); ServerConfig serverConfig = new ServerConfig(profilerConfig); - Assert.assertFalse(serverConfig.isTraceRequestParam(propertyName)); + Assertions.assertFalse(serverConfig.isTraceRequestParam(propertyName)); } @Test @@ -63,8 +63,8 @@ public void getExcludeUrlFilter() { ServerConfig serverConfig = new ServerConfig(profilerConfig); Filter filter = serverConfig.getExcludeUrlFilter(propertyName); - Assert.assertTrue(filter.filter("/healthcheck")); - Assert.assertFalse(filter.filter("/l7check")); + Assertions.assertTrue(filter.filter("/healthcheck")); + Assertions.assertFalse(filter.filter("/l7check")); } @Test @@ -77,7 +77,7 @@ public void getRealIpHeader() { ProfilerConfig profilerConfig = ProfilerConfigLoader.load(properties); ServerConfig serverConfig = new ServerConfig(profilerConfig); - Assert.assertEquals("X-Forwarded-For", serverConfig.getRealIpHeader(propertyName)); + Assertions.assertEquals("X-Forwarded-For", serverConfig.getRealIpHeader(propertyName)); } @Test @@ -90,7 +90,7 @@ public void getRealIpEmptyValue() { ProfilerConfig profilerConfig = ProfilerConfigLoader.load(properties); ServerConfig serverConfig = new ServerConfig(profilerConfig); - Assert.assertEquals("UNKNOWN", serverConfig.getRealIpEmptyValue(propertyName)); + Assertions.assertEquals("UNKNOWN", serverConfig.getRealIpEmptyValue(propertyName)); } @Test @@ -104,7 +104,7 @@ public void getExcludeMethodFilter() { ServerConfig serverConfig = new ServerConfig(profilerConfig); Filter filter = serverConfig.getExcludeMethodFilter(propertyName); - Assert.assertTrue(filter.filter("HEAD")); - Assert.assertFalse(filter.filter("POST")); + Assertions.assertTrue(filter.filter("HEAD")); + Assertions.assertFalse(filter.filter("POST")); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/TransportModuleTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/TransportModuleTest.java index db2976a03d9b..5458928e50d7 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/TransportModuleTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/TransportModuleTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.bootstrap.config; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -26,14 +26,14 @@ public class TransportModuleTest { @Test public void parse() { - Assert.assertEquals(TransportModule.parse("GRPC"), TransportModule.GRPC); - Assert.assertEquals(TransportModule.parse("THRIFT"), TransportModule.THRIFT); + Assertions.assertEquals(TransportModule.parse("GRPC"), TransportModule.GRPC); + Assertions.assertEquals(TransportModule.parse("THRIFT"), TransportModule.THRIFT); - Assert.assertNull(TransportModule.parse("ERROR")); + Assertions.assertNull(TransportModule.parse("ERROR")); } @Test public void parse1() { - Assert.assertEquals(TransportModule.parse("ERROR", TransportModule.GRPC), TransportModule.GRPC); + Assertions.assertEquals(TransportModule.parse("ERROR", TransportModule.GRPC), TransportModule.GRPC); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/util/ValueAnnotationProcessorTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/util/ValueAnnotationProcessorTest.java index 049123170dc0..8162b43e22a9 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/util/ValueAnnotationProcessorTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/util/ValueAnnotationProcessorTest.java @@ -1,8 +1,8 @@ package com.navercorp.pinpoint.bootstrap.config.util; import com.navercorp.pinpoint.bootstrap.config.Value; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -25,14 +25,14 @@ public void primitive() { ValueAnnotationProcessor reader = new ValueAnnotationProcessor(); reader.process(config, properties); - Assert.assertEquals(1, config.intValue); - Assert.assertEquals(2, config.longValue); - Assert.assertEquals(true, config.booleanValue); - Assert.assertEquals(3, config.doubleValue, 0); - Assert.assertEquals(4, config.flotValue, 0); - Assert.assertEquals(5, config.shortValue); - Assert.assertEquals(6, config.byteValue); - Assert.assertEquals('a', config.charValue); + Assertions.assertEquals(1, config.intValue); + Assertions.assertEquals(2, config.longValue); + Assertions.assertEquals(true, config.booleanValue); + Assertions.assertEquals(3, config.doubleValue, 0); + Assertions.assertEquals(4, config.flotValue, 0); + Assertions.assertEquals(5, config.shortValue); + Assertions.assertEquals(6, config.byteValue); + Assertions.assertEquals('a', config.charValue); } @@ -76,9 +76,9 @@ public void object() { ValueAnnotationProcessor processor = new ValueAnnotationProcessor(); processor.process(config, properties); - Assert.assertEquals(Integer.valueOf(1), config.integerValue); - Assert.assertEquals(Long.valueOf(2), config.longValue); - Assert.assertEquals("abc", config.stringValue); + Assertions.assertEquals(Integer.valueOf(1), config.integerValue); + Assertions.assertEquals(Long.valueOf(2), config.longValue); + Assertions.assertEquals("abc", config.stringValue); } public static class Config { @@ -112,7 +112,7 @@ public void test_enum() { ValueAnnotationProcessor reader = new ValueAnnotationProcessor(); reader.process(config, properties); - Assert.assertEquals(TYPE.B, config.test); + Assertions.assertEquals(TYPE.B, config.test); } @@ -130,8 +130,8 @@ public void prefix() { ValueAnnotationProcessor reader = new ValueAnnotationProcessor(); reader.process(config, properties); - Assert.assertEquals("p-A", config.a); - Assert.assertEquals("prefix-B", config.b); + Assertions.assertEquals("p-A", config.a); + Assertions.assertEquals("prefix-B", config.b); } public static class PrefixConfig { @@ -153,7 +153,7 @@ public void method() { ValueAnnotationProcessor reader = new ValueAnnotationProcessor(); reader.process(config, properties); - Assert.assertEquals("A", config.a); + Assertions.assertEquals("A", config.a); } public static class MethodConfig { @@ -184,8 +184,8 @@ public void defaultValue() { ValueAnnotationProcessor reader = new ValueAnnotationProcessor(); reader.process(config, properties); - Assert.assertEquals(-1, config.intValue); - Assert.assertEquals(-2, config.longValue); + Assertions.assertEquals(-1, config.intValue); + Assertions.assertEquals(-2, config.longValue); } diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/context/HeaderTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/context/HeaderTest.java index d111ff643032..2ece893611d5 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/context/HeaderTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/context/HeaderTest.java @@ -17,10 +17,10 @@ package com.navercorp.pinpoint.bootstrap.context; import com.navercorp.pinpoint.common.util.DelegateEnumeration; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Enumeration; import java.util.Hashtable; @@ -39,9 +39,9 @@ public void testToString() { @Test public void isHeaderKey() { - Assert.assertTrue(Header.startWithPinpointHeader(Header.HTTP_FLAGS.toString())); - Assert.assertFalse(Header.startWithPinpointHeader("Not_Exist")); - Assert.assertFalse(Header.startWithPinpointHeader(null)); + Assertions.assertTrue(Header.startWithPinpointHeader(Header.HTTP_FLAGS.toString())); + Assertions.assertFalse(Header.startWithPinpointHeader("Not_Exist")); + Assertions.assertFalse(Header.startWithPinpointHeader(null)); } @Test @@ -56,17 +56,17 @@ public void filteredHeaderNames() { int count = 0; while (enumeration.hasMoreElements()) { count++; - Assert.assertFalse(Header.startWithPinpointHeader((String) enumeration.nextElement())); + Assertions.assertFalse(Header.startWithPinpointHeader((String) enumeration.nextElement())); } - Assert.assertEquals(count, 2); + Assertions.assertEquals(count, 2); } @Test public void startWithPinpointHeader() { - Assert.assertTrue(Header.startWithPinpointHeader("Pinpoint-Unknown")); - Assert.assertTrue(Header.startWithPinpointHeader("pinpoint-unknown")); - Assert.assertFalse(Header.startWithPinpointHeader("unknown-pinpoint")); - Assert.assertFalse(Header.startWithPinpointHeader("unknown")); + Assertions.assertTrue(Header.startWithPinpointHeader("Pinpoint-Unknown")); + Assertions.assertTrue(Header.startWithPinpointHeader("pinpoint-unknown")); + Assertions.assertFalse(Header.startWithPinpointHeader("unknown-pinpoint")); + Assertions.assertFalse(Header.startWithPinpointHeader("unknown")); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/ClassFiltersTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/ClassFiltersTest.java index c89daf4d1fed..6783c888fbd4 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/ClassFiltersTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/ClassFiltersTest.java @@ -1,9 +1,11 @@ package com.navercorp.pinpoint.bootstrap.instrument; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import org.junit.jupiter.api.Test; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class ClassFiltersTest { @@ -22,7 +24,7 @@ public void name() { public void enclosingMethod() { InstrumentClass clazz = mock(InstrumentClass.class); when(clazz.hasEnclosingMethod("call", "int")).thenReturn(Boolean.TRUE); - + assertTrue(ClassFilters.enclosingMethod("call", "int").accept(clazz)); assertFalse(ClassFilters.enclosingMethod("invalid", "int").accept(clazz)); } @@ -30,7 +32,7 @@ public void enclosingMethod() { @Test public void interfaze() { InstrumentClass clazz = mock(InstrumentClass.class); - when(clazz.getInterfaces()).thenReturn(new String[] { "java.util.concurrent.Callable" }); + when(clazz.getInterfaces()).thenReturn(new String[]{"java.util.concurrent.Callable"}); assertTrue(ClassFilters.interfaze("java.util.concurrent.Callable").accept(clazz)); assertFalse(ClassFilters.interfaze("java.lang.Runnable").accept(clazz)); @@ -40,7 +42,7 @@ public void interfaze() { public void chain() { InstrumentClass clazz = mock(InstrumentClass.class); when(clazz.hasEnclosingMethod("call", "int")).thenReturn(Boolean.TRUE); - when(clazz.getInterfaces()).thenReturn(new String[] { "java.util.concurrent.Callable" }); + when(clazz.getInterfaces()).thenReturn(new String[]{"java.util.concurrent.Callable"}); assertTrue(ClassFilters.chain(ClassFilters.enclosingMethod("call", "int"), ClassFilters.interfaze("java.util.concurrent.Callable")).accept(clazz)); assertFalse(ClassFilters.chain(ClassFilters.enclosingMethod("invalid", "int"), ClassFilters.interfaze("java.lang.Runnable")).accept(clazz)); diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/MethodFiltersTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/MethodFiltersTest.java index 89067fdd69af..d4880469b9d8 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/MethodFiltersTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/MethodFiltersTest.java @@ -1,11 +1,13 @@ package com.navercorp.pinpoint.bootstrap.instrument; -import java.lang.reflect.Modifier; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; +import java.lang.reflect.Modifier; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class MethodFiltersTest { @@ -13,20 +15,20 @@ public class MethodFiltersTest { public void name() { InstrumentMethod method = mock(InstrumentMethod.class); when(method.getName()).thenReturn("call"); - + assertTrue(MethodFilters.name("call").accept(method)); assertFalse(MethodFilters.name("execute").accept(method)); assertFalse(MethodFilters.name().accept(method)); assertFalse(MethodFilters.name((String[]) null).accept(method)); assertFalse(MethodFilters.name(null, null).accept(method)); } - + @Test public void modifier() { InstrumentMethod method = mock(InstrumentMethod.class); // modifier is public abstract. when(method.getModifiers()).thenReturn(1025); - + assertTrue(MethodFilters.modifier(Modifier.PUBLIC).accept(method)); assertTrue(MethodFilters.modifier(Modifier.ABSTRACT).accept(method)); assertFalse(MethodFilters.modifier(Modifier.FINAL).accept(method)); diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultClassBasedMatcherTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultClassBasedMatcherTest.java index fac1a8c94fec..dab5ef358bd7 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultClassBasedMatcherTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultClassBasedMatcherTest.java @@ -19,9 +19,11 @@ import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.InterfaceInternalNameMatcherOperand; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.MatcherOperand; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operator.AndMatcherOperator; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim @@ -53,10 +55,12 @@ public void getMatcherOperandWithClassNameAndAdditional() { assertTrue(operator.getRightOperand() instanceof InterfaceInternalNameMatcherOperand); } - @Test(expected = NullPointerException.class) + @Test public void getMatcherOperandWithClassNameIsNull() { - final String className = null; - DefaultClassBasedMatcher matcher = new DefaultClassBasedMatcher(null); + Assertions.assertThrows(NullPointerException.class, () -> { + final String className = null; + DefaultClassBasedMatcher matcher = new DefaultClassBasedMatcher(null); + }); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultMultiClassBasedMatcherTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultMultiClassBasedMatcherTest.java index ba003f0247cd..6b51fe2978b3 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultMultiClassBasedMatcherTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultMultiClassBasedMatcherTest.java @@ -20,11 +20,12 @@ import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.MatcherOperand; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operator.AndMatcherOperator; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operator.OrMatcherOperator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim @@ -70,5 +71,4 @@ public void getMatcherOperandWithMultiClassNameAndAdditional() { } - } \ No newline at end of file diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultMultiPackageBasedMatcherTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultMultiPackageBasedMatcherTest.java index 2430dcd9075c..4f3849b6ad90 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultMultiPackageBasedMatcherTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultMultiPackageBasedMatcherTest.java @@ -18,11 +18,12 @@ import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.MatcherOperand; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.PackageInternalNameMatcherOperand; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operator.OrMatcherOperator; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultPackageBasedMatcherTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultPackageBasedMatcherTest.java index cf29940724f1..cda87910929f 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultPackageBasedMatcherTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/DefaultPackageBasedMatcherTest.java @@ -19,9 +19,11 @@ import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.MatcherOperand; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.PackageInternalNameMatcherOperand; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operator.AndMatcherOperator; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim @@ -63,14 +65,18 @@ public void getMatcherOperandWithPackageNameAndAdditionalIsNull() { assertEquals("java/lang", annotationInternalNameMatcherOperand.getPackageInternalName()); } - @Test(expected = NullPointerException.class) + @Test public void getMatcherOperandWithPackageNameIsNull() { - final String packageName = null; - PackageBasedMatcher matcher = new DefaultPackageBasedMatcher(packageName); + Assertions.assertThrows(NullPointerException.class, () -> { + final String packageName = null; + PackageBasedMatcher matcher = new DefaultPackageBasedMatcher(packageName); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void getMatcherOperandWithPackageNameIsEmpty() { - PackageBasedMatcher matcher = new DefaultPackageBasedMatcher(""); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + PackageBasedMatcher matcher = new DefaultPackageBasedMatcher(""); + }); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/AbstractMatcherOperandTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/AbstractMatcherOperandTest.java index 3890ba73be83..a2115c6e6539 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/AbstractMatcherOperandTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/AbstractMatcherOperandTest.java @@ -18,9 +18,9 @@ import com.navercorp.pinpoint.bootstrap.instrument.matcher.operator.AndMatcherOperator; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operator.NotMatcherOperator; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operator.OrMatcherOperator; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/AnnotationInternalNameMatcherOperandTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/AnnotationInternalNameMatcherOperandTest.java index fe435304cdaa..aff27a1aaf9e 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/AnnotationInternalNameMatcherOperandTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/AnnotationInternalNameMatcherOperandTest.java @@ -15,9 +15,11 @@ */ package com.navercorp.pinpoint.bootstrap.instrument.matcher.operand; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/ClassInternalNameMatcherOperandTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/ClassInternalNameMatcherOperandTest.java index d08773f5aea6..59cfc3bab82b 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/ClassInternalNameMatcherOperandTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/ClassInternalNameMatcherOperandTest.java @@ -15,9 +15,11 @@ */ package com.navercorp.pinpoint.bootstrap.instrument.matcher.operand; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/InterfaceInternalNameMatcherOperandTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/InterfaceInternalNameMatcherOperandTest.java index c8f3233028f4..1aa79981a21e 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/InterfaceInternalNameMatcherOperandTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/InterfaceInternalNameMatcherOperandTest.java @@ -16,9 +16,11 @@ package com.navercorp.pinpoint.bootstrap.instrument.matcher.operand; import com.navercorp.pinpoint.common.util.ClassUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/PackageInternalNameMatcherOperandTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/PackageInternalNameMatcherOperandTest.java index e6476c3c907d..46b48b64db45 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/PackageInternalNameMatcherOperandTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/PackageInternalNameMatcherOperandTest.java @@ -16,8 +16,11 @@ package com.navercorp.pinpoint.bootstrap.instrument.matcher.operand; -import org.junit.Test; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim @@ -41,8 +44,10 @@ public void packageNameisEmpty() { assertTrue(operand.match("org")); } - @Test(expected = NullPointerException.class) + @Test public void packageNameisNull() { - PackageInternalNameMatcherOperand operand = new PackageInternalNameMatcherOperand(null); + Assertions.assertThrows(NullPointerException.class, () -> { + PackageInternalNameMatcherOperand operand = new PackageInternalNameMatcherOperand(null); + }); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/SuperClassInternalNameMatcherOperandTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/SuperClassInternalNameMatcherOperandTest.java index f0a13791a4b3..2cdc7aaa0cd5 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/SuperClassInternalNameMatcherOperandTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operand/SuperClassInternalNameMatcherOperandTest.java @@ -15,9 +15,11 @@ */ package com.navercorp.pinpoint.bootstrap.instrument.matcher.operand; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operator/AndMatcherOperatorTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operator/AndMatcherOperatorTest.java index 6a8af94e2daf..f8e6fbec854f 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operator/AndMatcherOperatorTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operator/AndMatcherOperatorTest.java @@ -17,9 +17,11 @@ import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.ClassInternalNameMatcherOperand; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.InterfaceInternalNameMatcherOperand; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operator/BracketMatcherOperatorTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operator/BracketMatcherOperatorTest.java index eaf071dd9367..a57a3fd2ed04 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operator/BracketMatcherOperatorTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operator/BracketMatcherOperatorTest.java @@ -15,9 +15,12 @@ */ package com.navercorp.pinpoint.bootstrap.instrument.matcher.operator; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operator/NotMatcherOperatorTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operator/NotMatcherOperatorTest.java index 278909983328..0bab3b8643c7 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operator/NotMatcherOperatorTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operator/NotMatcherOperatorTest.java @@ -16,9 +16,11 @@ package com.navercorp.pinpoint.bootstrap.instrument.matcher.operator; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.InterfaceInternalNameMatcherOperand; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operator/OrMatcherOperatorTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operator/OrMatcherOperatorTest.java index 5411da9bebb5..365e4c9e9475 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operator/OrMatcherOperatorTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/matcher/operator/OrMatcherOperatorTest.java @@ -17,9 +17,12 @@ import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.ClassInternalNameMatcherOperand; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.InterfaceInternalNameMatcherOperand; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/transformer/ParameterUtilsTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/transformer/ParameterUtilsTest.java index 1b0e983ace97..bedad5b1d65a 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/transformer/ParameterUtilsTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/transformer/ParameterUtilsTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.bootstrap.instrument.transformer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Date; @@ -38,14 +38,16 @@ public void checkSupportType() { ParameterUtils.checkParameterType(new Class[]{Integer.class}); } - @Test(expected = IllegalArgumentException.class) + @Test public void checkSupportType_fail() { - ParameterUtils.checkParameterType(new Class[]{Date.class}); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + ParameterUtils.checkParameterType(new Class[]{Date.class}); + }); } @Test public void getComponentType() { - Assert.assertEquals(ParameterUtils.getRawComponentType(int[][].class), int.class); + Assertions.assertEquals(ParameterUtils.getRawComponentType(int[][].class), int.class); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/transformer/TransformCallbackCheckerTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/transformer/TransformCallbackCheckerTest.java index a1f25c7b26de..a3a9ab6053de 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/transformer/TransformCallbackCheckerTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/instrument/transformer/TransformCallbackCheckerTest.java @@ -20,11 +20,11 @@ import com.navercorp.pinpoint.bootstrap.instrument.Instrumentor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.mock.PrivateConstructor; import com.navercorp.pinpoint.bootstrap.instrument.transformer.mock.PublicConstructor; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.security.ProtectionDomain; - /** * @author Woonduk Kang(emeroad) */ @@ -35,9 +35,11 @@ public void validate() { TransformCallbackChecker.validate(PublicConstructor.class); } - @Test(expected = RuntimeException.class) + @Test public void validate_private() { - TransformCallbackChecker.validate(PrivateConstructor.class); + Assertions.assertThrows(RuntimeException.class, () -> { + TransformCallbackChecker.validate(PrivateConstructor.class); + }); } @Test @@ -46,14 +48,18 @@ public void validate_inner_static() { } - @Test(expected = RuntimeException.class) + @Test public void validate_inner_non_static() { - TransformCallbackChecker.validate(NotStatic.class); + Assertions.assertThrows(RuntimeException.class, () -> { + TransformCallbackChecker.validate(NotStatic.class); + }); } - @Test(expected = RuntimeException.class) + @Test public void validate_inner_no_constructor() { - TransformCallbackChecker.validate(NoConstructor.class); + Assertions.assertThrows(RuntimeException.class, () -> { + TransformCallbackChecker.validate(NoConstructor.class); + }); } @@ -84,27 +90,31 @@ public byte[] doInTransform(Instrumentor instrumentor, ClassLoader classLoader, } - @Test(expected = RuntimeException.class) + @Test public void transform_local_inner() { - class LocalInner implements TransformCallback { + Assertions.assertThrows(RuntimeException.class, () -> { + class LocalInner implements TransformCallback { - @Override - public byte[] doInTransform(Instrumentor instrumentor, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { - return null; + @Override + public byte[] doInTransform(Instrumentor instrumentor, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + return null; + } } - } - TransformCallbackChecker.validate(LocalInner.class); + TransformCallbackChecker.validate(LocalInner.class); + }); } - @Test(expected = RuntimeException.class) + @Test public void transform_anonymous_inner_class() { - TransformCallback anonymousCallback = new TransformCallback() { - - @Override - public byte[] doInTransform(Instrumentor instrumentor, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { - return null; - } - }; - TransformCallbackChecker.validate(anonymousCallback.getClass()); + Assertions.assertThrows(RuntimeException.class, () -> { + TransformCallback anonymousCallback = new TransformCallback() { + + @Override + public byte[] doInTransform(Instrumentor instrumentor, ClassLoader classLoader, String className, Class classBeingRedefined, ProtectionDomain protectionDomain, byte[] classfileBuffer) throws InstrumentException { + return null; + } + }; + TransformCallbackChecker.validate(anonymousCallback.getClass()); + }); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/AsyncContextSpanEventSimpleAroundInterceptorTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/AsyncContextSpanEventSimpleAroundInterceptorTest.java index 5625d839ce89..95c38747e7bd 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/AsyncContextSpanEventSimpleAroundInterceptorTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/AsyncContextSpanEventSimpleAroundInterceptorTest.java @@ -23,19 +23,24 @@ import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.common.trace.ServiceType; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.CALLS_REAL_METHODS; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.mockito.Mockito.withSettings; /** * @author Woonduk Kang(emeroad) */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class AsyncContextSpanEventSimpleAroundInterceptorTest { @Mock @@ -54,7 +59,7 @@ public class AsyncContextSpanEventSimpleAroundInterceptorTest { @Mock private AsyncContext asyncContext; - @Before + @BeforeEach public void setUp() { } @@ -95,8 +100,8 @@ public void nestedAsyncTraceCreate() { } protected AroundInterceptor mockSpanAsyncEventSimpleInterceptor(TraceContext traceContext, MethodDescriptor methodDescriptor) { - return Mockito.mock(AsyncContextSpanEventSimpleAroundInterceptor.class, withSettings() - .useConstructor(traceContext, methodDescriptor).defaultAnswer(CALLS_REAL_METHODS)); + return Mockito.mock(AsyncContextSpanEventSimpleAroundInterceptor.class, withSettings() + .useConstructor(traceContext, methodDescriptor).defaultAnswer(CALLS_REAL_METHODS)); } diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/AtomicMaxUpdaterTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/AtomicMaxUpdaterTest.java index de066acdbc72..ea1ed81a7f7d 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/AtomicMaxUpdaterTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/AtomicMaxUpdaterTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.bootstrap.interceptor; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -27,15 +27,15 @@ public class AtomicMaxUpdaterTest { public void update() { AtomicMaxUpdater updater = new AtomicMaxUpdater(); - Assert.assertFalse(updater.update(0)); + Assertions.assertFalse(updater.update(0)); - Assert.assertTrue(updater.update(1)); + Assertions.assertTrue(updater.update(1)); - Assert.assertTrue(updater.update(10)); + Assertions.assertTrue(updater.update(10)); - Assert.assertFalse(updater.update(5)); - Assert.assertEquals(updater.getIndex(), 10); + Assertions.assertFalse(updater.update(5)); + Assertions.assertEquals(updater.getIndex(), 10); } diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/DefaultInterceptorRegistryAdaptorTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/DefaultInterceptorRegistryAdaptorTest.java index 4191dfa1f245..6644b952b02a 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/DefaultInterceptorRegistryAdaptorTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/DefaultInterceptorRegistryAdaptorTest.java @@ -1,12 +1,11 @@ package com.navercorp.pinpoint.bootstrap.interceptor; -import static org.mockito.Mockito.*; - -import org.junit.Assert; -import org.junit.Test; - import com.navercorp.pinpoint.bootstrap.interceptor.registry.DefaultInterceptorRegistryAdaptor; import com.navercorp.pinpoint.bootstrap.interceptor.registry.InterceptorRegistryAdaptor; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import static org.mockito.Mockito.mock; public class DefaultInterceptorRegistryAdaptorTest { @@ -15,7 +14,7 @@ public void indexSize_0() { try { new DefaultInterceptorRegistryAdaptor(-1); - Assert.fail(); + Assertions.fail(); } catch (IllegalArgumentException ignored) { } @@ -27,7 +26,7 @@ public void indexSize_1() { InterceptorRegistryAdaptor interceptorRegistry = new DefaultInterceptorRegistryAdaptor(0); StaticAroundInterceptor mock = mock(StaticAroundInterceptor.class); interceptorRegistry.addInterceptor(mock); - Assert.fail(); + Assertions.fail(); } catch (IndexOutOfBoundsException ignored) { } } @@ -38,30 +37,30 @@ public void indexSize_2() { interceptorRegistry.addInterceptor(mock(StaticAroundInterceptor.class)); try { interceptorRegistry.addInterceptor(mock(StaticAroundInterceptor.class)); - Assert.fail(); + Assertions.fail(); } catch (IndexOutOfBoundsException ignored) { } } @Test - public void addStaticInterceptor() { + public void addStaticInterceptor() { StaticAroundInterceptor mock = mock(StaticAroundInterceptor.class); InterceptorRegistryAdaptor registry = new DefaultInterceptorRegistryAdaptor(); int key = registry.addInterceptor(mock); Interceptor find = registry.getInterceptor(key); - Assert.assertSame(mock, find); + Assertions.assertSame(mock, find); } @Test - public void addSimpleInterceptor() { + public void addSimpleInterceptor() { AroundInterceptor mock = mock(AroundInterceptor.class); InterceptorRegistryAdaptor registry = new DefaultInterceptorRegistryAdaptor(); int key = registry.addInterceptor(mock); Interceptor find = registry.getInterceptor(key); - Assert.assertSame(mock, find); + Assertions.assertSame(mock, find); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/DefaultLockerTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/DefaultLockerTest.java index 570dbb33d4d0..342b46fe75f0 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/DefaultLockerTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/DefaultLockerTest.java @@ -1,37 +1,36 @@ package com.navercorp.pinpoint.bootstrap.interceptor; -import org.junit.Assert; -import org.junit.Test; - import com.navercorp.pinpoint.bootstrap.interceptor.registry.DefaultLocker; import com.navercorp.pinpoint.bootstrap.interceptor.registry.Locker; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class DefaultLockerTest { @Test public void testLock_Null0() { Locker locker = new DefaultLocker(); - Assert.assertTrue(locker.lock(null)); - Assert.assertTrue(locker.lock(null)); + Assertions.assertTrue(locker.lock(null)); + Assertions.assertTrue(locker.lock(null)); } @Test public void testLock_Null1() { Locker locker = new DefaultLocker(); - Assert.assertTrue(locker.lock(null)); + Assertions.assertTrue(locker.lock(null)); String one = "1"; - Assert.assertTrue(locker.lock(one)); - Assert.assertFalse(locker.lock("2")); + Assertions.assertTrue(locker.lock(one)); + Assertions.assertFalse(locker.lock("2")); - Assert.assertFalse(locker.lock(null)); + Assertions.assertFalse(locker.lock(null)); - Assert.assertFalse(locker.unlock(null)); + Assertions.assertFalse(locker.unlock(null)); @SuppressWarnings("all") String s = new String("1"); - Assert.assertFalse(locker.unlock(s)); + Assertions.assertFalse(locker.unlock(s)); - Assert.assertTrue(locker.unlock(one)); + Assertions.assertTrue(locker.unlock(one)); } diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/InterceptorRegistryTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/InterceptorRegistryTest.java index e6f949b83a6a..d9521c496d0b 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/InterceptorRegistryTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/InterceptorRegistryTest.java @@ -16,28 +16,28 @@ package com.navercorp.pinpoint.bootstrap.interceptor; -import static org.mockito.Mockito.*; - -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - import com.navercorp.pinpoint.bootstrap.interceptor.registry.InterceptorRegistry; import com.navercorp.pinpoint.bootstrap.interceptor.registry.InterceptorRegistryAdaptor; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class InterceptorRegistryTest { private InterceptorRegistryAdaptor registryAdaptor; - @Before + @BeforeEach public void setUp() throws Exception { registryAdaptor = mock(InterceptorRegistryAdaptor.class); InterceptorRegistry.bind(registryAdaptor, null); } - @After + @AfterEach public void tearDown() throws Exception { InterceptorRegistry.unbind(null); } @@ -51,7 +51,7 @@ public void testSimpleInterceptor() { int findId = registryAdaptor.addInterceptor(simpleAroundInterceptor); Interceptor find = InterceptorRegistry.getInterceptor(findId); - Assert.assertSame(find, simpleAroundInterceptor); + Assertions.assertSame(find, simpleAroundInterceptor); } @@ -63,7 +63,7 @@ public void testStaticInterceptor() { int findId = registryAdaptor.addInterceptor(staticAroundInterceptor); Interceptor find = InterceptorRegistry.getInterceptor(findId); - Assert.assertSame(find, staticAroundInterceptor); + Assertions.assertSame(find, staticAroundInterceptor); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanSimpleAroundInterceptorTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanSimpleAroundInterceptorTest.java index f15e654ea978..5d0136c48041 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanSimpleAroundInterceptorTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanSimpleAroundInterceptorTest.java @@ -16,19 +16,18 @@ package com.navercorp.pinpoint.bootstrap.interceptor; -import static org.mockito.Mockito.*; - -import org.junit.Assert; -import org.junit.Test; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; - import com.navercorp.pinpoint.bootstrap.context.SpanRecorder; import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; public class SpanSimpleAroundInterceptorTest { @@ -147,31 +146,30 @@ public void traceCreateFail() { private void checkSpanInterceptor(TraceContext context, TestSpanSimpleAroundInterceptor interceptor) { Trace createTrace = interceptor.createTrace(null, null); interceptor.before(new Object(), null); - Assert.assertEquals("beforeTouchCount", interceptor.getBeforeTouchCount(), 1); + Assertions.assertEquals(interceptor.getBeforeTouchCount(), 1, "beforeTouchCount"); Trace before = context.currentRawTraceObject(); - Assert.assertEquals(createTrace, before); + Assertions.assertEquals(createTrace, before); interceptor.after(new Object(), null, null, null); - Assert.assertEquals("afterTouchCount", interceptor.getAfterTouchCount(), 1); + Assertions.assertEquals(interceptor.getAfterTouchCount(), 1, "afterTouchCount"); Trace after = context.currentRawTraceObject(); - Assert.assertNull(after); + Assertions.assertNull(after); } private void checkTraceCreateFailInterceptor(TraceContext context, TestSpanSimpleAroundInterceptor interceptor) { Trace createTrace = interceptor.createTrace(null, null); - Assert.assertNull(createTrace); + Assertions.assertNull(createTrace); interceptor.before(new Object(), null); - Assert.assertEquals(interceptor.getBeforeTouchCount(), 0); - Assert.assertNull(context.currentRawTraceObject()); + Assertions.assertEquals(interceptor.getBeforeTouchCount(), 0); + Assertions.assertNull(context.currentRawTraceObject()); interceptor.after(new Object(), null, null, null); - Assert.assertEquals(interceptor.getAfterTouchCount(), 0); - Assert.assertNull(context.currentRawTraceObject()); + Assertions.assertEquals(interceptor.getAfterTouchCount(), 0); + Assertions.assertNull(context.currentRawTraceObject()); } - @Test public void testCreateTrace() { diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/WeakAtomicReferenceArrayTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/WeakAtomicReferenceArrayTest.java index fb3b1ae0503c..a21bc934f28c 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/WeakAtomicReferenceArrayTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/WeakAtomicReferenceArrayTest.java @@ -16,15 +16,14 @@ package com.navercorp.pinpoint.bootstrap.interceptor; -import org.junit.Assert; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; - import com.navercorp.pinpoint.bootstrap.interceptor.registry.WeakAtomicReferenceArray; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; @@ -38,7 +37,7 @@ /** * raceCondition generate fail.~~~~ hmm */ -@Ignore +@Disabled public class WeakAtomicReferenceArrayTest { private final Logger logger = LogManager.getLogger(this.getClass()); @@ -57,7 +56,7 @@ public class WeakAtomicReferenceArrayTest { private final AtomicInteger failCounter = new AtomicInteger(); - @Before + @BeforeEach public void setUp() throws Exception { writer = (ThreadPoolExecutor) Executors.newFixedThreadPool(writerThreadSize); reader = (ThreadPoolExecutor) Executors.newFixedThreadPool(readThreadSize); @@ -69,7 +68,7 @@ public void setUp() throws Exception { } - @After + @AfterEach public void tearDown() throws Exception { writer.shutdownNow(); reader.shutdownNow(); @@ -96,7 +95,7 @@ private class AtomicReferenceTest { private final AtomicInteger nextId = new AtomicInteger(0); private final AtomicMaxUpdater maxIndex = new AtomicMaxUpdater(); -// private final ConcurrentLinkedQueue updateIndex = new ConcurrentLinkedQueue<>(); + // private final ConcurrentLinkedQueue updateIndex = new ConcurrentLinkedQueue<>(); private final WeakAtomicReferenceArray ref; private final AtomicInteger afterLast = new AtomicInteger(-1); private final AtomicReference lastChangeValue = new AtomicReference<>(); @@ -149,7 +148,7 @@ public boolean get(final int findIndex) { public boolean checkChangeId() { ChangedValue changedValue = lastChangeValue.get(); - if (changedValue == null){ + if (changedValue == null) { return true; } Integer findResult = ref.get(changedValue.index); @@ -181,7 +180,6 @@ private boolean checkInteger(int findIndex, Integer findResult) { // } - public boolean randomGet() { if (writerThreadSize != 1) { return true; @@ -213,39 +211,38 @@ private int getMaxIndex() { @Test public void testLastGet() { AtomicReferenceTest mock = new AtomicReferenceTest(); - Assert.assertTrue(mock.lastGet()); + Assertions.assertTrue(mock.lastGet()); mock.nextId(); - Assert.assertTrue(mock.lastGet()); + Assertions.assertTrue(mock.lastGet()); for (int i = 0; i < 10; i++) { - Assert.assertTrue(mock.lastGet()); + Assertions.assertTrue(mock.lastGet()); } } @Test public void testRandomGet() { AtomicReferenceTest mock = new AtomicReferenceTest(); - Assert.assertTrue(mock.randomGet()); + Assertions.assertTrue(mock.randomGet()); mock.nextId(); mock.nextId(); mock.nextId(); - Assert.assertTrue(mock.randomGet()); + Assertions.assertTrue(mock.randomGet()); for (int i = 0; i < 10; i++) { - Assert.assertTrue(mock.randomGet()); + Assertions.assertTrue(mock.randomGet()); } } - @Test public void testTestMock3() { AtomicReferenceTest mock = new AtomicReferenceTest(); mock.nextId(); mock.nextId(); mock.nextId(); - Assert.assertTrue(mock.randomGet()); + Assertions.assertTrue(mock.randomGet()); for (int i = 0; i < 100; i++) { - Assert.assertTrue(mock.randomGet()); + Assertions.assertTrue(mock.randomGet()); } } @@ -257,7 +254,7 @@ public void test() throws Exception { @Override public void run() { logger.debug("WriteJob-start"); - int i =0; + int i = 0; while (start.get()) { AtomicReferenceTest referenceTest = getTestMock(); @@ -317,7 +314,7 @@ public void run() { } start.set(false); Thread.sleep(1000); - Assert.assertEquals("raceCondition test", failCounter.get(), 0); + Assertions.assertEquals(failCounter.get(), 0, "raceCondition test"); writer.shutdown(); reader.shutdown(); diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/http/HttpStatusCodeRecorderTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/http/HttpStatusCodeRecorderTest.java index 0aa7975bf861..e47dd3c942e2 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/http/HttpStatusCodeRecorderTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/http/HttpStatusCodeRecorderTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.bootstrap.config.HttpStatusCodeErrors; import com.navercorp.pinpoint.bootstrap.context.SpanRecorder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/PreparedStatementBindingMethodFilterTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/PreparedStatementBindingMethodFilterTest.java index 29153a54a2dc..e380bce7a8fb 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/PreparedStatementBindingMethodFilterTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/PreparedStatementBindingMethodFilterTest.java @@ -1,8 +1,8 @@ package com.navercorp.pinpoint.bootstrap.plugin.jdbc; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -15,9 +15,9 @@ public void test_array_parameter() { InstrumentMethod byteMethod = mock(InstrumentMethod.class); // setBytes(int parameterIndex, byte x[]) when(byteMethod.getName()).thenReturn("setBytes"); - when(byteMethod.getParameterTypes()).thenReturn(new String[] {"int", "byte[]"}); + when(byteMethod.getParameterTypes()).thenReturn(new String[]{"int", "byte[]"}); - Assert.assertTrue(filter.accept(byteMethod)); + Assertions.assertTrue(filter.accept(byteMethod)); } diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/PreparedStatementUtilsTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/PreparedStatementUtilsTest.java index 68423f6babe7..394e9d7cab08 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/PreparedStatementUtilsTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/PreparedStatementUtilsTest.java @@ -16,15 +16,14 @@ package com.navercorp.pinpoint.bootstrap.plugin.jdbc; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + import java.lang.reflect.Method; import java.util.List; -import org.junit.Assert; -import org.junit.Test; - -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; - /** * @author emeroad */ @@ -42,9 +41,9 @@ public void testBindSetMethod() { @Test public void testMatch() { - Assert.assertTrue(PreparedStatementUtils.isSetter("setNCString")); - Assert.assertTrue(PreparedStatementUtils.isSetter("setInt")); - Assert.assertTrue(PreparedStatementUtils.isSetter("setTestTeTst")); + Assertions.assertTrue(PreparedStatementUtils.isSetter("setNCString")); + Assertions.assertTrue(PreparedStatementUtils.isSetter("setInt")); + Assertions.assertTrue(PreparedStatementUtils.isSetter("setTestTeTst")); } } diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/ReflectionUtilsTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/ReflectionUtilsTest.java index b0a3e4e498c4..c4790c041173 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/ReflectionUtilsTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/ReflectionUtilsTest.java @@ -1,28 +1,28 @@ package com.navercorp.pinpoint.bootstrap.plugin.jdbc; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class ReflectionUtilsTest { @Test public void test_getParameterTypeName() { String parameterTypeName = ReflectionUtils.getParameterTypeName(int.class); - Assert.assertEquals("int", parameterTypeName); + Assertions.assertEquals("int", parameterTypeName); } @Test public void test_getParameterTypeName1() { int[] v = new int[0]; String parameterTypeName = ReflectionUtils.getParameterTypeName(v.getClass()); - Assert.assertEquals("int[]", parameterTypeName); + Assertions.assertEquals("int[]", parameterTypeName); } @Test public void test_getParameterTypeName2() { int[][] v = new int[0][0]; String parameterTypeName = ReflectionUtils.getParameterTypeName(v.getClass()); - Assert.assertEquals("int[][]", parameterTypeName); + Assertions.assertEquals("int[][]", parameterTypeName); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/DriverConnectInterceptorTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/DriverConnectInterceptorTest.java index b300b42e9608..df3499996034 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/DriverConnectInterceptorTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/jdbc/interceptor/DriverConnectInterceptorTest.java @@ -22,7 +22,7 @@ import com.navercorp.pinpoint.bootstrap.plugin.jdbc.DatabaseInfoAccessor; import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcUrlParser; import com.navercorp.pinpoint.bootstrap.plugin.jdbc.UnKnownDatabaseInfo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.sql.Driver; import java.sql.SQLException; diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/CoreSubscriberConstructorInterceptorTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/CoreSubscriberConstructorInterceptorTest.java index 6d79f2c99989..6f66fd7f115e 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/CoreSubscriberConstructorInterceptorTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/CoreSubscriberConstructorInterceptorTest.java @@ -17,9 +17,11 @@ package com.navercorp.pinpoint.bootstrap.plugin.reactor; import com.navercorp.pinpoint.bootstrap.context.AsyncContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; public class CoreSubscriberConstructorInterceptorTest { diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoConstructorInterceptorTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoConstructorInterceptorTest.java index 232061c0b0a1..3771d7c41e82 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoConstructorInterceptorTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoConstructorInterceptorTest.java @@ -17,9 +17,11 @@ package com.navercorp.pinpoint.bootstrap.plugin.reactor; import com.navercorp.pinpoint.bootstrap.context.AsyncContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; public class FluxAndMonoConstructorInterceptorTest { diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoOperatorConstructorInterceptorTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoOperatorConstructorInterceptorTest.java index b4b5ab20951b..cf09e4b285fa 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoOperatorConstructorInterceptorTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoOperatorConstructorInterceptorTest.java @@ -17,9 +17,11 @@ package com.navercorp.pinpoint.bootstrap.plugin.reactor; import com.navercorp.pinpoint.bootstrap.context.AsyncContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; public class FluxAndMonoOperatorConstructorInterceptorTest { diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoOperatorSubscribeInterceptorTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoOperatorSubscribeInterceptorTest.java index 24e192401e06..53f50ff5a31f 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoOperatorSubscribeInterceptorTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoOperatorSubscribeInterceptorTest.java @@ -20,9 +20,11 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.common.trace.ServiceType; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; public class FluxAndMonoOperatorSubscribeInterceptorTest { diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoSubscribeInterceptorTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoSubscribeInterceptorTest.java index 2d9e52ab0339..e03f6b6ec3c9 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoSubscribeInterceptorTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoSubscribeInterceptorTest.java @@ -20,9 +20,11 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.common.trace.ServiceType; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; public class FluxAndMonoSubscribeInterceptorTest { diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoSubscribeOrReturnInterceptorTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoSubscribeOrReturnInterceptorTest.java index 11382fe9c166..e7a738b1aa14 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoSubscribeOrReturnInterceptorTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/FluxAndMonoSubscribeOrReturnInterceptorTest.java @@ -17,9 +17,11 @@ package com.navercorp.pinpoint.bootstrap.plugin.reactor; import com.navercorp.pinpoint.bootstrap.context.AsyncContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; public class FluxAndMonoSubscribeOrReturnInterceptorTest { diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/ReactorContextAccessorUtilsTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/ReactorContextAccessorUtilsTest.java index 63ed52bf707e..13f993a165c2 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/ReactorContextAccessorUtilsTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/reactor/ReactorContextAccessorUtilsTest.java @@ -17,8 +17,8 @@ package com.navercorp.pinpoint.bootstrap.plugin.reactor; import com.navercorp.pinpoint.bootstrap.context.AsyncContext; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -34,7 +34,7 @@ public void getAsyncContext() { Object[] args = {accessorMock}; AsyncContext asyncContext = ReactorContextAccessorUtils.getAsyncContext(args, 0); - Assert.assertNotNull(asyncContext); + Assertions.assertNotNull(asyncContext); } @Test @@ -42,7 +42,7 @@ public void getAsyncContext_null() { Object[] args = null; AsyncContext asyncContext = ReactorContextAccessorUtils.getAsyncContext(args, 0); - Assert.assertNull(asyncContext); + Assertions.assertNull(asyncContext); } @Test @@ -50,7 +50,7 @@ public void getAsyncContext_invalid_type() { Object[] args = {"Str"}; AsyncContext asyncContext = ReactorContextAccessorUtils.getAsyncContext(args, 0); - Assert.assertNull(asyncContext); + Assertions.assertNull(asyncContext); } @Test @@ -61,10 +61,10 @@ public void getAsyncContext_OOB() { Object[] args = {}; AsyncContext asyncContext0 = ReactorContextAccessorUtils.getAsyncContext(args, 0); - Assert.assertNull(asyncContext0); + Assertions.assertNull(asyncContext0); AsyncContext asyncContext1 = ReactorContextAccessorUtils.getAsyncContext(args, 1); - Assert.assertNull(asyncContext1); + Assertions.assertNull(asyncContext1); } @Test @@ -75,28 +75,28 @@ public void findAsyncContext() { Object[] args = {"foo", "bar", accessorMock}; AsyncContext asyncContext = ReactorContextAccessorUtils.findAsyncContext(args, 0); - Assert.assertNotNull(asyncContext); + Assertions.assertNotNull(asyncContext); asyncContext = ReactorContextAccessorUtils.findAsyncContext(args, 1); - Assert.assertNotNull(asyncContext); + Assertions.assertNotNull(asyncContext); asyncContext = ReactorContextAccessorUtils.findAsyncContext(args, 2); - Assert.assertNotNull(asyncContext); + Assertions.assertNotNull(asyncContext); asyncContext = ReactorContextAccessorUtils.findAsyncContext(args, 3); - Assert.assertNull(asyncContext); + Assertions.assertNull(asyncContext); asyncContext = ReactorContextAccessorUtils.findAsyncContext(args, 0, 2); - Assert.assertNotNull(asyncContext); + Assertions.assertNotNull(asyncContext); asyncContext = ReactorContextAccessorUtils.findAsyncContext(args, 1, 2); - Assert.assertNotNull(asyncContext); + Assertions.assertNotNull(asyncContext); asyncContext = ReactorContextAccessorUtils.findAsyncContext(args, 0, 1); - Assert.assertNull(asyncContext); + Assertions.assertNull(asyncContext); asyncContext = ReactorContextAccessorUtils.findAsyncContext(args, 2, 0); - Assert.assertNull(asyncContext); + Assertions.assertNull(asyncContext); } @Test @@ -104,7 +104,7 @@ public void findAsyncContext_null() { Object[] args = null; AsyncContext asyncContext = ReactorContextAccessorUtils.findAsyncContext(args, 0); - Assert.assertNull(asyncContext); + Assertions.assertNull(asyncContext); } @Test @@ -112,7 +112,7 @@ public void findAsyncContext_invalid_type() { Object[] args = {"Str"}; AsyncContext asyncContext = ReactorContextAccessorUtils.findAsyncContext(args, 0); - Assert.assertNull(asyncContext); + Assertions.assertNull(asyncContext); } @Test @@ -120,10 +120,10 @@ public void findAsyncContext_OOB() { Object[] args = {}; AsyncContext asyncContext0 = ReactorContextAccessorUtils.findAsyncContext(args, 0); - Assert.assertNull(asyncContext0); + Assertions.assertNull(asyncContext0); AsyncContext asyncContext1 = ReactorContextAccessorUtils.findAsyncContext(args, 1); - Assert.assertNull(asyncContext1); + Assertions.assertNull(asyncContext1); } @Test diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/request/RequestWrapperReaderTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/request/RequestWrapperReaderTest.java index a7c04621e613..b20e9a87b21a 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/request/RequestWrapperReaderTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/request/RequestWrapperReaderTest.java @@ -21,17 +21,16 @@ import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.context.TraceId; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyLong; import static org.mockito.ArgumentMatchers.anyShort; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.junit.Assert.*; - /** * @author jaehong.kim */ diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/request/util/NameSpaceCheckFactoryTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/request/util/NameSpaceCheckFactoryTest.java index 10c6445b284f..fc4494bc1d37 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/request/util/NameSpaceCheckFactoryTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/request/util/NameSpaceCheckFactoryTest.java @@ -19,8 +19,8 @@ import com.navercorp.pinpoint.bootstrap.plugin.request.RequestAdaptor; import com.navercorp.pinpoint.bootstrap.plugin.request.ServerRequestWrapper; import com.navercorp.pinpoint.bootstrap.plugin.request.ServerRequestWrapperAdaptor; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; @@ -39,7 +39,7 @@ public void newNamespace_valid() { ServerRequestWrapper serverRequestWrapper = mock(ServerRequestWrapper.class); when(serverRequestWrapper.getHeader(anyString())).thenReturn(myNamespace); - Assert.assertTrue(myNamespaceChecker.checkNamespace(serverRequestWrapper)); + Assertions.assertTrue(myNamespaceChecker.checkNamespace(serverRequestWrapper)); } @Test @@ -50,7 +50,7 @@ public void newNamespace_empty_namespace() { ServerRequestWrapper serverRequestWrapper = mock(ServerRequestWrapper.class); when(serverRequestWrapper.getHeader(anyString())).thenReturn(null); - Assert.assertTrue(myNamespaceChecker.checkNamespace(serverRequestWrapper)); + Assertions.assertTrue(myNamespaceChecker.checkNamespace(serverRequestWrapper)); } @Test @@ -61,7 +61,7 @@ public void newNamespace_collision() { ServerRequestWrapper serverRequestWrapper = mock(ServerRequestWrapper.class); when(serverRequestWrapper.getHeader(anyString())).thenReturn("collision_namespace"); - Assert.assertFalse(myNamespaceChecker.checkNamespace(serverRequestWrapper)); + Assertions.assertFalse(myNamespaceChecker.checkNamespace(serverRequestWrapper)); } @Test @@ -72,7 +72,7 @@ public void newNamespace_empty_config() { ServerRequestWrapper serverRequestWrapper = mock(ServerRequestWrapper.class); when(serverRequestWrapper.getHeader(anyString())).thenReturn("invalid_namespace"); - Assert.assertTrue(myNamespaceChecker.checkNamespace(serverRequestWrapper)); + Assertions.assertTrue(myNamespaceChecker.checkNamespace(serverRequestWrapper)); } private NameSpaceChecker newNameSpaceChecker(String myNamespace) { diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/test/ExpectedTraceFieldTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/test/ExpectedTraceFieldTest.java index 60cff2ac1104..5f811ef2bcd7 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/test/ExpectedTraceFieldTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/test/ExpectedTraceFieldTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.bootstrap.plugin.test; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Taejin Koo @@ -81,12 +81,12 @@ public void startWithTest() { private void assertField(ExpectedTraceField expectedTraceField, boolean boolean1, boolean boolean2, boolean boolean3, boolean boolean4, boolean boolean5, boolean boolean6) { - Assert.assertEquals(boolean1, expectedTraceField.isEquals(message)); - Assert.assertEquals(boolean2, expectedTraceField.isEquals(message1)); - Assert.assertEquals(boolean3, expectedTraceField.isEquals(message2)); - Assert.assertEquals(boolean4, expectedTraceField.isEquals(failMessage)); - Assert.assertEquals(boolean5, expectedTraceField.isEquals(emptyMessage)); - Assert.assertEquals(boolean6, expectedTraceField.isEquals(nullMessage)); + Assertions.assertEquals(boolean1, expectedTraceField.isEquals(message)); + Assertions.assertEquals(boolean2, expectedTraceField.isEquals(message1)); + Assertions.assertEquals(boolean3, expectedTraceField.isEquals(message2)); + Assertions.assertEquals(boolean4, expectedTraceField.isEquals(failMessage)); + Assertions.assertEquals(boolean5, expectedTraceField.isEquals(emptyMessage)); + Assertions.assertEquals(boolean6, expectedTraceField.isEquals(nullMessage)); } } diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/uri/UriExtractorProviderRegistryTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/uri/UriExtractorProviderRegistryTest.java index 429493b5e73e..34aea8f9ebc3 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/uri/UriExtractorProviderRegistryTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/uri/UriExtractorProviderRegistryTest.java @@ -17,9 +17,8 @@ package com.navercorp.pinpoint.bootstrap.plugin.uri; import com.navercorp.pinpoint.common.trace.UriExtractorType; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -46,13 +45,13 @@ public void providerRegistryTest() { UriExtractorProviderRegistry registry = new UriExtractorProviderRegistry(uriExtractorProviderList); List result = registry.get(UriMappingExtractorProvider.class, UriExtractorType.SERVLET_REQUEST_ATTRIBUTE); - Assert.assertEquals(2, result.size()); + Assertions.assertEquals(2, result.size()); result = registry.get(UriMappingExtractorProvider.class, UriExtractorType.NONE); - Assert.assertEquals(0, result.size()); + Assertions.assertEquals(0, result.size()); List result2 = registry.get(MockUriExtractorProvider.class, UriExtractorType.SERVLET_REQUEST_ATTRIBUTE); - Assert.assertEquals(0, result2.size()); + Assertions.assertEquals(0, result2.size()); } static class MockUriExtractorProvider implements UriExtractorProvider { diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/util/SocketAddressUtilsTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/util/SocketAddressUtilsTest.java index 4d31b32bf5d1..3095f8d917ab 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/util/SocketAddressUtilsTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/util/SocketAddressUtilsTest.java @@ -17,13 +17,13 @@ package com.navercorp.pinpoint.bootstrap.plugin.util; import com.navercorp.pinpoint.common.util.JvmUtils; -import org.junit.Assert; -import org.junit.Assume; -import org.junit.AssumptionViolatedException; -import org.junit.BeforeClass; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Assumptions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.opentest4j.TestAbortedException; import java.lang.reflect.Field; import java.lang.reflect.InvocationHandler; @@ -46,7 +46,7 @@ public class SocketAddressUtilsTest { private static NameServiceReplacer NAME_SERVICE_REPLACER; - @BeforeClass + @BeforeAll public static void setUpBeforeClass() { NAME_SERVICE_REPLACER = createNameServiceReplacer(); } @@ -91,7 +91,7 @@ public void fromInvalidHostName() { public void fromAddress() { String hostName = VALID_HOST; InetAddress inetAddress = createAddressFromHostName(hostName); - Assume.assumeNotNull(inetAddress); + Assumptions.assumeTrue(inetAddress != null); String address = inetAddress.getHostAddress(); InetSocketAddress socketAddress = new InetSocketAddress(address, 80); @@ -107,7 +107,7 @@ public void fromAddress() { public void fromLookedUpAddress() { String hostName = VALID_HOST; InetAddress inetAddress = createAddressFromHostName(hostName); - Assume.assumeNotNull(inetAddress); + Assumptions.assumeTrue(inetAddress != null); String address = inetAddress.getHostAddress(); InetSocketAddress socketAddress = new InetSocketAddress(address, 80); @@ -122,7 +122,7 @@ public void fromLookedUpAddress() { @Test public void fromLocalAddress() { InetAddress inetAddress = createLocalAddress(); - Assume.assumeNotNull(inetAddress); + Assumptions.assumeTrue(inetAddress != null); String address = inetAddress.getHostAddress(); InetSocketAddress socketAddress = new InetSocketAddress(address, 80); @@ -137,11 +137,11 @@ public void fromLocalAddress() { // Helpers private static void assertResolved(InetSocketAddress socketAddress) { - Assert.assertFalse(socketAddress.isUnresolved()); + Assertions.assertFalse(socketAddress.isUnresolved()); } private static void assertUnresolved(InetSocketAddress socketAddress) { - Assert.assertTrue(socketAddress.isUnresolved()); + Assertions.assertTrue(socketAddress.isUnresolved()); } private static void verify(InetSocketAddress socketAddress, String expectedHostName, String expectedAddress) { @@ -151,8 +151,8 @@ private static void verify(InetSocketAddress socketAddress, String expectedHostN String actualAddress = SocketAddressUtils.getAddressFirst(socketAddress); LOGGER.info("expectedHostName : {}, actualHostName : {}", expectedHostName, actualHostName); LOGGER.info("expectedAddress : {}, actualAddress : {}", expectedAddress, actualAddress); - Assert.assertEquals(expectedHostName, actualHostName); - Assert.assertEquals(expectedAddress, actualAddress); + Assertions.assertEquals(expectedHostName, actualHostName); + Assertions.assertEquals(expectedAddress, actualAddress); } finally { NAME_SERVICE_REPLACER.rollback(); } @@ -178,6 +178,7 @@ private static InetAddress createAddressFromHostName(String hostName) { private interface NameServiceReplacer { void replace(); + void rollback(); } @@ -199,7 +200,7 @@ private static NameServiceReplacer createNameServiceReplacer() { if (nameServiceClass == null) { LOGGER.error("[{}] {} - NameService class not found, skipping test.", JvmUtils.getType(), JvmUtils.getVersion()); - throw new AssumptionViolatedException("NameService class required for test not found."); + throw new TestAbortedException("NameService class required for test not found."); } ClassLoader cl = InetAddress.class.getClassLoader(); @@ -256,7 +257,7 @@ public void rollback() { } LOGGER.error("[{}] {} - Field for name service not found.", JvmUtils.getType(), JvmUtils.getVersion()); - throw new AssumptionViolatedException("Cannot find field for name service."); + throw new TestAbortedException("Cannot find field for name service."); } private static Object getNameServiceFieldValue(String fieldName) { @@ -270,7 +271,7 @@ private static Object getNameServiceFieldValue(String fieldName) { } catch (Exception e) { LOGGER.error("[{}] {} - Unexpected error while getting field [{}], skipping test", JvmUtils.getType(), JvmUtils.getVersion(), fieldName, e); - throw new AssumptionViolatedException("Unexpected reflection exception", e); + throw new TestAbortedException("Unexpected reflection exception", e); } } @@ -284,7 +285,7 @@ private static void setNameServiceFieldValue(String fieldName, Object nameServic } catch (Exception e) { LOGGER.error("[{}] {} - Unexpected error while setting field [{}], skipping test", JvmUtils.getType(), JvmUtils.getVersion(), fieldName, e); - throw new AssumptionViolatedException("Unexpected reflection exception", e); + throw new TestAbortedException("Unexpected reflection exception", e); } } } diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/resolver/condition/ClassResourceConditionTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/resolver/condition/ClassResourceConditionTest.java index 31868d45d701..9c44ec767327 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/resolver/condition/ClassResourceConditionTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/resolver/condition/ClassResourceConditionTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.bootstrap.resolver.condition; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author HyunGil Jeong @@ -31,7 +31,7 @@ public void testMatch() { // When boolean match = ClassResourceCondition.INSTANCE.check(resource); // Then - Assert.assertTrue(match); + Assertions.assertTrue(match); } @Test @@ -41,18 +41,18 @@ public void testNoMatch() { // When boolean match = ClassResourceCondition.INSTANCE.check(nonExistingResource); // Then - Assert.assertFalse(match); + Assertions.assertFalse(match); } @Test public void testNullParameter() { boolean match = ClassResourceCondition.INSTANCE.check(null); - Assert.assertFalse(match); + Assertions.assertFalse(match); } @Test public void testEmptyResource() { boolean match = ClassResourceCondition.INSTANCE.check(""); - Assert.assertFalse(match); + Assertions.assertFalse(match); } } diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/resolver/condition/MainClassConditionTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/resolver/condition/MainClassConditionTest.java index 2e2691b05866..75100bf0a79d 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/resolver/condition/MainClassConditionTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/resolver/condition/MainClassConditionTest.java @@ -16,23 +16,24 @@ package com.navercorp.pinpoint.bootstrap.resolver.condition; -import static org.junit.Assert.*; - -import java.util.Properties; - import com.navercorp.pinpoint.common.util.PropertySnapshot; -import org.junit.Test; - import com.navercorp.pinpoint.common.util.SimpleProperty; import com.navercorp.pinpoint.common.util.SystemPropertyKey; +import org.junit.jupiter.api.Test; + +import java.util.Properties; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author HyunGil Jeong */ public class MainClassConditionTest { - + private static final String TEST_MAIN_CLASS = "main.class.for.Test"; - + @Test public void getValueShouldReturnBootstrapMainClass() { // Given @@ -43,7 +44,7 @@ public void getValueShouldReturnBootstrapMainClass() { // Then assertEquals(TEST_MAIN_CLASS, expectedMainClass); } - + @Test public void getValueShouldReturnEmptyStringWhenMainClassCannotBeResolved() { // Given @@ -54,7 +55,7 @@ public void getValueShouldReturnEmptyStringWhenMainClassCannotBeResolved() { // Then assertEquals("", expectedMainClass); } - + @Test public void testMatch() { // Given @@ -65,7 +66,7 @@ public void testMatch() { // Then assertTrue(matches); } - + @Test public void testNoMatch() { // Given @@ -77,7 +78,7 @@ public void testNoMatch() { // Then assertFalse(matches); } - + @Test public void nullConditionShouldNotMatch() { // Given @@ -88,7 +89,7 @@ public void nullConditionShouldNotMatch() { // Then assertFalse(matches); } - + @Test public void shouldNotMatchWhenMainClassCannotBeResolved() { // Given @@ -99,7 +100,7 @@ public void shouldNotMatchWhenMainClassCannotBeResolved() { // Then assertFalse(matches); } - + @Test public void shouldNotMatchWhenWhenJarFileCannotBeFound() { // Given @@ -110,15 +111,15 @@ public void shouldNotMatchWhenWhenJarFileCannotBeFound() { // Then assertFalse(matches); } - + private static SimpleProperty createTestProperty() { return new PropertySnapshot(new Properties()); } - + private static SimpleProperty createTestProperty(String testMainClass) { SimpleProperty testProperty = createTestProperty(); testProperty.setProperty(SystemPropertyKey.SUN_JAVA_COMMAND.getKey(), testMainClass); return testProperty; } - + } diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/resolver/condition/SystemPropertyConditionTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/resolver/condition/SystemPropertyConditionTest.java index 817be000ffbe..3029671e67d1 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/resolver/condition/SystemPropertyConditionTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/resolver/condition/SystemPropertyConditionTest.java @@ -16,20 +16,20 @@ package com.navercorp.pinpoint.bootstrap.resolver.condition; -import static org.junit.Assert.*; +import com.navercorp.pinpoint.common.util.SystemProperty; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; -import org.junit.Test; - -import com.navercorp.pinpoint.common.util.SystemProperty; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author HyunGil Jeong */ public class SystemPropertyConditionTest { - + @Test public void testMatch() { // Given @@ -44,7 +44,7 @@ public void testMatch() { assertTrue(firstKeyExists); assertTrue(secondKeyExists); } - + @Test public void testNoMatch() { // Given @@ -56,7 +56,7 @@ public void testNoMatch() { // Then assertFalse(keyExists); } - + @Test public void emptyConditionShouldNotMatch() { // Given @@ -68,7 +68,7 @@ public void emptyConditionShouldNotMatch() { // Then assertFalse(matches); } - + @Test public void nullConditionShouldNotMatch() { // Given @@ -80,22 +80,22 @@ public void nullConditionShouldNotMatch() { // Then assertFalse(matches); } - + private static SystemProperty createTestProperty() { return new SystemProperty() { - + private final Map properties = new HashMap<>(); - + @Override public void setProperty(String key, String value) { this.properties.put(key, value); } - + @Override public String getProperty(String key) { return this.properties.get(key); } - + @Override public String getProperty(String key, String defaultValue) { if (this.properties.containsKey(key)) { @@ -106,8 +106,8 @@ public String getProperty(String key, String defaultValue) { } }; } - - private static SystemProperty createTestProperty(String ... keys) { + + private static SystemProperty createTestProperty(String... keys) { SystemProperty property = createTestProperty(); if (keys == null) { return property; @@ -117,5 +117,5 @@ private static SystemProperty createTestProperty(String ... keys) { } return property; } - + } diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/AntPathMatcherTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/AntPathMatcherTest.java index d92096f34600..0bdbfea2b85d 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/AntPathMatcherTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/AntPathMatcherTest.java @@ -17,9 +17,8 @@ package com.navercorp.pinpoint.bootstrap.util; import com.navercorp.pinpoint.common.Version; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -27,27 +26,27 @@ public class AntPathMatcherTest { @Test public void isAntStyle() { - Assert.assertTrue(AntPathMatcher.isAntStylePattern("/*/test")); - Assert.assertTrue(AntPathMatcher.isAntStylePattern("/*/?")); - Assert.assertTrue(AntPathMatcher.isAntStylePattern("*.test")); - Assert.assertTrue(AntPathMatcher.isAntStylePattern("*.?")); + Assertions.assertTrue(AntPathMatcher.isAntStylePattern("/*/test")); + Assertions.assertTrue(AntPathMatcher.isAntStylePattern("/*/?")); + Assertions.assertTrue(AntPathMatcher.isAntStylePattern("*.test")); + Assertions.assertTrue(AntPathMatcher.isAntStylePattern("*.?")); - Assert.assertFalse(AntPathMatcher.isAntStylePattern("/abc/test")); - Assert.assertFalse(AntPathMatcher.isAntStylePattern("abc.test")); + Assertions.assertFalse(AntPathMatcher.isAntStylePattern("/abc/test")); + Assertions.assertFalse(AntPathMatcher.isAntStylePattern("abc.test")); } @Test public void isMatched() { AntPathMatcher matcher = new AntPathMatcher("/test/?bc"); - Assert.assertTrue(matcher.isMatched("/test/abc")); + Assertions.assertTrue(matcher.isMatched("/test/abc")); - Assert.assertFalse(matcher.isMatched("/test/axx")); + Assertions.assertFalse(matcher.isMatched("/test/axx")); - Assert.assertFalse(matcher.isMatched(null)); - Assert.assertFalse(matcher.isMatched("")); - Assert.assertFalse(matcher.isMatched("test")); + Assertions.assertFalse(matcher.isMatched(null)); + Assertions.assertFalse(matcher.isMatched("")); + Assertions.assertFalse(matcher.isMatched("test")); } @Test @@ -58,12 +57,12 @@ public void asteriskTest() { String windowsPath = "C:\\.m2\\repository\\pinpoint-mssql-jdbc-driver-plugin\\" + version + "\\pinpoint-mssql-jdbc-driver-plugin-" + version + ".jar"; AntPathMatcher linuxMatcher = new AntPathMatcher("/**/pinpoint-*-plugin-" + version + ".jar"); - Assert.assertTrue(linuxMatcher.isMatched(linuxPath)); - Assert.assertFalse(linuxMatcher.isMatched(windowsPath)); + Assertions.assertTrue(linuxMatcher.isMatched(linuxPath)); + Assertions.assertFalse(linuxMatcher.isMatched(windowsPath)); AntPathMatcher windowsMatcher = new AntPathMatcher("**\\pinpoint-*-plugin-" + version + ".jar"); - Assert.assertFalse(windowsMatcher.isMatched(linuxPath)); - Assert.assertTrue(windowsMatcher.isMatched(windowsPath)); + Assertions.assertFalse(windowsMatcher.isMatched(linuxPath)); + Assertions.assertTrue(windowsMatcher.isMatched(windowsPath)); } @@ -71,14 +70,14 @@ public void asteriskTest() { public void isMatchedDotSeparator() { final String pathSeparator = "."; AntPathMatcher matcher = new AntPathMatcher("test.?bc", pathSeparator); - Assert.assertTrue(matcher.isMatched("test.abc")); + Assertions.assertTrue(matcher.isMatched("test.abc")); - Assert.assertFalse(matcher.isMatched("test.axx")); + Assertions.assertFalse(matcher.isMatched("test.axx")); - Assert.assertFalse(matcher.isMatched(null)); - Assert.assertFalse(matcher.isMatched("")); - Assert.assertFalse(matcher.isMatched("test")); + Assertions.assertFalse(matcher.isMatched(null)); + Assertions.assertFalse(matcher.isMatched("")); + Assertions.assertFalse(matcher.isMatched("test")); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/EqualsPathMatcherTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/EqualsPathMatcherTest.java index 65cc17a83bbc..90083409c10c 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/EqualsPathMatcherTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/EqualsPathMatcherTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.bootstrap.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -27,11 +27,11 @@ public class EqualsPathMatcherTest { @Test public void testIsMatched() { EqualsPathMatcher matcher = new EqualsPathMatcher("/test"); - Assert.assertTrue(matcher.isMatched("/test")); + Assertions.assertTrue(matcher.isMatched("/test")); - Assert.assertFalse(matcher.isMatched("/test/b")); + Assertions.assertFalse(matcher.isMatched("/test/b")); - Assert.assertFalse(matcher.isMatched(null)); - Assert.assertFalse(matcher.isMatched("")); + Assertions.assertFalse(matcher.isMatched(null)); + Assertions.assertFalse(matcher.isMatched("")); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/FixedByteArrayOutputStreamTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/FixedByteArrayOutputStreamTest.java index 0e9f96c47009..8c02af8126c8 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/FixedByteArrayOutputStreamTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/FixedByteArrayOutputStreamTest.java @@ -15,12 +15,12 @@ */ package com.navercorp.pinpoint.bootstrap.util; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Arrays; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; /** * @author minwoo.jung @@ -30,47 +30,47 @@ public class FixedByteArrayOutputStreamTest { @Test public void test() throws IOException { FixedByteArrayOutputStream outStream = new FixedByteArrayOutputStream(10); - + byte[] temp = new byte[5]; - Arrays.fill(temp, (byte)5); + Arrays.fill(temp, (byte) 5); outStream.write(temp); assertArrayEquals(outStream.toByteArray(), temp); byte[] temp2 = new byte[10]; - Arrays.fill(temp2, (byte)10); + Arrays.fill(temp2, (byte) 10); outStream.write(temp2); - byte[] result = new byte[] {5, 5, 5, 5, 5, 10, 10, 10, 10, 10}; + byte[] result = new byte[]{5, 5, 5, 5, 5, 10, 10, 10, 10, 10}; assertArrayEquals(outStream.toByteArray(), result); - + byte[] temp3 = new byte[10]; - Arrays.fill(temp3, (byte)10); + Arrays.fill(temp3, (byte) 10); outStream.write(temp3); assertArrayEquals(outStream.toByteArray(), result); - + outStream.close(); } @Test public void test2() throws IOException { FixedByteArrayOutputStream outStream = new FixedByteArrayOutputStream(10); - + byte[] temp = new byte[9]; - Arrays.fill(temp, (byte)9); + Arrays.fill(temp, (byte) 9); outStream.write(temp); assertArrayEquals(outStream.toByteArray(), temp); byte[] temp2 = new byte[10]; - Arrays.fill(temp2, (byte)10); + Arrays.fill(temp2, (byte) 10); outStream.write(temp2); - byte[] result = new byte[] {9, 9, 9, 9, 9, 9, 9, 9, 9, 10}; + byte[] result = new byte[]{9, 9, 9, 9, 9, 9, 9, 9, 9, 10}; assertArrayEquals(outStream.toByteArray(), result); - + byte[] temp3 = new byte[10]; - Arrays.fill(temp3, (byte)11); + Arrays.fill(temp3, (byte) 11); outStream.write(temp3); assertArrayEquals(outStream.toByteArray(), result); - + outStream.close(); - + } } diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/InterceptorUtilsTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/InterceptorUtilsTest.java index fe0bd3616807..725c4261116f 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/InterceptorUtilsTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/InterceptorUtilsTest.java @@ -1,8 +1,8 @@ package com.navercorp.pinpoint.bootstrap.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Created by Naver on 2015-11-17. diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/LocalHostTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/LocalHostTest.java index 8ea030984d61..467f4f75a9fb 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/LocalHostTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/LocalHostTest.java @@ -16,10 +16,10 @@ package com.navercorp.pinpoint.bootstrap.util; -import org.junit.Ignore; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.net.InetAddress; import java.net.NetworkInterface; @@ -33,7 +33,7 @@ public class LocalHostTest { private final Logger logger = LogManager.getLogger(this.getClass()); - @Ignore + @Disabled @Test public void portName() throws UnknownHostException, SocketException { diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/NetworkUtilsTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/NetworkUtilsTest.java index acaff080c553..90a6118a31f9 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/NetworkUtilsTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/NetworkUtilsTest.java @@ -16,10 +16,10 @@ package com.navercorp.pinpoint.bootstrap.util; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.InetAddress; import java.net.UnknownHostException; @@ -43,57 +43,57 @@ public void hostNameCheck() throws UnknownHostException { @SuppressWarnings("deprecation") public void testGetMachineName2() { String machineName = NetworkUtils.getMachineName(); - Assert.assertNotSame(machineName, NetworkUtils.ERROR_HOST_NAME); + Assertions.assertNotSame(machineName, NetworkUtils.ERROR_HOST_NAME); } @Test public void testGetHostName() { String hostName = NetworkUtils.getHostName(); - Assert.assertNotSame(hostName, NetworkUtils.ERROR_HOST_NAME); + Assertions.assertNotSame(hostName, NetworkUtils.ERROR_HOST_NAME); } @Test public void testHostFromUrl() { String hostFromURL1 = NetworkUtils.getHostFromURL("http://www.naver.com"); - Assert.assertEquals("www.naver.com", hostFromURL1); + Assertions.assertEquals("www.naver.com", hostFromURL1); String hostFromURL1_1 = NetworkUtils.getHostFromURL("http://www.naver.com/test"); - Assert.assertEquals("www.naver.com", hostFromURL1_1); + Assertions.assertEquals("www.naver.com", hostFromURL1_1); // TODO how should we resolve host when the url includes the default port? String hostFromURL2 = NetworkUtils.getHostFromURL("http://www.naver.com:80"); - Assert.assertEquals("www.naver.com:80", hostFromURL2); + Assertions.assertEquals("www.naver.com:80", hostFromURL2); String hostFromURL2_1 = NetworkUtils.getHostFromURL("http://www.naver.com:80/test"); - Assert.assertEquals("www.naver.com:80", hostFromURL2_1); + Assertions.assertEquals("www.naver.com:80", hostFromURL2_1); } @Test public void testHostFromUrl_ErrorTest() { String nullUrl = NetworkUtils.getHostFromURL(null); - Assert.assertSame(nullUrl, null); + Assertions.assertSame(nullUrl, null); String emptyUrl = NetworkUtils.getHostFromURL(""); - Assert.assertSame(emptyUrl, null); + Assertions.assertSame(emptyUrl, null); } - + @Test public void hostIpTest() { List hostIpList = NetworkUtils.getHostIpList(); for (String hostIp : hostIpList) { - Assert.assertFalse(NetworkUtils.isLoopbackAddress(hostIp)); + Assertions.assertFalse(NetworkUtils.isLoopbackAddress(hostIp)); } int hostIpListSize = hostIpList.size(); List hostV4IpList = NetworkUtils.getHostV4IpList(); for (String hostV4Ip : hostV4IpList) { - Assert.assertFalse(NetworkUtils.isLoopbackAddress(hostV4Ip)); - Assert.assertTrue(NetworkUtils.validationIpV4FormatAddress(hostV4Ip)); + Assertions.assertFalse(NetworkUtils.isLoopbackAddress(hostV4Ip)); + Assertions.assertTrue(NetworkUtils.validationIpV4FormatAddress(hostV4Ip)); } int hostV4IpListSize = hostV4IpList.size(); - Assert.assertTrue(hostIpListSize >= hostV4IpListSize); + Assertions.assertTrue(hostIpListSize >= hostV4IpListSize); } } diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/NumberUtilsTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/NumberUtilsTest.java index 2a308cf3c557..e191969de4f4 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/NumberUtilsTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/NumberUtilsTest.java @@ -16,10 +16,8 @@ package com.navercorp.pinpoint.bootstrap.util; -import java.util.Random; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author poap @@ -35,9 +33,9 @@ public void parseLong() { } private void assertLong(long longValue, long defaultLong) { - Assert.assertEquals(NumberUtils.parseLong(null, defaultLong), defaultLong); - Assert.assertEquals(NumberUtils.parseLong(String.valueOf(longValue), defaultLong), longValue); - Assert.assertEquals(NumberUtils.parseLong(notNumber, defaultLong), defaultLong); + Assertions.assertEquals(NumberUtils.parseLong(null, defaultLong), defaultLong); + Assertions.assertEquals(NumberUtils.parseLong(String.valueOf(longValue), defaultLong), longValue); + Assertions.assertEquals(NumberUtils.parseLong(notNumber, defaultLong), defaultLong); } @Test @@ -48,9 +46,9 @@ public void parseInteger() { } private void assertInteger(int integerValue, int defaultInt) { - Assert.assertEquals(NumberUtils.parseInteger(null, defaultInt), defaultInt); - Assert.assertEquals(NumberUtils.parseInteger(String.valueOf(integerValue), defaultInt), integerValue); - Assert.assertEquals(NumberUtils.parseInteger(notNumber, defaultInt), defaultInt); + Assertions.assertEquals(NumberUtils.parseInteger(null, defaultInt), defaultInt); + Assertions.assertEquals(NumberUtils.parseInteger(String.valueOf(integerValue), defaultInt), integerValue); + Assertions.assertEquals(NumberUtils.parseInteger(notNumber, defaultInt), defaultInt); } @Test @@ -63,9 +61,9 @@ public void parseShort() { } private void assertShort(short shortValue, short defaultShort) { - Assert.assertEquals(NumberUtils.parseShort(null, shortValue), shortValue); - Assert.assertEquals(NumberUtils.parseShort(String.valueOf(shortValue), defaultShort), shortValue); - Assert.assertEquals(NumberUtils.parseShort(notNumber, shortValue), shortValue); + Assertions.assertEquals(NumberUtils.parseShort(null, shortValue), shortValue); + Assertions.assertEquals(NumberUtils.parseShort(String.valueOf(shortValue), defaultShort), shortValue); + Assertions.assertEquals(NumberUtils.parseShort(notNumber, shortValue), shortValue); } @Test @@ -75,11 +73,11 @@ public void toInteger() { long oneLong = 1; String oneString = "1"; - Assert.assertNull(NumberUtils.toInteger(null)); - Assert.assertNull(NumberUtils.toInteger(oneShort)); - Assert.assertEquals(NumberUtils.toInteger(oneInteger), (Integer) 1); - Assert.assertNull(NumberUtils.toInteger(oneLong)); - Assert.assertNull(NumberUtils.toInteger(oneString)); - Assert.assertNull(NumberUtils.toInteger(notNumber)); + Assertions.assertNull(NumberUtils.toInteger(null)); + Assertions.assertNull(NumberUtils.toInteger(oneShort)); + Assertions.assertEquals(NumberUtils.toInteger(oneInteger), (Integer) 1); + Assertions.assertNull(NumberUtils.toInteger(oneLong)); + Assertions.assertNull(NumberUtils.toInteger(oneString)); + Assertions.assertNull(NumberUtils.toInteger(notNumber)); } } diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/PlatformClassLoaderUtilsTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/PlatformClassLoaderUtilsTest.java index e37a3e900a82..16e352b1fd2e 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/PlatformClassLoaderUtilsTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/PlatformClassLoaderUtilsTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.bootstrap.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -35,6 +35,6 @@ public void getPlatformOrBootstrapClassLoader_java8() { //java8 test ClassLoader platformOrBootstrapClassLoader = PlatformClassLoaderUtils.getPlatformOrBootstrapClassLoader(); ClassLoader classLoader = Object.class.getClassLoader(); - Assert.assertSame(platformOrBootstrapClassLoader, classLoader); + Assertions.assertSame(platformOrBootstrapClassLoader, classLoader); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/spring/AntPathMatcherTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/spring/AntPathMatcherTest.java index 907e93598a49..67d072870c9a 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/spring/AntPathMatcherTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/spring/AntPathMatcherTest.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.bootstrap.util.spring; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Map; diff --git a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/spring/PropertyPlaceholderHelperTest.java b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/spring/PropertyPlaceholderHelperTest.java index a2156a67e4df..6787f6f01f57 100644 --- a/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/spring/PropertyPlaceholderHelperTest.java +++ b/bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/util/spring/PropertyPlaceholderHelperTest.java @@ -16,11 +16,8 @@ package com.navercorp.pinpoint.bootstrap.util.spring; -import org.junit.Assert; - -import org.junit.Test; - -import com.navercorp.pinpoint.bootstrap.util.spring.PropertyPlaceholderHelper; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -33,12 +30,12 @@ public void testReplacePlaceholders() { PropertyPlaceholderHelper helper = new PropertyPlaceholderHelper("${", "}"); String value1 = helper.replacePlaceholders("${test}", properties); - Assert.assertEquals("a", value1); + Assertions.assertEquals("a", value1); String value2 = helper.replacePlaceholders("123${test}456", properties); - Assert.assertEquals("123a456", value2); + Assertions.assertEquals("123a456", value2); String value3 = helper.replacePlaceholders("123${test}456${test}", properties); - Assert.assertEquals("123a456a", value3); + Assertions.assertEquals("123a456a", value3); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-java9-internal/src/test/java/com/navercorp/pinpoint/bootstrap/java9/classloader/Java9BootLoaderTest.java b/bootstraps/bootstrap-java9-internal/src/test/java/com/navercorp/pinpoint/bootstrap/java9/classloader/Java9BootLoaderTest.java index 446995bba37e..f090f31b607b 100644 --- a/bootstraps/bootstrap-java9-internal/src/test/java/com/navercorp/pinpoint/bootstrap/java9/classloader/Java9BootLoaderTest.java +++ b/bootstraps/bootstrap-java9-internal/src/test/java/com/navercorp/pinpoint/bootstrap/java9/classloader/Java9BootLoaderTest.java @@ -16,10 +16,10 @@ package com.navercorp.pinpoint.bootstrap.java9.classloader; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URL; @@ -27,7 +27,6 @@ import java.util.Enumeration; import java.util.List; - /** * @author Woonduk Kang(emeroad) */ @@ -42,7 +41,7 @@ public void testFindResource() { String stringResource = getInternalName(String.class); URL url = bootLoader.findResource(stringResource); - Assert.assertNotNull(url); + Assertions.assertNotNull(url); } private static String getInternalName(Class clazz) { @@ -57,7 +56,7 @@ public void testFindResources() throws IOException { Enumeration bootstrapResources = bootLoader.findResources(stringResource); List list = Collections.list(bootstrapResources); - Assert.assertEquals(1, list.size()); + Assertions.assertEquals(1, list.size()); logger.debug("list:{}", list); } } \ No newline at end of file diff --git a/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/java9/classloader/Java9ClassLoaderTest.java b/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/java9/classloader/Java9ClassLoaderTest.java index 3ed60a761566..bdcb6ae9cfea 100644 --- a/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/java9/classloader/Java9ClassLoaderTest.java +++ b/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/java9/classloader/Java9ClassLoaderTest.java @@ -19,10 +19,10 @@ import com.navercorp.pinpoint.bootstrap.classloader.PinpointClassLoaderFactory; import com.navercorp.pinpoint.bootstrap.classloader.ProfilerLibs; import com.navercorp.pinpoint.common.util.CodeSourceUtils; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.Closeable; import java.io.IOException; @@ -58,33 +58,32 @@ private ClassLoader onLoadTest(Class classLoaderType, Class testClass) thr URL testClassJar = CodeSourceUtils.getCodeLocation(testClass); URL[] urls = {testClassJar}; ClassLoader cl = PinpointClassLoaderFactory.createClassLoader(this.getClass().getName(), urls, null, ProfilerLibs.PINPOINT_PROFILER_CLASS); - Assert.assertSame(cl.getClass(), classLoaderType); + Assertions.assertSame(cl.getClass(), classLoaderType); try { cl.loadClass("test"); - Assert.fail(); + Assertions.fail(); } catch (ClassNotFoundException ignored) { } Class selfLoadClass = cl.loadClass(testClass.getName()); - Assert.assertNotSame(testClass, selfLoadClass); - Assert.assertSame(cl, selfLoadClass.getClassLoader()); - Assert.assertSame(testClass.getClassLoader(), this.getClass().getClassLoader()); + Assertions.assertNotSame(testClass, selfLoadClass); + Assertions.assertSame(cl, selfLoadClass.getClassLoader()); + Assertions.assertSame(testClass.getClassLoader(), this.getClass().getClassLoader()); return cl; } - @Test public void loadClass_bootstrap() throws Exception { ClassLoader cl = PinpointClassLoaderFactory.createClassLoader(this.getClass().getName(), new URL[]{}, null, ProfilerLibs.PINPOINT_PROFILER_CLASS); - Assert.assertTrue(cl instanceof Java9ClassLoader); + Assertions.assertTrue(cl instanceof Java9ClassLoader); Class stringClazz1 = cl.loadClass("java.lang.String"); Class stringClazz2 = ClassLoader.getSystemClassLoader().loadClass("java.lang.String"); - Assert.assertSame("reference", stringClazz1, stringClazz2); - Assert.assertSame("classLoader", stringClazz1.getClassLoader(), stringClazz2.getClassLoader()); + Assertions.assertSame(stringClazz1, stringClazz2, "reference"); + Assertions.assertSame(stringClazz1.getClassLoader(), stringClazz2.getClassLoader(), "classLoader"); close(cl); } diff --git a/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/java9/classloader/PlatformClassLoaderTest.java b/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/java9/classloader/PlatformClassLoaderTest.java index 629d98de74ae..7364c2e88ddd 100644 --- a/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/java9/classloader/PlatformClassLoaderTest.java +++ b/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/java9/classloader/PlatformClassLoaderTest.java @@ -16,11 +16,11 @@ package com.navercorp.pinpoint.bootstrap.java9.classloader; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.math.BigDecimal; import java.sql.Date; @@ -34,7 +34,7 @@ public class PlatformClassLoaderTest { private final Logger logger = LogManager.getLogger(this.getClass()); - @Ignore + @Disabled @Test public void sqlDate() throws ClassNotFoundException { Class sqlDateClazz = java.sql.Date.class; @@ -45,13 +45,13 @@ public void sqlDate() throws ClassNotFoundException { try { ClassLoader bootStrap = Object.class.getClassLoader(); Class.forName("java.sql.Date", false, bootStrap); - Assert.fail(); + Assertions.fail(); } catch (ClassNotFoundException e) { // skip } } - @Ignore + @Disabled @Test public void testBigDecimal() { Class bigDecimalClass = BigDecimal.class; @@ -61,7 +61,7 @@ public void testBigDecimal() { } - @Ignore + @Disabled @Test public void sqlDate_module() { Class dateClass = Date.class; @@ -75,7 +75,7 @@ public void sqlDate_module() { logger.debug("javaBase module layer:{}", objectClass.getModule().getLayer()); } - @Ignore + @Disabled @Test public void moduleLayer() { ModuleLayer layer = Object.class.getModule().getLayer(); diff --git a/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/java9/module/JarFileAnalyzerTest.java b/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/java9/module/JarFileAnalyzerTest.java index 59544ac9ff0c..5f0dc313d473 100644 --- a/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/java9/module/JarFileAnalyzerTest.java +++ b/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/java9/module/JarFileAnalyzerTest.java @@ -21,8 +21,8 @@ import org.apache.commons.io.IOUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URL; @@ -61,7 +61,7 @@ public void packageAnalyzer() throws IOException { .filter(this::packageFilter) .count(); - Assert.assertEquals(packageCount, packageSet.size()); + Assertions.assertEquals(packageCount, packageSet.size()); } private boolean packageFilter(JarEntry jarEntry) { @@ -95,7 +95,7 @@ public void filter_emptyPackage() { when(jarEntry.getName()).thenReturn("test.class"); String empty = filter.filter(jarEntry); - Assert.assertNull(empty); + Assertions.assertNull(empty); } @Test @@ -108,8 +108,8 @@ public void providers() throws IOException { PackageInfo analyze = analyzer.analyze(); List providers = analyze.getProviders(); Providers first = providers.get(0); - Assert.assertEquals("java.sql.Driver", first.getService()); - Assert.assertTrue(first.getProviders().contains("com.mysql.cj.jdbc.Driver")); + Assertions.assertEquals("java.sql.Driver", first.getService()); + Assertions.assertTrue(first.getProviders().contains("com.mysql.cj.jdbc.Driver")); } diff --git a/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/java9/module/ModuleBuilderTest.java b/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/java9/module/ModuleBuilderTest.java index 7a93b8ba522d..025e4682234b 100644 --- a/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/java9/module/ModuleBuilderTest.java +++ b/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/java9/module/ModuleBuilderTest.java @@ -18,10 +18,10 @@ import com.navercorp.pinpoint.bootstrap.java9.classloader.Java9ClassLoader; import com.navercorp.pinpoint.common.util.CodeSourceUtils; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.lang.module.ModuleDescriptor; @@ -66,8 +66,8 @@ public void defineModuleTest() throws IOException, URISyntaxException, ClassNotF Class slf4jModule = classLoader.loadClass(slf4jClass.getName()); logger.debug("slf4j:{}", slf4jModule); - Assert.assertSame(module, slf4jModule.getModule()); - Assert.assertEquals(module.getName(), slf4jModule.getModule().getName()); + Assertions.assertSame(module, slf4jModule.getModule()); + Assertions.assertEquals(module.getName(), slf4jModule.getModule().getName()); classLoader.close(); diff --git a/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/util/PlatformClassLoaderUtilsTest.java b/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/util/PlatformClassLoaderUtilsTest.java index 4fb4d6f342d0..057ef0ecc7fb 100644 --- a/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/util/PlatformClassLoaderUtilsTest.java +++ b/bootstraps/bootstrap-java9/src/test/java/com/navercorp/pinpoint/bootstrap/util/PlatformClassLoaderUtilsTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.bootstrap.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -27,14 +27,14 @@ public class PlatformClassLoaderUtilsTest { @Test public void findClassFromPlatformClassLoader_java9() { Class sqlDate = PlatformClassLoaderUtils.findClassFromPlatformClassLoader("java.sql.Date"); - Assert.assertNotNull(sqlDate); + Assertions.assertNotNull(sqlDate); } @Test public void getPlatformClassLoader_java9() { ClassLoader platformOrBootstrapClassLoader = PlatformClassLoaderUtils.getPlatformOrBootstrapClassLoader(); ClassLoader platformClassLoader2 = ClassLoader.getPlatformClassLoader(); - Assert.assertSame(platformClassLoader2, platformOrBootstrapClassLoader); + Assertions.assertSame(platformClassLoader2, platformOrBootstrapClassLoader); } } diff --git a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/AgentBootLoaderTest.java b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/AgentBootLoaderTest.java index 70ff2b48e347..96cb913963a6 100644 --- a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/AgentBootLoaderTest.java +++ b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/AgentBootLoaderTest.java @@ -19,13 +19,12 @@ import com.navercorp.pinpoint.bootstrap.config.DefaultProfilerConfig; import com.navercorp.pinpoint.common.util.CodeSourceUtils; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; import java.lang.instrument.Instrumentation; import java.net.URL; - import java.util.Collections; import static org.mockito.Mockito.mock; diff --git a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/AgentDirGenerator.java b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/AgentDirGenerator.java index 6a726a8f66bb..83976173539a 100644 --- a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/AgentDirGenerator.java +++ b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/AgentDirGenerator.java @@ -17,9 +17,9 @@ package com.navercorp.pinpoint.bootstrap; import com.navercorp.pinpoint.common.Version; -import org.junit.Assert; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.junit.jupiter.api.Assertions; import java.io.File; import java.io.IOException; @@ -31,7 +31,6 @@ import java.util.jar.JarOutputStream; import java.util.jar.Manifest; - /** * @author Woonduk Kang(emeroad) */ @@ -86,9 +85,9 @@ private Path createDir(Path dirPath) { throw new RuntimeException(dirPath + " create fil", e); } } - Assert.assertTrue(dirPath + " not a directory", Files.isDirectory(dirPath)); + Assertions.assertTrue(Files.isDirectory(dirPath), dirPath + " not a directory"); - Assert.assertTrue(Files.isWritable(dirPath)); + Assertions.assertTrue(Files.isWritable(dirPath)); return dirPath; } diff --git a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/AgentIdResolverTest.java b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/AgentIdResolverTest.java index 2871aefab01d..5b35d2d2c9db 100644 --- a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/AgentIdResolverTest.java +++ b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/AgentIdResolverTest.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.bootstrap; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Properties; @@ -19,9 +19,9 @@ public void resolve() { AgentIdResolver resolver = new AgentIdResolver(Arrays.asList(ap)); AgentIds resolve = resolver.resolve(); - Assert.assertEquals("agentId", resolve.getAgentId()); - Assert.assertEquals("agentName", resolve.getAgentName()); - Assert.assertEquals("appName", resolve.getApplicationName()); + Assertions.assertEquals("agentId", resolve.getAgentId()); + Assertions.assertEquals("agentName", resolve.getAgentName()); + Assertions.assertEquals("appName", resolve.getApplicationName()); } @Test @@ -34,9 +34,9 @@ public void resolve_optional_agent_name() { AgentIdResolver resolver = new AgentIdResolver(Arrays.asList(ap)); AgentIds resolve = resolver.resolve(); - Assert.assertEquals("agentId", resolve.getAgentId()); - Assert.assertEquals("appName", resolve.getApplicationName()); - Assert.assertEquals("", resolve.getAgentName()); + Assertions.assertEquals("agentId", resolve.getAgentId()); + Assertions.assertEquals("appName", resolve.getApplicationName()); + Assertions.assertEquals("", resolve.getAgentName()); } @Test @@ -49,7 +49,7 @@ public void resolve_fail() { AgentIdResolver resolver = new AgentIdResolver(Arrays.asList(ap)); AgentIds resolve = resolver.resolve(); - Assert.assertNull(resolve); + Assertions.assertNull(resolve); } @Test @@ -66,9 +66,9 @@ public void resolve_multi_source() { AgentIdResolver resolver = new AgentIdResolver(Arrays.asList(ap, ap2)); AgentIds resolve = resolver.resolve(); - Assert.assertEquals("agentId1", resolve.getAgentId()); - Assert.assertEquals("appName2", resolve.getApplicationName()); - Assert.assertEquals("agentName1", resolve.getAgentName()); + Assertions.assertEquals("agentId1", resolve.getAgentId()); + Assertions.assertEquals("appName2", resolve.getApplicationName()); + Assertions.assertEquals("agentName1", resolve.getAgentName()); } @Test @@ -88,8 +88,8 @@ public void resolve_multi_source_2() { AgentIdResolver resolver = new AgentIdResolver(Arrays.asList(ap, ap2)); AgentIds resolve = resolver.resolve(); - Assert.assertEquals("agentId2", resolve.getAgentId()); - Assert.assertEquals("appName2", resolve.getApplicationName()); - Assert.assertEquals("agentName2", resolve.getAgentName()); + Assertions.assertEquals("agentId2", resolve.getAgentId()); + Assertions.assertEquals("appName2", resolve.getApplicationName()); + Assertions.assertEquals("agentName2", resolve.getAgentName()); } } \ No newline at end of file diff --git a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/ArgsParserTest.java b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/ArgsParserTest.java index 3ee66563cd05..48ee319c9000 100644 --- a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/ArgsParserTest.java +++ b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/ArgsParserTest.java @@ -16,9 +16,9 @@ package com.navercorp.pinpoint.bootstrap; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.Map; @@ -31,18 +31,18 @@ public class ArgsParserTest { public void parse() { ArgsParser parser = new ArgsParser(); Map parameter = parser.parse("a=1,b=2"); - Assert.assertEquals("1", parameter.get("a")); - Assert.assertEquals("2", parameter.get("b")); + Assertions.assertEquals("1", parameter.get("a")); + Assertions.assertEquals("2", parameter.get("b")); } - @Ignore + @Disabled @Test public void parse_comma() { // TODO ArgsParser parser = new ArgsParser(); Map parameter = parser.parse("a=1\\,234,b=2"); - Assert.assertEquals("1,234", parameter.get("a")); - Assert.assertEquals("2", parameter.get("b")); + Assertions.assertEquals("1,234", parameter.get("a")); + Assertions.assertEquals("2", parameter.get("b")); } } \ No newline at end of file diff --git a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/BootLogLevelTest.java b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/BootLogLevelTest.java index 810c7459bc70..086e9e4b46d2 100644 --- a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/BootLogLevelTest.java +++ b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/BootLogLevelTest.java @@ -1,11 +1,11 @@ package com.navercorp.pinpoint.bootstrap; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; public class BootLogLevelTest { @@ -17,56 +17,56 @@ public class BootLogLevelTest { @Test public void of() { - assertEquals("trace", TRACE, BootLogLevel.of(TRACE.name())); - assertEquals("debug", DEBUG, BootLogLevel.of(DEBUG.name())); - assertEquals("info", INFO, BootLogLevel.of(INFO.name())); - assertEquals("warn", WARN, BootLogLevel.of(WARN.name())); - assertEquals("error", ERROR, BootLogLevel.of(ERROR.name())); - assertNull("invalid", BootLogLevel.of("notExist")); + assertEquals(TRACE, BootLogLevel.of(TRACE.name()), "trace"); + assertEquals(DEBUG, BootLogLevel.of(DEBUG.name()), "debug"); + assertEquals(INFO, BootLogLevel.of(INFO.name()), "info"); + assertEquals(WARN, BootLogLevel.of(WARN.name()), "warn"); + assertEquals(ERROR, BootLogLevel.of(ERROR.name()), "error"); + assertNull(BootLogLevel.of("notExist"), "invalid"); } @Test public void logTrace() { - assertTrue("trace", TRACE.logTrace()); - assertFalse("debug", DEBUG.logTrace()); - assertFalse("info", INFO.logTrace()); - assertFalse("warn", WARN.logTrace()); - assertFalse("error", ERROR.logTrace()); + assertTrue(TRACE.logTrace(), "trace"); + assertFalse(DEBUG.logTrace(), "debug"); + assertFalse(INFO.logTrace(), "info"); + assertFalse(WARN.logTrace(), "warn"); + assertFalse(ERROR.logTrace(), "error"); } @Test public void logDebug() { - assertTrue("trace", TRACE.logDebug()); - assertTrue("debug", DEBUG.logDebug()); - assertFalse("info", INFO.logDebug()); - assertFalse("warn", WARN.logDebug()); - assertFalse("error", ERROR.logDebug()); + assertTrue(TRACE.logDebug(), "trace"); + assertTrue(DEBUG.logDebug(), "debug"); + assertFalse(INFO.logDebug(), "info"); + assertFalse(WARN.logDebug(), "warn"); + assertFalse(ERROR.logDebug(), "error"); } @Test public void logInfo() { - assertTrue("trace", TRACE.logInfo()); - assertTrue("debug", DEBUG.logInfo()); - assertTrue("info", INFO.logInfo()); - assertFalse("warn", WARN.logInfo()); - assertFalse("error", ERROR.logInfo()); + assertTrue(TRACE.logInfo(), "trace"); + assertTrue(DEBUG.logInfo(), "debug"); + assertTrue(INFO.logInfo(), "info"); + assertFalse(WARN.logInfo(), "warn"); + assertFalse(ERROR.logInfo(), "error"); } @Test public void logWarn() { - assertTrue("trace", TRACE.logWarn()); - assertTrue("debug", DEBUG.logWarn()); - assertTrue("info", INFO.logWarn()); - assertTrue("warn", WARN.logWarn()); - assertFalse("error", ERROR.logWarn()); + assertTrue(TRACE.logWarn(), "trace"); + assertTrue(DEBUG.logWarn(), "debug"); + assertTrue(INFO.logWarn(), "info"); + assertTrue(WARN.logWarn(), "warn"); + assertFalse(ERROR.logWarn(), "error"); } @Test public void logError() { - assertTrue("trace", TRACE.logError()); - assertTrue("debug", DEBUG.logError()); - assertTrue("info", INFO.logError()); - assertTrue("warn", WARN.logError()); - assertTrue("error", ERROR.logError()); + assertTrue(TRACE.logError(), "trace"); + assertTrue(DEBUG.logError(), "debug"); + assertTrue(INFO.logError(), "info"); + assertTrue(WARN.logError(), "warn"); + assertTrue(ERROR.logError(), "error"); } } \ No newline at end of file diff --git a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/BootLoggerTest.java b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/BootLoggerTest.java index 1f789bd6292d..b0ebe25692e9 100644 --- a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/BootLoggerTest.java +++ b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/BootLoggerTest.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.bootstrap; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) diff --git a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/ContainerResolverTest.java b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/ContainerResolverTest.java index 6e2f4389c1e2..6aa4e0eb2adc 100644 --- a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/ContainerResolverTest.java +++ b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/ContainerResolverTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.bootstrap; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -30,14 +30,14 @@ public class ContainerResolverTest { public void noKeyShouldReturnFalse() { Properties properties = new Properties(); ContainerResolver containerResolver = new ContainerResolver(properties); - Assert.assertFalse(containerResolver.isContainer()); + Assertions.assertFalse(containerResolver.isContainer()); } @Test public void noKeyAndDockerEnvShouldReturnFalse() { Properties properties = new Properties(); ContainerResolver containerResolver = new ContainerResolver(properties); - Assert.assertFalse(containerResolver.isContainer()); + Assertions.assertFalse(containerResolver.isContainer()); } @Test @@ -45,7 +45,7 @@ public void emptyValueShouldReturnTrue() { Properties properties = new Properties(); properties.put(ContainerResolver.CONTAINER_PROPERTY_KEY, ""); ContainerResolver containerResolver = new ContainerResolver(properties); - Assert.assertTrue(containerResolver.isContainer()); + Assertions.assertTrue(containerResolver.isContainer()); } @Test @@ -53,7 +53,7 @@ public void trueValueShouldReturnTrue() { Properties properties = new Properties(); properties.put(ContainerResolver.CONTAINER_PROPERTY_KEY, "tRue"); ContainerResolver containerResolver = new ContainerResolver(properties); - Assert.assertTrue(containerResolver.isContainer()); + Assertions.assertTrue(containerResolver.isContainer()); } @Test @@ -61,6 +61,6 @@ public void falseValueShouldReturnFalse() { Properties properties = new Properties(); properties.put(ContainerResolver.CONTAINER_PROPERTY_KEY, "FALSE"); ContainerResolver containerResolver = new ContainerResolver(properties); - Assert.assertFalse(containerResolver.isContainer()); + Assertions.assertFalse(containerResolver.isContainer()); } } diff --git a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/LoadStateTest.java b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/LoadStateTest.java index 2f4f4e85779c..2e5c42c3f8c3 100644 --- a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/LoadStateTest.java +++ b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/LoadStateTest.java @@ -16,9 +16,9 @@ package com.navercorp.pinpoint.bootstrap; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -28,10 +28,10 @@ public class LoadStateTest { public void testStart() { LoadState loadState = new LoadState(); - Assert.assertTrue(loadState.start()); - Assert.assertTrue(loadState.getState()); + Assertions.assertTrue(loadState.start()); + Assertions.assertTrue(loadState.getState()); - Assert.assertFalse(loadState.start()); + Assertions.assertFalse(loadState.start()); } } diff --git a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/ValidIdCheckerTest.java b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/ValidIdCheckerTest.java index c5423f19aa05..a7edb5735954 100644 --- a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/ValidIdCheckerTest.java +++ b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/ValidIdCheckerTest.java @@ -16,16 +16,13 @@ package com.navercorp.pinpoint.bootstrap; -import java.util.regex.Pattern; - -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import org.junit.Test; +import java.util.regex.Pattern; /** - * * @author netspider - * */ public class ValidIdCheckerTest { @@ -33,22 +30,22 @@ public class ValidIdCheckerTest { @Test public void checkValidId() { - Assert.assertFalse(p.matcher("PINPOINT123").find()); - Assert.assertFalse(p.matcher("P1NPOINT").find()); - Assert.assertFalse(p.matcher("1PNPOINT").find()); - Assert.assertFalse(p.matcher("P1NPOINT.DEV").find()); - Assert.assertFalse(p.matcher("P1NPOINT..DEV").find()); - Assert.assertFalse(p.matcher("P1N.POINT.DEV").find()); - Assert.assertFalse(p.matcher("P1NPOINT-DEV").find()); - Assert.assertFalse(p.matcher("P1NPOINT_DEV").find()); - Assert.assertFalse(p.matcher("P1N_POINT_DEV").find()); + Assertions.assertFalse(p.matcher("PINPOINT123").find()); + Assertions.assertFalse(p.matcher("P1NPOINT").find()); + Assertions.assertFalse(p.matcher("1PNPOINT").find()); + Assertions.assertFalse(p.matcher("P1NPOINT.DEV").find()); + Assertions.assertFalse(p.matcher("P1NPOINT..DEV").find()); + Assertions.assertFalse(p.matcher("P1N.POINT.DEV").find()); + Assertions.assertFalse(p.matcher("P1NPOINT-DEV").find()); + Assertions.assertFalse(p.matcher("P1NPOINT_DEV").find()); + Assertions.assertFalse(p.matcher("P1N_POINT_DEV").find()); } @Test public void checkInvalidId() { - Assert.assertTrue(p.matcher("P1NPOINT가").find()); //include Korean character for test - Assert.assertTrue(p.matcher("P1NPOINT ").find()); - Assert.assertTrue(p.matcher("P1NPOINT+").find()); - Assert.assertTrue(p.matcher("PINPO+INT").find()); + Assertions.assertTrue(p.matcher("P1NPOINT가").find()); //include Korean character for test + Assertions.assertTrue(p.matcher("P1NPOINT ").find()); + Assertions.assertTrue(p.matcher("P1NPOINT+").find()); + Assertions.assertTrue(p.matcher("PINPO+INT").find()); } } diff --git a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/AgentDirBaseClassPathResolverTest.java b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/AgentDirBaseClassPathResolverTest.java index 38324a506d55..da5bbc26aaf6 100644 --- a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/AgentDirBaseClassPathResolverTest.java +++ b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/AgentDirBaseClassPathResolverTest.java @@ -19,12 +19,12 @@ import com.navercorp.pinpoint.bootstrap.AgentDirGenerator; import com.navercorp.pinpoint.common.Version; import com.navercorp.pinpoint.common.util.CodeSourceUtils; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URL; @@ -51,13 +51,13 @@ public class AgentDirBaseClassPathResolverTest { private static AgentDirGenerator agentDirGenerator; - @BeforeClass + @BeforeAll public static void beforeClass() throws Exception { Path classLocation = getClassLocation(AgentDirBaseClassPathResolverTest.class); logger.debug("buildDir:{}", classLocation); - String testDir = TEST_AGENT_DIR + '_' + AGENT_ID_ALLOCATOR.incrementAndGet();; + String testDir = TEST_AGENT_DIR + '_' + AGENT_ID_ALLOCATOR.incrementAndGet(); agentBuildDir = classLocation.resolve(testDir); logger.debug("agentBuildDir:{}", agentBuildDir); @@ -79,7 +79,7 @@ private static void createAgentDir(Path tempAgentDir) throws IOException { } - @AfterClass + @AfterAll public static void afterClass() throws Exception { if (agentDirGenerator != null) { agentDirGenerator.remove(); @@ -94,22 +94,22 @@ public void testFindAgentJar() { AgentDirBaseClassPathResolver classPathResolver = new AgentDirBaseClassPathResolver(agentBootstrapPath); AgentDirectory agentDirectory = classPathResolver.resolve(); - Assert.assertNotNull("verify agent directory ", agentDirectory); + Assertions.assertNotNull(agentDirectory, "verify agent directory "); Path findAgentJar = agentDirectory.getAgentJarName(); - Assert.assertNotNull(findAgentJar); + Assertions.assertNotNull(findAgentJar); Path agentJar = agentDirectory.getAgentJarName(); - Assert.assertEquals(BOOTSTRAP_JAR, agentJar); + Assertions.assertEquals(BOOTSTRAP_JAR, agentJar); Path agentPath = agentDirectory.getAgentJarFullPath(); - Assert.assertEquals(agentBootstrapPath, agentPath); + Assertions.assertEquals(agentBootstrapPath, agentPath); Path agentDirPath = agentDirectory.getAgentDirPath(); - Assert.assertEquals(agentBuildDir, agentDirPath); + Assertions.assertEquals(agentBuildDir, agentDirPath); Path agentLibPath = agentDirectory.getAgentLibPath(); - Assert.assertEquals(agentBuildDir.resolve("lib"), agentLibPath); + Assertions.assertEquals(agentBuildDir.resolve("lib"), agentLibPath); List bootstrapJarFile = agentDirectory.getBootDir().openJarFiles(); closeJarFile(bootstrapJarFile); @@ -147,13 +147,13 @@ public void findAgentJar() { private void findAgentJar(Path path) { AgentDirBaseClassPathResolver classPathResolver = new AgentDirBaseClassPathResolver(path); Path agentJar = classPathResolver.findBootstrapJar(path); - Assert.assertNotNull(agentJar); + Assertions.assertNotNull(agentJar); } private void findAgentJarAssertFail(Path path) { AgentDirBaseClassPathResolver classPathResolver = new AgentDirBaseClassPathResolver(path); Path agentJar = classPathResolver.findBootstrapJar(path); - Assert.assertNull(agentJar); + Assertions.assertNull(agentJar); } } diff --git a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/AgentVersionTest.java b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/AgentVersionTest.java index 869458f96693..9541f1159a95 100644 --- a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/AgentVersionTest.java +++ b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/AgentVersionTest.java @@ -16,13 +16,12 @@ package com.navercorp.pinpoint.bootstrap.agentdir; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.regex.Matcher; import java.util.regex.Pattern; - /** * @author Woonduk Kang(emeroad) */ @@ -55,12 +54,12 @@ public void testVersion_fail() { private void assertVersion(String versionString) { Matcher matcher = this.versionPattern.matcher(versionString); - Assert.assertTrue(matcher.matches()); + Assertions.assertTrue(matcher.matches()); } private void assertFalseVersion(String versionString) { Matcher matcher = this.versionPattern.matcher(versionString); - Assert.assertFalse(matcher.matches()); + Assertions.assertFalse(matcher.matches()); } } diff --git a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/JavaAgentPathResolverTest.java b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/JavaAgentPathResolverTest.java index 28226ef24328..00d526105f13 100644 --- a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/JavaAgentPathResolverTest.java +++ b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/JavaAgentPathResolverTest.java @@ -19,9 +19,9 @@ import com.navercorp.pinpoint.bootstrap.agentdir.JavaAgentPathResolver.ClassAgentPathFinder; import com.navercorp.pinpoint.bootstrap.agentdir.JavaAgentPathResolver.InputArgumentAgentPathFinder; import com.navercorp.pinpoint.common.Version; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; import java.io.File; import java.net.URI; @@ -31,6 +31,8 @@ import java.util.Collections; import java.util.List; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Woonduk Kang(emeroad) @@ -38,7 +40,7 @@ public class JavaAgentPathResolverTest { private final Logger logger = LogManager.getLogger(this.getClass()); - + @Test public void testInputArgument() { Path agentPath = Paths.get("/pinpoint/agent/target/pinpoint-agent-" + Version.VERSION + "/pinpoint-bootstrap-" + Version.VERSION + ".jar"); @@ -51,7 +53,7 @@ List getInputArguments() { } }; Path resolveJavaAgentPath = javaAgentPathResolver.getPath(); - org.junit.Assert.assertEquals(agentPath, resolveJavaAgentPath); + assertEquals(agentPath, resolveJavaAgentPath); } @Test @@ -66,7 +68,7 @@ List getInputArguments() { } }; Path resolveJavaAgentPath = javaAgentPathResolver.getPath(); - org.junit.Assert.assertEquals(agentPath, resolveJavaAgentPath); + assertEquals(agentPath, resolveJavaAgentPath); } @Test @@ -78,11 +80,11 @@ public void testClassAgentPath() { Path resolveTargetPath = Paths.get(URI.create(jarLocation)); logger.debug("{}", resolveTargetPath); - org.junit.Assert.assertTrue(resolveTargetPath.getFileName().toString().endsWith(".jar")); + assertTrue(resolveTargetPath.getFileName().toString().endsWith(".jar")); URL classLocation = clazz.getProtectionDomain().getCodeSource().getLocation(); Path classFile = getPath(classLocation); - org.junit.Assert.assertEquals(classFile, resolveTargetPath); + assertEquals(classFile, resolveTargetPath); } private Path getPath(URL classLocation) { diff --git a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/LogDirCleanerTest.java b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/LogDirCleanerTest.java index 7d84145c7858..d72d987e7bad 100644 --- a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/LogDirCleanerTest.java +++ b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/agentdir/LogDirCleanerTest.java @@ -1,13 +1,12 @@ package com.navercorp.pinpoint.bootstrap.agentdir; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import java.io.File; import java.io.IOException; -import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -16,8 +15,8 @@ public class LogDirCleanerTest { - @Rule - public TemporaryFolder temp = new TemporaryFolder(getRootDir(LogDirCleanerTest.class)); + @TempDir + public Path temp; private long time = System.currentTimeMillis(); @@ -25,19 +24,19 @@ private long nextTime() { return time += 10000; } - private static File getRootDir(Class clazz) { - String classPath = clazz.getName().replace('.', '/') + ".class"; - URL resource = clazz.getClassLoader().getResource(classPath); - int index = resource.getPath().indexOf(classPath); - if (index == -1) { - throw new RuntimeException("RootDir error " + resource); - } - String rootPath = resource.getPath().substring(0, index); - return new File(rootPath); - } +// private static File getRootDir(Class clazz) { +// String classPath = clazz.getName().replace('.', '/') + ".class"; +// URL resource = clazz.getClassLoader().getResource(classPath); +// int index = resource.getPath().indexOf(classPath); +// if (index == -1) { +// throw new RuntimeException("RootDir error " + resource); +// } +// String rootPath = resource.getPath().substring(0, index); +// return new File(rootPath); +// } - @Before + @BeforeEach public void setUp() throws Exception { File agentDir1 = newFolder("agentDir1"); @@ -49,37 +48,38 @@ public void setUp() throws Exception { } private File newFolder(String agentDir1) throws IOException { - File file = temp.newFolder(agentDir1); + File file = new File(temp.resolve(agentDir1).toString()); + file.mkdir(); file.setLastModified(nextTime()); return file; } @Test public void clean0() { - LogDirCleaner logDirCleaner = new LogDirCleaner(temp.getRoot().toPath(), 0); + LogDirCleaner logDirCleaner = new LogDirCleaner(temp, 0); logDirCleaner.clean(); - String[] files = temp.getRoot().list(); - org.junit.Assert.assertEquals(0, files.length); + String[] files = temp.toFile().list(); + Assertions.assertEquals(0, files.length); } @Test public void clean2() { - LogDirCleaner logDirCleaner = new LogDirCleaner(temp.getRoot().toPath(), 2); + LogDirCleaner logDirCleaner = new LogDirCleaner(temp, 2); logDirCleaner.clean(); - List files = Arrays.asList(temp.getRoot().list()); - org.junit.Assert.assertEquals(2, files.size()); - org.junit.Assert.assertTrue(files.contains("agentDir2")); - org.junit.Assert.assertTrue(files.contains("agentDir3")); + List files = Arrays.asList(temp.toFile().list()); + Assertions.assertEquals(2, files.size()); + Assertions.assertTrue(files.contains("agentDir2")); + Assertions.assertTrue(files.contains("agentDir3")); } @Test public void clean5() { - LogDirCleaner logDirCleaner = new LogDirCleaner(temp.getRoot().toPath(), 5); + LogDirCleaner logDirCleaner = new LogDirCleaner(temp, 5); logDirCleaner.clean(); - String[] files = temp.getRoot().list(); - org.junit.Assert.assertEquals(3, files.length); + String[] files = temp.toFile().list(); + Assertions.assertEquals(3, files.length); } } \ No newline at end of file diff --git a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfileLogConfigResolverTest.java b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfileLogConfigResolverTest.java index 571a8738314a..44496c457550 100644 --- a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfileLogConfigResolverTest.java +++ b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfileLogConfigResolverTest.java @@ -16,19 +16,18 @@ package com.navercorp.pinpoint.bootstrap.config; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; import java.net.URL; -import static org.junit.Assert.*; - /** * @author Woonduk Kang(emeroad) */ public class ProfileLogConfigResolverTest { private final Logger logger = LogManager.getLogger(this.getClass()); + @Test public void getLogPath() { URL resource = getClass().getClassLoader().getResource("log4j2-test.xml"); diff --git a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfilePropertyLoaderTest.java b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfilePropertyLoaderTest.java index 407b9358fe39..a4f32c3cdd37 100644 --- a/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfilePropertyLoaderTest.java +++ b/bootstraps/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfilePropertyLoaderTest.java @@ -17,12 +17,13 @@ package com.navercorp.pinpoint.bootstrap.config; import com.navercorp.pinpoint.common.util.PropertySnapshot; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import java.io.File; +import java.io.IOException; +import java.nio.file.Path; import java.nio.file.Paths; import java.util.Properties; @@ -30,19 +31,19 @@ * @author Woonduk Kang(emeroad) */ public class ProfilePropertyLoaderTest { - @Rule - public TemporaryFolder folder = new TemporaryFolder(); + @TempDir + public Path temp; @Test - public void isAllowPinpointProperty() { + public void isAllowPinpointProperty() throws IOException { PropertySnapshot properties = new PropertySnapshot(new Properties()); properties.setProperty("pinpoint.test", "a"); - File root = folder.getRoot(); + File root = new File(temp.toString()); ProfilePropertyLoader loader = new ProfilePropertyLoader(properties, properties, root.toPath(), Paths.get("test"), new String[]{"test"}); - Assert.assertTrue(loader.isAllowPinpointProperty("pinpoint.test")); + Assertions.assertTrue(loader.isAllowPinpointProperty("pinpoint.test")); - Assert.assertFalse(loader.isAllowPinpointProperty("unknown.test")); + Assertions.assertFalse(loader.isAllowPinpointProperty("unknown.test")); } } \ No newline at end of file diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/LoggerTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/LoggerTest.java index e4ce8d0a725b..397cca8f653d 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/LoggerTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/LoggerTest.java @@ -16,9 +16,9 @@ package com.navercorp.pinpoint.collector; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; /** * @author emeroad diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/ClusterAddressProviderTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/ClusterAddressProviderTest.java index c6a35f05884c..3ad83918e3bc 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/ClusterAddressProviderTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/ClusterAddressProviderTest.java @@ -18,9 +18,8 @@ import com.navercorp.pinpoint.collector.util.Address; import com.navercorp.pinpoint.collector.util.MultipleAddress; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.InetSocketAddress; import java.util.Arrays; @@ -41,7 +40,7 @@ public void clusterAddressProviderTest() { InetSocketAddress current = multiAddressProvider.resolve(); if (current == null || current.equals(prev)) { - Assert.fail(); + Assertions.fail(); } prev = current; } @@ -52,9 +51,11 @@ private Address createMultipleAddress() { return new MultipleAddress(hostAddresses, 9994); } - @Test(expected = NullPointerException.class) + @Test public void failedToCreateTest() { - ClusterAddressProvider multiAddressProvider = new ClusterAddressProvider(null); + Assertions.assertThrows(NullPointerException.class, () -> { + ClusterAddressProvider multiAddressProvider = new ClusterAddressProvider(null); + }); } } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/route/DefaultRouteHandlerTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/route/DefaultRouteHandlerTest.java index 4bfed8d0c9ac..59ff829ed632 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/route/DefaultRouteHandlerTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/route/DefaultRouteHandlerTest.java @@ -23,8 +23,8 @@ import com.navercorp.pinpoint.thrift.dto.command.TCommandTransfer; import com.navercorp.pinpoint.thrift.dto.command.TCommandTransferResponse; import com.navercorp.pinpoint.thrift.dto.command.TRouteResult; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.InetSocketAddress; @@ -43,16 +43,16 @@ public void testName() { routeHandler.addRequestFilter(requestFilter); TCommandTransferResponse response = routeHandler.onRoute(createRequestEvent()); - Assert.assertEquals(1, requestFilter.getCallCount()); + Assertions.assertEquals(1, requestFilter.getCallCount()); CountFilter responseFilter = new CountFilter<>(); routeHandler.addResponseFilter(responseFilter); response = routeHandler.onRoute(createRequestEvent()); - Assert.assertEquals(2, requestFilter.getCallCount()); - Assert.assertEquals(1, responseFilter.getCallCount()); + Assertions.assertEquals(2, requestFilter.getCallCount()); + Assertions.assertEquals(1, responseFilter.getCallCount()); - Assert.assertEquals(TRouteResult.NOT_FOUND, response.getRouteResult()); + Assertions.assertEquals(TRouteResult.NOT_FOUND, response.getRouteResult()); } private RequestEvent createRequestEvent() { diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/route/GrpcAgentConnectionTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/route/GrpcAgentConnectionTest.java index 97cc365ea97e..65bb6ef9114d 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/route/GrpcAgentConnectionTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/route/GrpcAgentConnectionTest.java @@ -23,9 +23,8 @@ import com.navercorp.pinpoint.thrift.dto.TResult; import com.navercorp.pinpoint.thrift.dto.command.TCommandEcho; import com.navercorp.pinpoint.thrift.io.TCommandType; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.util.Collections; @@ -44,22 +43,22 @@ public void requestTest() { GrpcAgentConnection grpcAgentConnection = new GrpcAgentConnection(mockGrpcServer, supportCommandList); boolean supportCommand = grpcAgentConnection.isSupportCommand(TCommandType.TRANSFER.getBodyFactory().getObject()); - Assert.assertFalse(supportCommand); + Assertions.assertFalse(supportCommand); supportCommand = grpcAgentConnection.isSupportCommand(TCommandType.RESULT.getBodyFactory().getObject()); - Assert.assertFalse(supportCommand); + Assertions.assertFalse(supportCommand); supportCommand = grpcAgentConnection.isSupportCommand(TCommandType.ECHO.getBodyFactory().getObject()); - Assert.assertTrue(supportCommand); + Assertions.assertTrue(supportCommand); Future future = grpcAgentConnection.request(new TResult()); - Assert.assertFalse(future.isSuccess()); - Assert.assertNotNull(future.getCause()); + Assertions.assertFalse(future.isSuccess()); + Assertions.assertNotNull(future.getCause()); TCommandEcho commandEcho = new TCommandEcho("hello"); // check to pass validation future = grpcAgentConnection.request(commandEcho); - Assert.assertNull(future); + Assertions.assertNull(future); } @Test @@ -69,11 +68,11 @@ public void equalsTest() { List supportCommandList = Collections.singletonList(Short.toUnsignedInt(TCommandType.ECHO.getCode())); GrpcAgentConnection grpcAgentConnection = new GrpcAgentConnection(mockGrpcServer1, supportCommandList); - Assert.assertEquals(grpcAgentConnection, grpcAgentConnection); - Assert.assertEquals(grpcAgentConnection, new GrpcAgentConnection(mockGrpcServer1, supportCommandList)); + Assertions.assertEquals(grpcAgentConnection, grpcAgentConnection); + Assertions.assertEquals(grpcAgentConnection, new GrpcAgentConnection(mockGrpcServer1, supportCommandList)); PinpointGrpcServer mockGrpcServer2 = Mockito.mock(PinpointGrpcServer.class); - Assert.assertNotEquals(grpcAgentConnection, new GrpcAgentConnection(mockGrpcServer2, supportCommandList)); + Assertions.assertNotEquals(grpcAgentConnection, new GrpcAgentConnection(mockGrpcServer2, supportCommandList)); } } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/route/filter/AgentEventHandlingFilterTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/route/filter/AgentEventHandlingFilterTest.java index 188e1cd9bc56..ddefe2e812c0 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/route/filter/AgentEventHandlingFilterTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/route/filter/AgentEventHandlingFilterTest.java @@ -34,14 +34,14 @@ import com.navercorp.pinpoint.thrift.io.DeserializerFactory; import com.navercorp.pinpoint.thrift.io.HeaderTBaseDeserializer; import org.apache.thrift.TBase; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; @@ -71,14 +71,14 @@ public class AgentEventHandlingFilterTest { private static final long TEST_START_TIMESTAMP = System.currentTimeMillis(); private static final long TEST_EVENT_TIMESTAMP = TEST_START_TIMESTAMP + 10; - @Before + @BeforeEach public void setUp() throws Exception { MockitoAnnotations.initMocks(this); agentEventHandlingFilter = new AgentEventHandlingFilter(agentEventService, deserializerFactory); } @Test - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) public void handler_should_handle_serialization_of_request_events() throws Exception { // given final AgentEventType expectedEventType = AgentEventType.USER_THREAD_DUMP; @@ -98,7 +98,7 @@ public void handler_should_handle_serialization_of_request_events() throws Excep ArgumentCaptor argCaptor = ArgumentCaptor.forClass(AgentEventBo.class); HeaderTBaseDeserializer deserializer = mock(HeaderTBaseDeserializer.class); when(this.deserializerFactory.createDeserializer()).thenReturn(deserializer); - Message> message = new DefaultMessage<>(new HeaderV1((short)1000), HeaderEntity.EMPTY_HEADER_ENTITY, expectedThreadDumpResponse); + Message> message = new DefaultMessage<>(new HeaderV1((short) 1000), HeaderEntity.EMPTY_HEADER_ENTITY, expectedThreadDumpResponse); when(deserializer.deserialize(expectedThreadDumpResponseBody)).thenReturn(message); // when this.agentEventHandlingFilter.handleResponseEvent(responseEvent, TEST_EVENT_TIMESTAMP); @@ -113,7 +113,7 @@ public void handler_should_handle_serialization_of_request_events() throws Excep } @Test - @SuppressWarnings({ "rawtypes", "unchecked" }) + @SuppressWarnings({"rawtypes", "unchecked"}) public void handler_should_ignore_request_events_with_unsupported_message_types() throws Exception { // given final TCommandEcho mismatchingResponse = new TCommandEcho(); @@ -132,7 +132,7 @@ public void handler_should_ignore_request_events_with_unsupported_message_types( ArgumentCaptor argCaptor = ArgumentCaptor.forClass(AgentEventBo.class); HeaderTBaseDeserializer deserializer = mock(HeaderTBaseDeserializer.class); when(this.deserializerFactory.createDeserializer()).thenReturn(deserializer); - Message> message = new DefaultMessage<>(new HeaderV1((short)1000), HeaderEntity.EMPTY_HEADER_ENTITY, mismatchingResponse); + Message> message = new DefaultMessage<>(new HeaderV1((short) 1000), HeaderEntity.EMPTY_HEADER_ENTITY, mismatchingResponse); when(deserializer.deserialize(mismatchingResponseBody)).thenReturn(message); // when this.agentEventHandlingFilter.handleResponseEvent(responseEvent, TEST_EVENT_TIMESTAMP); diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/zookeeper/ZookeeperJobWorkerTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/zookeeper/ZookeeperJobWorkerTest.java index 6ae7b63a5749..d680e653688e 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/zookeeper/ZookeeperJobWorkerTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/cluster/zookeeper/ZookeeperJobWorkerTest.java @@ -33,8 +33,8 @@ import org.apache.logging.log4j.Logger; import org.awaitility.Awaitility; import org.awaitility.core.ConditionFactory; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; @@ -86,7 +86,7 @@ public void test1() throws Exception { } waitZookeeperServerData(random, zookeeperClient); - Assert.assertEquals(random, manager.getClusterData().size()); + Assertions.assertEquals(random, manager.getClusterData().size()); } finally { manager.stop(); } @@ -106,11 +106,11 @@ public void test2() throws Exception { PinpointServer mockServer = createMockPinpointServer("app", "agent", System.currentTimeMillis()); clusterPointStateChangedEventHandler.stateUpdated(mockServer, SocketStateCode.RUN_DUPLEX); waitZookeeperServerData(1, zookeeperClient); - Assert.assertEquals(1, manager.getClusterData().size()); + Assertions.assertEquals(1, manager.getClusterData().size()); clusterPointStateChangedEventHandler.stateUpdated(mockServer, SocketStateCode.CLOSED_BY_CLIENT); waitZookeeperServerData(0, zookeeperClient); - Assert.assertEquals(0, manager.getClusterData().size()); + Assertions.assertEquals(0, manager.getClusterData().size()); } finally { manager.stop(); } @@ -130,7 +130,7 @@ public void test3() throws Exception { PinpointServer mockServer = createMockPinpointServer("app", "agent", System.currentTimeMillis()); clusterPointStateChangedEventHandler.stateUpdated(mockServer, SocketStateCode.RUN_DUPLEX); waitZookeeperServerData(1, zookeeperClient); - Assert.assertEquals(1, manager.getClusterData().size()); + Assertions.assertEquals(1, manager.getClusterData().size()); zookeeperClient.createPath(PATH); CreateNodeMessage createNodeMessage = new CreateNodeMessage(PATH, new byte[0]); @@ -145,11 +145,11 @@ public void test3() throws Exception { } waitZookeeperServerData(0, zookeeperClient); - Assert.assertEquals(0, manager.getClusterData().size()); + Assertions.assertEquals(0, manager.getClusterData().size()); manager.refresh(); waitZookeeperServerData(1, zookeeperClient); - Assert.assertEquals(1, manager.getClusterData().size()); + Assertions.assertEquals(1, manager.getClusterData().size()); } finally { manager.stop(); } @@ -173,11 +173,11 @@ public void test4() throws Exception { clusterPointStateChangedEventHandler.stateUpdated(mockServer2, SocketStateCode.RUN_DUPLEX); waitZookeeperServerData(2, zookeeperClient); - Assert.assertEquals(2, manager.getClusterData().size()); + Assertions.assertEquals(2, manager.getClusterData().size()); clusterPointStateChangedEventHandler.stateUpdated(mockServer1, SocketStateCode.CLOSED_BY_SERVER); waitZookeeperServerData(1, zookeeperClient); - Assert.assertEquals(1, manager.getClusterData().size()); + Assertions.assertEquals(1, manager.getClusterData().size()); } finally { manager.stop(); } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/config/AnnotationVisitorTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/config/AnnotationVisitorTest.java index 76e9ff9fd389..0252914776bb 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/config/AnnotationVisitorTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/config/AnnotationVisitorTest.java @@ -17,16 +17,16 @@ package com.navercorp.pinpoint.collector.config; import com.navercorp.pinpoint.common.server.config.AnnotationVisitor; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.lang.reflect.Field; @@ -36,7 +36,7 @@ */ @TestPropertySource(properties = "test.port=111") @ContextConfiguration(classes = AnnotationVisitorTest.TestConfig.class) -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) public class AnnotationVisitorTest { private final Logger logger = LogManager.getLogger(this.getClass()); @@ -57,12 +57,12 @@ public void test() { @Override public void visit(Field field, Object value) { if (field.getName().equals("port")) { - Assert.assertEquals(port , value); + Assertions.assertEquals(port, value); touch = true; } } }); - Assert.assertTrue(touch); + Assertions.assertTrue(touch); } public static class TestConfig { diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/config/CollectorConfigurationTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/config/CollectorConfigurationTest.java index 769c92303de2..55fe4b6cb0e1 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/config/CollectorConfigurationTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/config/CollectorConfigurationTest.java @@ -16,20 +16,20 @@ package com.navercorp.pinpoint.collector.config; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; 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.junit.jupiter.SpringExtension; /** * @author emeroad */ @TestPropertySource(locations = "classpath:test-pinpoint-collector.properties") @ContextConfiguration(classes = CollectorConfiguration.class) -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) public class CollectorConfigurationTest { @Autowired @@ -37,9 +37,9 @@ public class CollectorConfigurationTest { @Test public void l4IpTest() { - Assert.assertTrue(collectorConfiguration.getL4IpList().contains("127.0.0.1")); - Assert.assertTrue(collectorConfiguration.getL4IpList().contains("192.168.0.1")); - Assert.assertTrue(collectorConfiguration.getL4IpList().contains("255.255.255.255")); + Assertions.assertTrue(collectorConfiguration.getL4IpList().contains("127.0.0.1")); + Assertions.assertTrue(collectorConfiguration.getL4IpList().contains("192.168.0.1")); + Assertions.assertTrue(collectorConfiguration.getL4IpList().contains("255.255.255.255")); } } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/config/PropertiesVerificationTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/config/PropertiesVerificationTest.java index 3575590c3ee1..3f4f410945b8 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/config/PropertiesVerificationTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/config/PropertiesVerificationTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.common.util.PropertyUtils; import com.navercorp.pinpoint.common.util.StringUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -29,17 +29,17 @@ public class PropertiesVerificationTest { private static final String LOCAL_HOST = "localhost"; - private static final String HBASE_CLIENT_HOST_VALUE = "${pinpoint.zookeeper.address}"; + private static final String HBASE_CLIENT_HOST_VALUE = "${pinpoint.zookeeper.address}"; @Test public void checkHbasePropertiesTest() throws Exception { Properties properties = PropertyUtils.loadPropertyFromClassPath("profiles/release/hbase.properties"); String clientHost = properties.getProperty("hbase.client.host"); - Assert.assertEquals(HBASE_CLIENT_HOST_VALUE, clientHost); + Assertions.assertEquals(HBASE_CLIENT_HOST_VALUE, clientHost); String clientPort = properties.getProperty("hbase.client.port"); - Assert.assertEquals("2181", clientPort); + Assertions.assertEquals("2181", clientPort); } @Test @@ -47,34 +47,34 @@ public void checkCollectionPropertiesTest() throws Exception { Properties properties = PropertyUtils.loadPropertyFromClassPath("pinpoint-collector-root.properties"); String receiverIp = properties.getProperty("collector.receiver.base.ip"); - Assert.assertEquals("0.0.0.0", receiverIp); + Assertions.assertEquals("0.0.0.0", receiverIp); receiverIp = properties.getProperty("collector.receiver.stat.udp.ip"); - Assert.assertEquals("0.0.0.0", receiverIp); + Assertions.assertEquals("0.0.0.0", receiverIp); receiverIp = properties.getProperty("collector.receiver.stat.tcp.ip"); - Assert.assertEquals("0.0.0.0", receiverIp); + Assertions.assertEquals("0.0.0.0", receiverIp); receiverIp = properties.getProperty("collector.receiver.span.udp.ip"); - Assert.assertEquals("0.0.0.0", receiverIp); + Assertions.assertEquals("0.0.0.0", receiverIp); receiverIp = properties.getProperty("collector.receiver.span.tcp.ip"); - Assert.assertEquals("0.0.0.0", receiverIp); + Assertions.assertEquals("0.0.0.0", receiverIp); String l4Ip = properties.getProperty("collector.l4.ip"); - Assert.assertTrue(StringUtils.isEmpty(l4Ip)); + Assertions.assertTrue(StringUtils.isEmpty(l4Ip)); String pinpointZKAddress = properties.getProperty("pinpoint.zookeeper.address"); - Assert.assertEquals(LOCAL_HOST, pinpointZKAddress); + Assertions.assertEquals(LOCAL_HOST, pinpointZKAddress); String zookeeperAddress = properties.getProperty("cluster.zookeeper.address"); - Assert.assertEquals(HBASE_CLIENT_HOST_VALUE, zookeeperAddress); + Assertions.assertEquals(HBASE_CLIENT_HOST_VALUE, zookeeperAddress); zookeeperAddress = properties.getProperty("flink.cluster.zookeeper.address"); - Assert.assertEquals(HBASE_CLIENT_HOST_VALUE, zookeeperAddress); + Assertions.assertEquals(HBASE_CLIENT_HOST_VALUE, zookeeperAddress); String clusterListenIp = properties.getProperty("cluster.listen.ip"); - Assert.assertTrue(StringUtils.isEmpty(clusterListenIp)); + Assertions.assertTrue(StringUtils.isEmpty(clusterListenIp)); } } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseApplicationTraceIndexColumnTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseApplicationTraceIndexColumnTest.java index 07d58105784d..c8e73cc24029 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseApplicationTraceIndexColumnTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseApplicationTraceIndexColumnTest.java @@ -16,18 +16,14 @@ package com.navercorp.pinpoint.collector.dao.hbase; -import org.junit.Assert; - -import org.junit.Test; - import com.navercorp.pinpoint.common.buffer.AutomaticBuffer; import com.navercorp.pinpoint.common.buffer.Buffer; import com.navercorp.pinpoint.common.buffer.OffsetFixedBuffer; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** - * * @author netspider - * */ public class HbaseApplicationTraceIndexColumnTest { @@ -54,10 +50,10 @@ public void indexedColumnName() { final Buffer fetched = new OffsetFixedBuffer(source); - Assert.assertEquals(elapsed, fetched.readVInt()); - Assert.assertEquals(agentId, fetched.readPrefixedString()); - Assert.assertEquals(agentStartTime, fetched.readSVLong()); - Assert.assertEquals(transactionSequence, fetched.readVLong()); + Assertions.assertEquals(elapsed, fetched.readVInt()); + Assertions.assertEquals(agentId, fetched.readPrefixedString()); + Assertions.assertEquals(agentStartTime, fetched.readSVLong()); + Assertions.assertEquals(transactionSequence, fetched.readVLong()); } @Test diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseHostApplicationMapDaoTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseHostApplicationMapDaoTest.java index 2e91af5334cb..d774542381a9 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseHostApplicationMapDaoTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseHostApplicationMapDaoTest.java @@ -19,16 +19,14 @@ import com.navercorp.pinpoint.common.buffer.Buffer; import com.navercorp.pinpoint.common.buffer.FixedBuffer; import com.navercorp.pinpoint.common.hbase.HbaseTableConstants; -import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.server.util.DefaultTimeSlot; import com.navercorp.pinpoint.common.server.util.TimeSlot; +import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.util.TimeUtils; - -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; - +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class HbaseHostApplicationMapDaoTest { @@ -47,8 +45,8 @@ public void testCreateRowKey() { short code = readBuffer.readShort(); long time = TimeUtils.recoveryTimeMillis(readBuffer.readLong()); - Assert.assertEquals("applicationName check",appName, "parentApp"); - Assert.assertEquals("serviceType check", code, ServiceType.STAND_ALONE.getCode()); - Assert.assertEquals("time check", statisticsRowSlot, time); + Assertions.assertEquals(appName, "parentApp", "applicationName check"); + Assertions.assertEquals(code, ServiceType.STAND_ALONE.getCode(), "serviceType check"); + Assertions.assertEquals(statisticsRowSlot, time, "time check"); } } \ No newline at end of file diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/ReactorNettyBugWorkaroundFilterTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/ReactorNettyBugWorkaroundFilterTest.java index efd2e7f0a658..0dadd5a19791 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/ReactorNettyBugWorkaroundFilterTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/ReactorNettyBugWorkaroundFilterTest.java @@ -2,8 +2,8 @@ import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.trace.ServiceTypeBuilder; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class ReactorNettyBugWorkaroundFilterTest { @@ -13,20 +13,20 @@ public class ReactorNettyBugWorkaroundFilterTest { public void filter_servlet() { ServiceType serviceType = ServiceType.SERVLET; - Assert.assertFalse(filter.filter(serviceType, "/url")); - Assert.assertFalse(filter.filter(serviceType, "url?test=a")); + Assertions.assertFalse(filter.filter(serviceType, "/url")); + Assertions.assertFalse(filter.filter(serviceType, "url?test=a")); - Assert.assertFalse(filter.filter(serviceType, "localhost:1234")); + Assertions.assertFalse(filter.filter(serviceType, "localhost:1234")); } @Test public void filter_netty() { ServiceType serviceType = newReactorNettyClient(); - Assert.assertTrue(filter.filter(serviceType, "/url")); - Assert.assertTrue(filter.filter(serviceType, "url?test=a")); + Assertions.assertTrue(filter.filter(serviceType, "/url")); + Assertions.assertTrue(filter.filter(serviceType, "url?test=a")); - Assert.assertFalse(filter.filter(serviceType, "localhost:1234")); + Assertions.assertFalse(filter.filter(serviceType, "localhost:1234")); } private ServiceType newReactorNettyClient() { @@ -39,14 +39,14 @@ private ServiceType newReactorNettyClient() { public void filter_null() { ServiceType serviceType = newReactorNettyClient(); - Assert.assertFalse(filter.filter(serviceType, null)); + Assertions.assertFalse(filter.filter(serviceType, null)); } @Test public void filter_empty() { ServiceType serviceType = newReactorNettyClient(); - Assert.assertFalse(filter.filter(serviceType, "")); + Assertions.assertFalse(filter.filter(serviceType, "")); } } \ No newline at end of file diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/BulkIncrementerTestClazz.java b/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/BulkIncrementerTestClazz.java index dae42384e07c..ae3b72734105 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/BulkIncrementerTestClazz.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/BulkIncrementerTestClazz.java @@ -17,14 +17,13 @@ package com.navercorp.pinpoint.collector.dao.hbase.statistics; import com.navercorp.pinpoint.common.util.BytesUtils; - import com.sematext.hbase.wd.RowKeyDistributorByHashPrefix; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Increment; import org.apache.hadoop.hbase.util.Bytes; -import org.junit.Assert; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; import org.springframework.util.CollectionUtils; import java.nio.ByteBuffer; @@ -114,17 +113,17 @@ public void verify(TestDataSet testDataSet) { long expectedCount = testDataSet.getCount(); Map> rows = resultMap.get(expectedTableName); if (rows == null) { - Assert.fail("Expected rows not found for " + testDataSet); + Assertions.fail("Expected rows not found for " + testDataSet); } Map keyValues = rows.get(ByteBuffer.wrap(expectedRowKey.getRowKey())); if (keyValues == null) { - Assert.fail("Expected row not found for " + testDataSet); + Assertions.fail("Expected row not found for " + testDataSet); } Long actualCount = keyValues.get(ByteBuffer.wrap(expectedColumnName.getColumnName())); if (actualCount == null) { - Assert.fail("Expected column not found for " + testDataSet); + Assertions.fail("Expected column not found for " + testDataSet); } - Assert.assertEquals("Expected counts do not match for " + testDataSet, expectedCount, (long) actualCount); + Assertions.assertEquals(expectedCount, (long) actualCount, "Expected counts do not match for " + testDataSet); } } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/DefaultBulkUpdaterTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/DefaultBulkUpdaterTest.java index 3d236fac8914..cfc7ff7d438a 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/DefaultBulkUpdaterTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/DefaultBulkUpdaterTest.java @@ -22,18 +22,17 @@ import com.navercorp.pinpoint.collector.dao.hbase.statistics.BulkIncrementerTestClazz.TestData; import com.navercorp.pinpoint.collector.dao.hbase.statistics.BulkIncrementerTestClazz.TestDataSet; import com.navercorp.pinpoint.collector.dao.hbase.statistics.BulkIncrementerTestClazz.TestVerifier; - import com.sematext.hbase.wd.RowKeyDistributorByHashPrefix; import org.apache.commons.collections4.ListUtils; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Increment; import org.apache.hadoop.hbase.util.Bytes; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.ArrayList; import java.util.Collections; @@ -49,7 +48,7 @@ /** * @author HyunGil Jeong */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class DefaultBulkUpdaterTest { private static final byte[] CF = Bytes.toBytes("CF"); @@ -60,7 +59,7 @@ public class DefaultBulkUpdaterTest { private final BulkIncrementer bulkIncrementer = bulkIncrementerFactory.wrap( new DefaultBulkIncrementer(new RowKeyMerge(CF)), Integer.MAX_VALUE, reporter); - @AfterClass + @AfterAll public static void afterClass() { bulkIncrementerFactory.close(); } @@ -68,7 +67,7 @@ public static void afterClass() { @Mock private RowKeyDistributorByHashPrefix rowKeyDistributor; - @Before + @BeforeEach public void setUp() { when(rowKeyDistributor.getDistributedKey(any(byte[].class))).then(invocation -> invocation.getArgument(0)); } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/SizeLimitedBulkIncrementerTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/SizeLimitedBulkIncrementerTest.java index 754479a8f1fe..625c4e45e8c4 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/SizeLimitedBulkIncrementerTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/statistics/SizeLimitedBulkIncrementerTest.java @@ -22,19 +22,18 @@ import com.navercorp.pinpoint.collector.dao.hbase.statistics.BulkIncrementerTestClazz.TestData; import com.navercorp.pinpoint.collector.dao.hbase.statistics.BulkIncrementerTestClazz.TestDataSet; import com.navercorp.pinpoint.collector.dao.hbase.statistics.BulkIncrementerTestClazz.TestVerifier; - import com.sematext.hbase.wd.RowKeyDistributorByHashPrefix; import org.apache.commons.collections4.ListUtils; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Increment; import org.apache.hadoop.hbase.util.Bytes; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -48,12 +47,10 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; -; - /** * @author Taejin Koo */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class SizeLimitedBulkIncrementerTest { private static final byte[] CF = Bytes.toBytes("CF"); @@ -66,7 +63,7 @@ public class SizeLimitedBulkIncrementerTest { private final BulkIncrementer bulkIncrementer = bulkIncrementerFactory.wrap( new DefaultBulkIncrementer(new RowKeyMerge(CF)), 1000, reporter); - @AfterClass + @AfterAll public static void afterClass() { bulkIncrementerFactory.close(); } @@ -74,7 +71,7 @@ public static void afterClass() { @Mock private RowKeyDistributorByHashPrefix rowKeyDistributor; - @Before + @BeforeEach public void setUp() { when(rowKeyDistributor.getDistributedKey(any(byte[].class))).then(invocation -> invocation.getArgument(0)); } @@ -246,7 +243,7 @@ public void multipleTablesConcurrent() throws Exception { actualTotalCount += actualCount; } - Assert.assertTrue(actualTotalCount > bulkLimitSize); + Assertions.assertTrue(actualTotalCount > bulkLimitSize); } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcAgentDataReceiverConfigurationTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcAgentDataReceiverConfigurationTest.java index f20cd8361568..09313e7b7e36 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcAgentDataReceiverConfigurationTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcAgentDataReceiverConfigurationTest.java @@ -19,20 +19,20 @@ import com.navercorp.pinpoint.collector.config.ExecutorConfiguration; import com.navercorp.pinpoint.collector.receiver.BindAddress; import com.navercorp.pinpoint.grpc.server.ServerOption; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; @EnableConfigurationProperties @TestPropertySource(locations = "classpath:test-pinpoint-collector.properties") @ContextConfiguration(classes = GrpcAgentDataReceiverConfigurationFactory.class) -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) public class GrpcAgentDataReceiverConfigurationTest { @Autowired diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcAgentDataSslReceiverConfigurationTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcAgentDataSslReceiverConfigurationTest.java index 6a8c2f8c4434..a40398b934f3 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcAgentDataSslReceiverConfigurationTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcAgentDataSslReceiverConfigurationTest.java @@ -17,25 +17,24 @@ package com.navercorp.pinpoint.collector.grpc.config; import com.navercorp.pinpoint.collector.receiver.BindAddress; - -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.core.io.Resource; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.io.File; import java.io.IOException; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; @EnableConfigurationProperties @TestPropertySource(locations = "classpath:test-pinpoint-collector.properties") @ContextConfiguration(classes = GrpcAgentDataSslReceiverConfigurationFactory.class) -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) public class GrpcAgentDataSslReceiverConfigurationTest { @Autowired diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcSpanReceiverConfigurationTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcSpanReceiverConfigurationTest.java index f7ff6d4d503c..a7c2dce550b5 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcSpanReceiverConfigurationTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcSpanReceiverConfigurationTest.java @@ -17,18 +17,17 @@ package com.navercorp.pinpoint.collector.grpc.config; import com.navercorp.pinpoint.grpc.server.ServerOption; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - +import org.springframework.test.context.junit.jupiter.SpringExtension; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Woonduk Kang(emeroad) @@ -36,7 +35,7 @@ @EnableConfigurationProperties @TestPropertySource(locations = "classpath:test-pinpoint-collector.properties") @ContextConfiguration(classes = GrpcSpanReceiverConfigurationFactory.class) -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) public class GrpcSpanReceiverConfigurationTest { private final Logger logger = LogManager.getLogger(this.getClass()); diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcSpanSslReceiverConfigurationTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcSpanSslReceiverConfigurationTest.java index e87ccded6290..ed3ba17686e4 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcSpanSslReceiverConfigurationTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcSpanSslReceiverConfigurationTest.java @@ -17,26 +17,25 @@ package com.navercorp.pinpoint.collector.grpc.config; import com.navercorp.pinpoint.collector.receiver.BindAddress; - -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.core.io.Resource; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.io.File; import java.io.IOException; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; @EnableConfigurationProperties @TestPropertySource(locations = "classpath:test-pinpoint-collector.properties") @ContextConfiguration(classes = {GrpcAgentDataSslReceiverConfigurationFactory.class, GrpcSpanSslReceiverConfigurationFactory.class}) -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) public class GrpcSpanSslReceiverConfigurationTest { @Autowired diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcStatReceiverConfigurationTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcStatReceiverConfigurationTest.java index 964aa095b216..fb970564fe88 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcStatReceiverConfigurationTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcStatReceiverConfigurationTest.java @@ -17,20 +17,20 @@ package com.navercorp.pinpoint.collector.grpc.config; import com.navercorp.pinpoint.grpc.server.ServerOption; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; @EnableConfigurationProperties @TestPropertySource(locations = "classpath:test-pinpoint-collector.properties") @ContextConfiguration(classes = GrpcStatReceiverConfigurationFactory.class) -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) public class GrpcStatReceiverConfigurationTest { @Autowired diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcStatSslReceiverConfigurationTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcStatSslReceiverConfigurationTest.java index 09d32f985d14..5ccbd4179c97 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcStatSslReceiverConfigurationTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/grpc/config/GrpcStatSslReceiverConfigurationTest.java @@ -17,26 +17,25 @@ package com.navercorp.pinpoint.collector.grpc.config; import com.navercorp.pinpoint.collector.receiver.BindAddress; - -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.core.io.Resource; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.io.File; import java.io.IOException; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; @EnableConfigurationProperties @TestPropertySource(locations = "classpath:test-pinpoint-collector.properties") -@ContextConfiguration(classes = {GrpcAgentDataSslReceiverConfigurationFactory.class,GrpcStatSslReceiverConfigurationFactory.class}) -@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(classes = {GrpcAgentDataSslReceiverConfigurationFactory.class, GrpcStatSslReceiverConfigurationFactory.class}) +@ExtendWith(SpringExtension.class) public class GrpcStatSslReceiverConfigurationTest { @Autowired diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentUriStatHandlerV2Test.java b/collector/src/test/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentUriStatHandlerV2Test.java index 966021c83083..a4af2de071bf 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentUriStatHandlerV2Test.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/handler/grpc/GrpcAgentUriStatHandlerV2Test.java @@ -31,17 +31,15 @@ import com.navercorp.pinpoint.grpc.trace.PEachUriStat; import com.navercorp.pinpoint.grpc.trace.PUriHistogram; import com.navercorp.pinpoint.io.request.ServerRequest; - import io.grpc.Context; import io.grpc.StatusRuntimeException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.util.ArrayList; -import java.util.List; -import java.util.Optional; import java.util.concurrent.ThreadLocalRandom; import static org.mockito.Mockito.times; @@ -53,13 +51,13 @@ public class GrpcAgentUriStatHandlerV2Test { private Context prevContext; - @Before + @BeforeEach public void setUp() throws Exception { Context root = Context.ROOT; prevContext = root.attach(); } - @After + @AfterEach public void tearDown() throws Exception { Context root = Context.ROOT; if (prevContext != null) { @@ -67,15 +65,17 @@ public void tearDown() throws Exception { } } - @Test(expected = StatusRuntimeException.class) + @Test public void throwExceptionTest() { - AgentUriStatService mockAgentUriStatService = Mockito.mock(AgentUriStatService.class); + Assertions.assertThrows(StatusRuntimeException.class, () -> { + AgentUriStatService mockAgentUriStatService = Mockito.mock(AgentUriStatService.class); - ServerRequest mockServerRequest = Mockito.mock(ServerRequest.class); + ServerRequest mockServerRequest = Mockito.mock(ServerRequest.class); - GrpcAgentStatHandlerV2 handler = createMockHandler(mockAgentUriStatService, false); + GrpcAgentStatHandlerV2 handler = createMockHandler(mockAgentUriStatService, false); - handler.handleSimple(mockServerRequest); + handler.handleSimple(mockServerRequest); + }); } @Test diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/handler/thrift/ThriftAgentStatHandlerV2Test.java b/collector/src/test/java/com/navercorp/pinpoint/collector/handler/thrift/ThriftAgentStatHandlerV2Test.java index 849db1fbcd0b..31048cade4d5 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/handler/thrift/ThriftAgentStatHandlerV2Test.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/handler/thrift/ThriftAgentStatHandlerV2Test.java @@ -23,8 +23,9 @@ import com.navercorp.pinpoint.collector.service.HBaseAgentStatService; import com.navercorp.pinpoint.common.server.bo.stat.*; import com.navercorp.pinpoint.thrift.dto.*; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.Spy; @@ -32,8 +33,11 @@ import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.*; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.when; /** * @author HyunGil Jeong @@ -88,10 +92,10 @@ public class ThriftAgentStatHandlerV2Test { private ThriftAgentStatHandlerV2 thriftAgentStatHandlerV2; private HBaseAgentStatService hBaseAgentStatService; - @Before + @BeforeEach public void setUp() throws Exception { MockitoAnnotations.initMocks(this); - hBaseAgentStatService = new HBaseAgentStatService(new AgentStatDao[] {jvmGcDao, jvmGcDetailedDao, cpuLoadDao, transactionDao, + hBaseAgentStatService = new HBaseAgentStatService(new AgentStatDao[]{jvmGcDao, jvmGcDetailedDao, cpuLoadDao, transactionDao, activeTraceDao, dataSourceDao, responseTimeDao, deadlockDao, fileDescriptorDao, directBufferDao, totalThreadCountDao, loadedClassDao}); agentStatServiceList.add(hBaseAgentStatService); @@ -198,14 +202,16 @@ public void insertShouldNotBeCalledIfTAgentStatBatchIsMappedToNull() { verifyZeroInteractions(loadedClassDao); } - @Test(expected=IllegalArgumentException.class) + @Test public void handleShouldThrowIllegalArgumentExceptionForIncorrectTBaseObjects() { - // Given - final TAgentInfo wrongTBaseObject = new TAgentInfo(); - // When - thriftAgentStatHandlerV2.handleSimple(wrongTBaseObject); - // Then - fail(); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + // Given + final TAgentInfo wrongTBaseObject = new TAgentInfo(); + // When + thriftAgentStatHandlerV2.handleSimple(wrongTBaseObject); + // Then + fail(); + }); } private TAgentStatBatch createAgentStatBatch(String agentId, long startTimestamp, int numBatches) { diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/manage/HandlerManagerTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/manage/HandlerManagerTest.java index e761eb71c72c..e0e28d866974 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/manage/HandlerManagerTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/manage/HandlerManagerTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.collector.manage; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Taejin Koo @@ -27,21 +27,21 @@ public class HandlerManagerTest { @Test public void onOffTest() { HandlerManager handlerManager = new HandlerManager(); - Assert.assertTrue(handlerManager.isEnable()); + Assertions.assertTrue(handlerManager.isEnable()); handlerManager.disableAccess(); - Assert.assertFalse(handlerManager.isEnable()); + Assertions.assertFalse(handlerManager.isEnable()); handlerManager.enableAccess(); - Assert.assertTrue(handlerManager.isEnable()); + Assertions.assertTrue(handlerManager.isEnable()); } @Test public void getNameTest() { HandlerManager handlerManager = new HandlerManager(); String name = handlerManager.getName(); - - Assert.assertEquals("HandlerManager", name); + + Assertions.assertEquals("HandlerManager", name); } } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/manage/jmx/PinpointMBeanServerTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/manage/jmx/PinpointMBeanServerTest.java index 444ecd0c3954..fb1599843726 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/manage/jmx/PinpointMBeanServerTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/manage/jmx/PinpointMBeanServerTest.java @@ -16,16 +16,14 @@ package com.navercorp.pinpoint.collector.manage.jmx; -import java.lang.management.ManagementFactory; +import com.navercorp.pinpoint.collector.manage.AbstractCollectorManager; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import javax.management.MBeanServer; import javax.management.ObjectInstance; import javax.management.ObjectName; - -import org.junit.Assert; -import org.junit.Test; - -import com.navercorp.pinpoint.collector.manage.AbstractCollectorManager; +import java.lang.management.ManagementFactory; /** * @author Taejin Koo @@ -35,27 +33,27 @@ public class PinpointMBeanServerTest { @Test public void registerTest1() { PinpointMBeanServer mBeanServer = new PinpointMBeanServer(); - Assert.assertNull(mBeanServer.getPinpointMBean("PinpointMBeanServerTest$ATest")); + Assertions.assertNull(mBeanServer.getPinpointMBean("PinpointMBeanServerTest$ATest")); ATest aTest = new ATest(); mBeanServer.registerMBean(aTest); - Assert.assertEquals(aTest, mBeanServer.getPinpointMBean("PinpointMBeanServerTest$ATest")); + Assertions.assertEquals(aTest, mBeanServer.getPinpointMBean("PinpointMBeanServerTest$ATest")); mBeanServer.unregisterMBean(aTest); - Assert.assertNull(mBeanServer.getPinpointMBean("PinpointMBeanServerTest$ATest")); + Assertions.assertNull(mBeanServer.getPinpointMBean("PinpointMBeanServerTest$ATest")); } @Test public void registerTest2() { PinpointMBeanServer mBeanServer = new PinpointMBeanServer(); - Assert.assertNull(mBeanServer.getPinpointMBean("PinpointMBeanServerTest$ATest")); + Assertions.assertNull(mBeanServer.getPinpointMBean("PinpointMBeanServerTest$ATest")); ATest aTest = new ATest(); mBeanServer.registerMBean(aTest); - Assert.assertEquals(aTest, mBeanServer.getPinpointMBean("PinpointMBeanServerTest$ATest")); + Assertions.assertEquals(aTest, mBeanServer.getPinpointMBean("PinpointMBeanServerTest$ATest")); mBeanServer.unregisterMBean("PinpointMBeanServerTest$ATest"); - Assert.assertNull(mBeanServer.getPinpointMBean("PinpointMBeanServerTest$ATest")); + Assertions.assertNull(mBeanServer.getPinpointMBean("PinpointMBeanServerTest$ATest")); } @Test @@ -73,7 +71,7 @@ public void test() throws Exception { String packageName = this.getClass().getPackage().getName(); ObjectInstance instance = server.getObjectInstance(objectName); - Assert.assertEquals(packageName + ".PinpointMBeanServerTest$ATest", instance.getClassName()); + Assertions.assertEquals(packageName + ".PinpointMBeanServerTest$ATest", instance.getClassName()); mBeanServer.unregisterMBean(aTest); } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFActiveTraceMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFActiveTraceMapperTest.java index fc325b312ba1..8a722c9a0e36 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFActiveTraceMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFActiveTraceMapperTest.java @@ -20,11 +20,11 @@ import com.navercorp.pinpoint.common.server.bo.stat.ActiveTraceHistogram; import com.navercorp.pinpoint.thrift.dto.flink.TFActiveTrace; import com.navercorp.pinpoint.thrift.dto.flink.TFActiveTraceHistogram; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFAgentStatBatchMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFAgentStatBatchMapperTest.java index 9510fc1c8823..4368573a18a2 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFAgentStatBatchMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFAgentStatBatchMapperTest.java @@ -20,11 +20,11 @@ import com.navercorp.pinpoint.common.server.bo.stat.CpuLoadBo; import com.navercorp.pinpoint.thrift.dto.flink.TFAgentStat; import com.navercorp.pinpoint.thrift.dto.flink.TFAgentStatBatch; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFAgentStatMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFAgentStatMapperTest.java index 5ffeddfbe07d..eaa236cfc7d3 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFAgentStatMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFAgentStatMapperTest.java @@ -17,29 +17,19 @@ package com.navercorp.pinpoint.collector.mapper.flink; import com.navercorp.pinpoint.common.server.bo.JvmGcType; -import com.navercorp.pinpoint.common.server.bo.stat.ActiveTraceBo; -import com.navercorp.pinpoint.common.server.bo.stat.ActiveTraceHistogram; -import com.navercorp.pinpoint.common.server.bo.stat.AgentStatBo; -import com.navercorp.pinpoint.common.server.bo.stat.CpuLoadBo; -import com.navercorp.pinpoint.common.server.bo.stat.DataSourceBo; -import com.navercorp.pinpoint.common.server.bo.stat.DataSourceListBo; -import com.navercorp.pinpoint.common.server.bo.stat.FileDescriptorBo; -import com.navercorp.pinpoint.common.server.bo.stat.JvmGcBo; -import com.navercorp.pinpoint.common.server.bo.stat.LoadedClassBo; -import com.navercorp.pinpoint.common.server.bo.stat.ResponseTimeBo; -import com.navercorp.pinpoint.common.server.bo.stat.TotalThreadCountBo; +import com.navercorp.pinpoint.common.server.bo.stat.*; import com.navercorp.pinpoint.thrift.dto.flink.TFActiveTrace; import com.navercorp.pinpoint.thrift.dto.flink.TFActiveTraceHistogram; import com.navercorp.pinpoint.thrift.dto.flink.TFAgentStat; import com.navercorp.pinpoint.thrift.dto.flink.TFDataSource; import com.navercorp.pinpoint.thrift.dto.flink.TFJvmGc; import com.navercorp.pinpoint.thrift.dto.flink.TFResponseTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author minwoo.jung @@ -99,7 +89,6 @@ public void mapTest() { } - private AgentStatBo createCpuLoadBoList() { AgentStatBo.Builder builder = newBuilder(); diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFCpuLoadMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFCpuLoadMapperTest.java index 04772b9071d8..e401bceab565 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFCpuLoadMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFCpuLoadMapperTest.java @@ -18,9 +18,9 @@ import com.navercorp.pinpoint.common.server.bo.stat.CpuLoadBo; import com.navercorp.pinpoint.thrift.dto.flink.TFCpuLoad; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFDataSourceBoMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFDataSourceBoMapperTest.java index 6981e131ac4f..0e1c3fe33eb2 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFDataSourceBoMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFDataSourceBoMapperTest.java @@ -18,9 +18,9 @@ import com.navercorp.pinpoint.common.server.bo.stat.DataSourceBo; import com.navercorp.pinpoint.thrift.dto.flink.TFDataSource; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFDataSourceListBoMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFDataSourceListBoMapperTest.java index b04bcabb2c80..0f64fa8bbebb 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFDataSourceListBoMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFDataSourceListBoMapperTest.java @@ -20,11 +20,11 @@ import com.navercorp.pinpoint.common.server.bo.stat.DataSourceListBo; import com.navercorp.pinpoint.thrift.dto.flink.TFDataSource; import com.navercorp.pinpoint.thrift.dto.flink.TFDataSourceList; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFDirectBufferMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFDirectBufferMapperTest.java index 9f26ffcf7541..0a51886a3703 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFDirectBufferMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFDirectBufferMapperTest.java @@ -18,9 +18,9 @@ import com.navercorp.pinpoint.common.server.bo.stat.DirectBufferBo; import com.navercorp.pinpoint.thrift.dto.flink.TFDirectBuffer; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Roy Kim diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFFileDescriptorMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFFileDescriptorMapperTest.java index 0f913da5522a..c35cec29ab48 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFFileDescriptorMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFFileDescriptorMapperTest.java @@ -18,9 +18,9 @@ import com.navercorp.pinpoint.common.server.bo.stat.FileDescriptorBo; import com.navercorp.pinpoint.thrift.dto.flink.TFFileDescriptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Roy Kim diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFJvmGcMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFJvmGcMapperTest.java index 81e77106bc18..a22954c9482f 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFJvmGcMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFJvmGcMapperTest.java @@ -18,9 +18,9 @@ import com.navercorp.pinpoint.common.server.bo.stat.JvmGcBo; import com.navercorp.pinpoint.thrift.dto.flink.TFJvmGc; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFLoadedClassCountMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFLoadedClassCountMapperTest.java index c998cd4d1f8f..d4807e9ad49f 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFLoadedClassCountMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFLoadedClassCountMapperTest.java @@ -18,9 +18,9 @@ import com.navercorp.pinpoint.common.server.bo.stat.LoadedClassBo; import com.navercorp.pinpoint.thrift.dto.flink.TFLoadedClass; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TFLoadedClassCountMapperTest { @Test diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFResponseTimeMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFResponseTimeMapperTest.java index 0d3a76ea5229..92f35b4bf0ac 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFResponseTimeMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFResponseTimeMapperTest.java @@ -18,9 +18,9 @@ import com.navercorp.pinpoint.common.server.bo.stat.ResponseTimeBo; import com.navercorp.pinpoint.thrift.dto.flink.TFResponseTime; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFTotalThreadCountMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFTotalThreadCountMapperTest.java index 95e871d9f8d4..be124f0a3bc2 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFTotalThreadCountMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFTotalThreadCountMapperTest.java @@ -18,9 +18,9 @@ import com.navercorp.pinpoint.common.server.bo.stat.TotalThreadCountBo; import com.navercorp.pinpoint.thrift.dto.flink.TFTotalThreadCount; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TFTotalThreadCountMapperTest { @Test diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFTransactionMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFTransactionMapperTest.java index 824dc226f133..bdbdebc0d0e9 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFTransactionMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/flink/TFTransactionMapperTest.java @@ -18,9 +18,9 @@ import com.navercorp.pinpoint.common.server.bo.stat.TransactionBo; import com.navercorp.pinpoint.thrift.dto.flink.TFTransaction; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/event/ThriftAgentEventMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/event/ThriftAgentEventMapperTest.java index 966000b2ee07..7edc8be9a405 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/event/ThriftAgentEventMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/event/ThriftAgentEventMapperTest.java @@ -23,12 +23,14 @@ import com.navercorp.pinpoint.thrift.dto.TAgentStat; import com.navercorp.pinpoint.thrift.dto.TDeadlock; import com.navercorp.pinpoint.thrift.dto.command.TThreadDump; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; @@ -36,7 +38,8 @@ /** * @author Taejin Koo */ -@RunWith(MockitoJUnitRunner.Silent.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class ThriftAgentEventMapperTest { @Mock @@ -61,7 +64,7 @@ public void simpleTest1() { when(this.deadlockEventBoMapper.map(agentId, startTimestamp, startTimestamp, agentStat.getDeadlock())).thenReturn(expectedEventBo); AgentEventBo actualEventBo = agentEventMapper.map(agentStat); - Assert.assertEquals(expectedEventBo, actualEventBo); + Assertions.assertEquals(expectedEventBo, actualEventBo); } @Test @@ -77,7 +80,7 @@ public void simpleTest2() { when(this.deadlockEventBoMapper.map(any(String.class), any(Long.class), any(Long.class), any(TDeadlock.class))).thenReturn(expectedEventBo); AgentEventBo actualEventBo = agentEventMapper.map(agentStat); - Assert.assertNull(actualEventBo); + Assertions.assertNull(actualEventBo); } private TAgentStat createAgentStat(String agentId, long startTimestamp, long eventTimestamp, int deadlockThreadCount) { diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftActiveTraceBoMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftActiveTraceBoMapperTest.java index 3895c65fd5ef..47e704da8df5 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftActiveTraceBoMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftActiveTraceBoMapperTest.java @@ -21,7 +21,7 @@ import com.navercorp.pinpoint.common.trace.BaseHistogramSchema; import com.navercorp.pinpoint.thrift.dto.TActiveTrace; import com.navercorp.pinpoint.thrift.dto.TActiveTraceHistogram; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import java.util.Arrays; import java.util.List; @@ -66,23 +66,23 @@ protected ActiveTraceBo convert(TActiveTrace original) { @Override protected void verify(TActiveTrace original, ActiveTraceBo mappedStatDataPoint) { - Assert.assertEquals("version", original.getHistogram().getVersion(), mappedStatDataPoint.getVersion()); - Assert.assertEquals("schemaType", original.getHistogram().getHistogramSchemaType(), mappedStatDataPoint.getHistogramSchemaType()); + Assertions.assertEquals(original.getHistogram().getVersion(), mappedStatDataPoint.getVersion(), "version"); + Assertions.assertEquals(original.getHistogram().getHistogramSchemaType(), mappedStatDataPoint.getHistogramSchemaType(), "schemaType"); List activeTraceCountList = original.getHistogram().getActiveTraceCount(); for (int i = 0; i < activeTraceCountList.size(); i++) { int activeTraceCount = activeTraceCountList.get(i); final ActiveTraceHistogram activeTraceHistogram = mappedStatDataPoint.getActiveTraceHistogram(); if (i == 0) { - Assert.assertEquals("FAST", activeTraceCount, activeTraceHistogram.getFastCount()); + Assertions.assertEquals(activeTraceCount, activeTraceHistogram.getFastCount(), "FAST"); } else if (i == 1) { - Assert.assertEquals("NORMAL", activeTraceCount, activeTraceHistogram.getNormalCount()); + Assertions.assertEquals(activeTraceCount, activeTraceHistogram.getNormalCount(), "NORMAL"); } else if (i == 2) { - Assert.assertEquals("SLOW", activeTraceCount, activeTraceHistogram.getSlowCount()); + Assertions.assertEquals(activeTraceCount, activeTraceHistogram.getSlowCount(), "SLOW"); } else if (i == 3) { - Assert.assertEquals("VERY_SLOW", activeTraceCount, activeTraceHistogram.getVerySlowCount()); + Assertions.assertEquals(activeTraceCount, activeTraceHistogram.getVerySlowCount(), "VERY_SLOW"); } else { - Assert.fail(); + Assertions.fail(); } } } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftBoMapperTestBase.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftBoMapperTestBase.java index 538e3ff1f055..dba6ad8afce1 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftBoMapperTestBase.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftBoMapperTestBase.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.AgentStatDataPoint; import org.apache.thrift.TBase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.ThreadLocalRandom; diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftCpuLoadBoMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftCpuLoadBoMapperTest.java index 2d50f6cd82e4..2b03e4b820e0 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftCpuLoadBoMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftCpuLoadBoMapperTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.CpuLoadBo; import com.navercorp.pinpoint.thrift.dto.TCpuLoad; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; /** * @author Taejin Koo @@ -41,8 +41,8 @@ protected CpuLoadBo convert(TCpuLoad original) { @Override protected void verify(TCpuLoad original, CpuLoadBo mappedStatDataPoint) { - Assert.assertEquals("jvmCpuLoad", original.getJvmCpuLoad(), mappedStatDataPoint.getJvmCpuLoad(), 0); - Assert.assertEquals("systemCpuLoad", original.getSystemCpuLoad(), mappedStatDataPoint.getSystemCpuLoad(), 0); + Assertions.assertEquals(original.getJvmCpuLoad(), mappedStatDataPoint.getJvmCpuLoad(), 0, "jvmCpuLoad"); + Assertions.assertEquals(original.getSystemCpuLoad(), mappedStatDataPoint.getSystemCpuLoad(), 0, "systemCpuLoad"); } } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftDeadlockThreadCountBoMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftDeadlockThreadCountBoMapperTest.java index 33368ec679c2..a31bc73fe752 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftDeadlockThreadCountBoMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftDeadlockThreadCountBoMapperTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.DeadlockThreadCountBo; import com.navercorp.pinpoint.thrift.dto.TDeadlock; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; /** * @author Taejin Koo @@ -43,7 +43,7 @@ protected DeadlockThreadCountBo convert(TDeadlock original) { @Override protected void verify(TDeadlock original, DeadlockThreadCountBo mappedStatDataPoint) { - Assert.assertEquals("deadlockedThreadCount", original.getDeadlockedThreadCount(), mappedStatDataPoint.getDeadlockedThreadCount()); + Assertions.assertEquals(original.getDeadlockedThreadCount(), mappedStatDataPoint.getDeadlockedThreadCount(), "deadlockedThreadCount"); } } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftDirectBufferBoMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftDirectBufferBoMapperTest.java index aa4893479b45..80211a24fe26 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftDirectBufferBoMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftDirectBufferBoMapperTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.DirectBufferBo; import com.navercorp.pinpoint.thrift.dto.TDirectBuffer; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; /** * @author Roy Kim @@ -43,10 +43,10 @@ protected DirectBufferBo convert(TDirectBuffer original) { @Override protected void verify(TDirectBuffer original, DirectBufferBo mappedStatDataPoint) { - Assert.assertEquals("DirectCount", original.getDirectCount(), mappedStatDataPoint.getDirectCount(), 0); - Assert.assertEquals("DirectMemoryUsed", original.getDirectMemoryUsed(), mappedStatDataPoint.getDirectMemoryUsed(), 0); - Assert.assertEquals("MappedCount", original.getMappedCount(), mappedStatDataPoint.getMappedCount(), 0); - Assert.assertEquals("MappedMemoryUsed", original.getMappedMemoryUsed(), mappedStatDataPoint.getMappedMemoryUsed(), 0); + Assertions.assertEquals(original.getDirectCount(), mappedStatDataPoint.getDirectCount(), 0, "DirectCount"); + Assertions.assertEquals(original.getDirectMemoryUsed(), mappedStatDataPoint.getDirectMemoryUsed(), 0, "DirectMemoryUsed"); + Assertions.assertEquals(original.getMappedCount(), mappedStatDataPoint.getMappedCount(), 0, "MappedCount"); + Assertions.assertEquals(original.getMappedMemoryUsed(), mappedStatDataPoint.getMappedMemoryUsed(), 0, "MappedMemoryUsed"); } } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftFileDescriptorBoMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftFileDescriptorBoMapperTest.java index ee21d4f9d00e..f4c0af40f9c7 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftFileDescriptorBoMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftFileDescriptorBoMapperTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.FileDescriptorBo; import com.navercorp.pinpoint.thrift.dto.TFileDescriptor; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; /** * @author Roy Kim @@ -40,7 +40,7 @@ protected FileDescriptorBo convert(TFileDescriptor original) { @Override protected void verify(TFileDescriptor original, FileDescriptorBo mappedStatDataPoint) { - Assert.assertEquals("openFileDescriptorCount", original.getOpenFileDescriptorCount(), mappedStatDataPoint.getOpenFileDescriptorCount(), 0); + Assertions.assertEquals(original.getOpenFileDescriptorCount(), mappedStatDataPoint.getOpenFileDescriptorCount(), 0, "openFileDescriptorCount"); } } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftLoadedClassCountBoMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftLoadedClassCountBoMapperTest.java index d742504e4ae6..2d0ca5b7e134 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftLoadedClassCountBoMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftLoadedClassCountBoMapperTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.LoadedClassBo; import com.navercorp.pinpoint.thrift.dto.TLoadedClass; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; public class ThriftLoadedClassCountBoMapperTest extends ThriftBoMapperTestBase { @@ -40,7 +40,7 @@ protected LoadedClassBo convert(TLoadedClass original) { @Override protected void verify(TLoadedClass original, LoadedClassBo mappedStatDataPoint) { - Assert.assertEquals("Loaded Class Count", original.getLoadedClassCount(), mappedStatDataPoint.getLoadedClassCount()); - Assert.assertEquals("Unloaded Class Count", original.getUnloadedClassCount(), mappedStatDataPoint.getUnloadedClassCount()); + Assertions.assertEquals(original.getLoadedClassCount(), mappedStatDataPoint.getLoadedClassCount(), "Loaded Class Count"); + Assertions.assertEquals(original.getUnloadedClassCount(), mappedStatDataPoint.getUnloadedClassCount(), "Unloaded Class Count"); } } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftResponseTimeBoMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftResponseTimeBoMapperTest.java index c6eacfb09c88..f3d4b80eb802 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftResponseTimeBoMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftResponseTimeBoMapperTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.ResponseTimeBo; import com.navercorp.pinpoint.thrift.dto.TResponseTime; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; /** * @author Taejin Koo @@ -46,8 +46,8 @@ protected ResponseTimeBo convert(TResponseTime original) { @Override protected void verify(TResponseTime original, ResponseTimeBo mappedStatDataPoint) { - Assert.assertEquals("avg", original.getAvg(), mappedStatDataPoint.getAvg()); - Assert.assertEquals("max", original.getMax(), mappedStatDataPoint.getMax()); + Assertions.assertEquals(original.getAvg(), mappedStatDataPoint.getAvg(), "avg"); + Assertions.assertEquals(original.getMax(), mappedStatDataPoint.getMax(), "max"); } } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftTotalThreadCountBoMapperTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftTotalThreadCountBoMapperTest.java index 065ab693d95d..046a2732dd15 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftTotalThreadCountBoMapperTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/mapper/thrift/stat/ThriftTotalThreadCountBoMapperTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.stat.TotalThreadCountBo; import com.navercorp.pinpoint.thrift.dto.TTotalThreadCount; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; public class ThriftTotalThreadCountBoMapperTest extends ThriftBoMapperTestBase { @@ -39,6 +39,6 @@ protected TotalThreadCountBo convert(TTotalThreadCount original) { @Override protected void verify(TTotalThreadCount original, TotalThreadCountBo mappedStatDataPoint) { - Assert.assertEquals("Total Thread Count", original.getTotalThreadCount(), mappedStatDataPoint.getTotalThreadCount()); + Assertions.assertEquals(original.getTotalThreadCount(), mappedStatDataPoint.getTotalThreadCount(), "Total Thread Count"); } } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/monitor/LoggingRejectedExecutionHandlerTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/monitor/LoggingRejectedExecutionHandlerTest.java index 59a87da44c15..1ae0ec0ad264 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/monitor/LoggingRejectedExecutionHandlerTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/monitor/LoggingRejectedExecutionHandlerTest.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.collector.monitor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.Executors; import java.util.concurrent.ThreadPoolExecutor; diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/monitor/MonitoredThreadPoolExecutorTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/monitor/MonitoredThreadPoolExecutorTest.java index db060a4422f1..423872cf5706 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/monitor/MonitoredThreadPoolExecutorTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/monitor/MonitoredThreadPoolExecutorTest.java @@ -17,9 +17,9 @@ package com.navercorp.pinpoint.collector.monitor; import com.codahale.metrics.MetricRegistry; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.concurrent.Callable; import java.util.concurrent.Future; @@ -38,14 +38,14 @@ public class MonitoredThreadPoolExecutorTest { private RunnableDecorator runnableDecorator; private MonitoredThreadPoolExecutor threadPoolExecutor; - @Before + @BeforeEach public void setUp() throws Exception { MetricRegistry metricRegistry = new MetricRegistry(); this.runnableDecorator = spy(new BypassRunnableDecorator("test")); this.threadPoolExecutor = new MonitoredThreadPoolExecutor(1, 1, 1000, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(), runnableDecorator); } - @After + @AfterEach public void tearDown() throws Exception { if (this.threadPoolExecutor != null) { this.threadPoolExecutor.shutdown(); diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/AddressFilterAdaptorTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/AddressFilterAdaptorTest.java index 1338b5823c75..6b4f56dacf56 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/AddressFilterAdaptorTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/AddressFilterAdaptorTest.java @@ -16,13 +16,13 @@ package com.navercorp.pinpoint.collector.receiver; +import com.google.common.net.InetAddresses; import com.navercorp.pinpoint.collector.receiver.thrift.AddressFilterAdaptor; import com.navercorp.pinpoint.common.server.util.AddressFilter; import com.navercorp.pinpoint.common.server.util.IgnoreAddressFilter; -import com.google.common.net.InetAddresses; import org.jboss.netty.channel.Channel; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.InetAddress; import java.net.InetSocketAddress; @@ -49,7 +49,7 @@ public void accept_accept() { Channel ignoreChannel = mockChannel(ignore); AddressFilterAdaptor adaptor = new AddressFilterAdaptor(filter); - Assert.assertTrue(adaptor.accept(ignoreChannel)); + Assertions.assertTrue(adaptor.accept(ignoreChannel)); } @Test @@ -60,7 +60,7 @@ public void accept_reject() { Channel ignoreChannel = mockChannel(ignore); AddressFilterAdaptor adaptor = new AddressFilterAdaptor(ignoreAddressFilter); - Assert.assertFalse(adaptor.accept(ignoreChannel)); + Assertions.assertFalse(adaptor.accept(ignoreChannel)); } private Channel mockChannel(InetAddress inetAddress) { diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/DataReceiverGroupTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/DataReceiverGroupTest.java index 269a1c9c19f5..7a6e8c7d49c6 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/DataReceiverGroupTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/DataReceiverGroupTest.java @@ -17,10 +17,10 @@ package com.navercorp.pinpoint.collector.receiver; import com.google.common.util.concurrent.MoreExecutors; -import com.navercorp.pinpoint.collector.thrift.config.DataReceiverGroupConfiguration; import com.navercorp.pinpoint.collector.receiver.thrift.PinpointServerAcceptorProvider; import com.navercorp.pinpoint.collector.receiver.thrift.TCPReceiverBean; import com.navercorp.pinpoint.collector.receiver.thrift.UDPReceiverBean; +import com.navercorp.pinpoint.collector.thrift.config.DataReceiverGroupConfiguration; import com.navercorp.pinpoint.common.server.util.AddressFilter; import com.navercorp.pinpoint.io.request.ServerRequest; import com.navercorp.pinpoint.io.request.ServerResponse; @@ -35,11 +35,11 @@ import com.navercorp.pinpoint.rpc.client.DefaultPinpointClientFactory; import com.navercorp.pinpoint.rpc.client.PinpointClientFactory; import com.navercorp.pinpoint.thrift.dto.TResult; -import org.apache.thrift.TBase; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.thrift.TBase; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.DisposableBean; import org.springframework.util.SocketUtils; @@ -85,10 +85,10 @@ public void receiverGroupTest1() throws Exception { tcpDataSender.send(new TResult()); tcpDataSender.request(new TResult()); - Assert.assertTrue(tcpDataSender.isConnected()); + Assertions.assertTrue(tcpDataSender.isConnected()); - Assert.assertTrue(dispatchHandler.getSendLatch().await(1000, TimeUnit.MILLISECONDS)); - Assert.assertTrue(dispatchHandler.getRequestLatch().await(1000, TimeUnit.MILLISECONDS)); + Assertions.assertTrue(dispatchHandler.getSendLatch().await(1000, TimeUnit.MILLISECONDS)); + Assertions.assertTrue(dispatchHandler.getRequestLatch().await(1000, TimeUnit.MILLISECONDS)); } finally { closeDataSender(udpDataSender); closeDataSender(tcpDataSender); @@ -152,18 +152,18 @@ public void receiverGroupTest2() throws Exception { udpDataSender = newUdpDataSender(mockConfig); udpDataSender.send(new TResult()); - Assert.assertFalse(testDispatchHandler.getSendLatch().await(1000, TimeUnit.MILLISECONDS)); + Assertions.assertFalse(testDispatchHandler.getSendLatch().await(1000, TimeUnit.MILLISECONDS)); pinpointClientFactory = createPinpointClientFactory(); tcpDataSender = new TcpDataSender<>(this.getClass().getName(), "127.0.0.1", mockConfig.getTcpBindPort(), pinpointClientFactory); - Assert.assertTrue(tcpDataSender.isConnected()); + Assertions.assertTrue(tcpDataSender.isConnected()); tcpDataSender.send(new TResult()); tcpDataSender.request(new TResult()); - Assert.assertTrue(testDispatchHandler.getSendLatch().await(1000, TimeUnit.MILLISECONDS)); - Assert.assertTrue(testDispatchHandler.getRequestLatch().await(1000, TimeUnit.MILLISECONDS)); + Assertions.assertTrue(testDispatchHandler.getSendLatch().await(1000, TimeUnit.MILLISECONDS)); + Assertions.assertTrue(testDispatchHandler.getRequestLatch().await(1000, TimeUnit.MILLISECONDS)); } finally { closeDataSender(udpDataSender); closeDataSender(tcpDataSender); @@ -189,12 +189,12 @@ public void receiverGroupTest3() throws Exception { udpDataSender = newUdpDataSender(mockConfig); udpDataSender.send(new TResult()); - Assert.assertTrue(testDispatchHandler.getSendLatch().await(1000, TimeUnit.MILLISECONDS)); + Assertions.assertTrue(testDispatchHandler.getSendLatch().await(1000, TimeUnit.MILLISECONDS)); pinpointClientFactory = createPinpointClientFactory(); tcpDataSender = new TcpDataSender<>(this.getClass().getName(), "127.0.0.1", mockConfig.getTcpBindPort(), pinpointClientFactory); - Assert.assertFalse(tcpDataSender.isConnected()); + Assertions.assertFalse(tcpDataSender.isConnected()); } finally { closeDataSender(udpDataSender); closeDataSender(tcpDataSender); diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/DispatchHandlerTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/DispatchHandlerTest.java index b0d33a499646..0e8fae2e658a 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/DispatchHandlerTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/DispatchHandlerTest.java @@ -23,9 +23,9 @@ import com.navercorp.pinpoint.io.request.ServerResponse; import com.navercorp.pinpoint.thrift.dto.TResult; import org.apache.thrift.TBase; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -47,36 +47,38 @@ public class DispatchHandlerTest { @Mock private AcceptedTimeService acceptedTimeService; - @Before + @BeforeEach public void setUp() throws Exception { MockitoAnnotations.initMocks(this); } - @Test(expected = UnsupportedOperationException.class) + @Test public void throwExceptionTest1() { - ServerRequest> request = mock(ServerRequest.class); - when(request.getData()).thenReturn(null); - testDispatchHandler.dispatchSendMessage(request); + Assertions.assertThrows(UnsupportedOperationException.class, () -> { + ServerRequest> request = mock(ServerRequest.class); + when(request.getData()).thenReturn(null); + testDispatchHandler.dispatchSendMessage(request); + }); } @Test public void dispatchSendMessageTest() { ServerRequest> serverRequest = mock(ServerRequest.class); - when(serverRequest.getData()).thenReturn((TBase)new TResult()); + when(serverRequest.getData()).thenReturn((TBase) new TResult()); testDispatchHandler.dispatchSendMessage(serverRequest); - Assert.assertTrue(TEST_SIMPLE_HANDLER.getExecutedCount() > 0); + Assertions.assertTrue(TEST_SIMPLE_HANDLER.getExecutedCount() > 0); } @Test public void dispatchRequestMessageTest() { ServerRequest> request = mock(ServerRequest.class); - when(request.getData()).thenReturn((TBase)new TResult()); + when(request.getData()).thenReturn((TBase) new TResult()); ServerResponse> response = mock(ServerResponse.class); testDispatchHandler.dispatchRequestMessage(request, response); - Assert.assertTrue(TEST_REQUEST_HANDLER.getExecutedCount() > 0); + Assertions.assertTrue(TEST_REQUEST_HANDLER.getExecutedCount() > 0); } private static class TestDispatchHandler implements DispatchHandler, TBase> { diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/GrpcClientStreamChannelTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/GrpcClientStreamChannelTest.java index 6b666a421145..3bbdd46286cb 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/GrpcClientStreamChannelTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/GrpcClientStreamChannelTest.java @@ -16,6 +16,7 @@ package com.navercorp.pinpoint.collector.receiver.grpc; +import com.google.protobuf.Empty; import com.navercorp.pinpoint.rpc.packet.stream.StreamClosePacket; import com.navercorp.pinpoint.rpc.packet.stream.StreamCode; import com.navercorp.pinpoint.rpc.packet.stream.StreamResponsePacket; @@ -24,13 +25,11 @@ import com.navercorp.pinpoint.rpc.stream.StreamChannelRepository; import com.navercorp.pinpoint.rpc.stream.StreamChannelStateCode; import com.navercorp.pinpoint.rpc.stream.StreamException; - -import com.google.protobuf.Empty; import io.grpc.stub.StreamObserver; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.InetSocketAddress; import java.util.concurrent.CountDownLatch; @@ -62,8 +61,8 @@ public void run() { streamException = e; } - Assert.assertEquals(StreamCode.CONNECTION_TIMEOUT, streamException.getStreamCode()); - Assert.assertEquals(StreamChannelStateCode.CLOSED, grpcClientStreamChannel.getCurrentState()); + Assertions.assertEquals(StreamCode.CONNECTION_TIMEOUT, streamException.getStreamCode()); + Assertions.assertEquals(StreamChannelStateCode.CLOSED, grpcClientStreamChannel.getCurrentState()); } @Test @@ -83,8 +82,8 @@ public void run() { streamException = e; } - Assert.assertEquals(StreamCode.CONNECTION_ERRROR, streamException.getStreamCode()); - Assert.assertEquals(StreamChannelStateCode.CLOSED, grpcClientStreamChannel.getCurrentState()); + Assertions.assertEquals(StreamCode.CONNECTION_ERRROR, streamException.getStreamCode()); + Assertions.assertEquals(StreamChannelStateCode.CLOSED, grpcClientStreamChannel.getCurrentState()); } @Test @@ -93,11 +92,11 @@ public void simpleTest() throws StreamException, InterruptedException { RecordClientStreamChannelEventHandler recordStreamChannelHandler = new RecordClientStreamChannelEventHandler(); GrpcClientStreamChannel grpcClientStreamChannel = new GrpcClientStreamChannel(mockRemoteAddress, 20, streamChannelRepository, recordStreamChannelHandler); - Assert.assertEquals(StreamChannelStateCode.NEW, grpcClientStreamChannel.getCurrentState()); + Assertions.assertEquals(StreamChannelStateCode.NEW, grpcClientStreamChannel.getCurrentState()); grpcClientStreamChannel.init(); - Assert.assertEquals(StreamChannelStateCode.OPEN, grpcClientStreamChannel.getCurrentState()); - Assert.assertEquals(1, streamChannelRepository.size()); + Assertions.assertEquals(StreamChannelStateCode.OPEN, grpcClientStreamChannel.getCurrentState()); + Assertions.assertEquals(1, streamChannelRepository.size()); CountDownLatch connectCompleteLatch = new CountDownLatch(1); CountDownLatch threadCompleteLatch = connect(grpcClientStreamChannel, connectCompleteLatch); @@ -120,30 +119,30 @@ public void onCompleted() { } }); - Assert.assertTrue(connectCompleteLatch.await(1000, TimeUnit.MILLISECONDS)); - Assert.assertEquals(StreamChannelStateCode.CONNECT_AWAIT, grpcClientStreamChannel.getCurrentState()); + Assertions.assertTrue(connectCompleteLatch.await(1000, TimeUnit.MILLISECONDS)); + Assertions.assertEquals(StreamChannelStateCode.CONNECT_AWAIT, grpcClientStreamChannel.getCurrentState()); grpcClientStreamChannel.changeStateConnected(); - Assert.assertEquals(StreamChannelStateCode.CONNECTED, grpcClientStreamChannel.getCurrentState()); + Assertions.assertEquals(StreamChannelStateCode.CONNECTED, grpcClientStreamChannel.getCurrentState()); - Assert.assertTrue(threadCompleteLatch.await(1000, TimeUnit.MILLISECONDS)); + Assertions.assertTrue(threadCompleteLatch.await(1000, TimeUnit.MILLISECONDS)); String message = "hello"; grpcClientStreamChannel.handleStreamResponsePacket(new StreamResponsePacket(1, message.getBytes())); - Assert.assertEquals(message, new String(recordStreamChannelHandler.getLastStreamResponsePacket().getPayload())); + Assertions.assertEquals(message, new String(recordStreamChannelHandler.getLastStreamResponsePacket().getPayload())); - Assert.assertEquals(0, callCompletedCount.get()); + Assertions.assertEquals(0, callCompletedCount.get()); grpcClientStreamChannel.handleStreamClosePacket(new StreamClosePacket(1, StreamCode.STATE_CLOSED)); - Assert.assertEquals(0, streamChannelRepository.size()); - Assert.assertEquals(StreamChannelStateCode.CLOSED, grpcClientStreamChannel.getCurrentState()); - Assert.assertEquals(1, callCompletedCount.get()); + Assertions.assertEquals(0, streamChannelRepository.size()); + Assertions.assertEquals(StreamChannelStateCode.CLOSED, grpcClientStreamChannel.getCurrentState()); + Assertions.assertEquals(1, callCompletedCount.get()); // do nothing grpcClientStreamChannel.disconnect(); - Assert.assertEquals(1, callCompletedCount.get()); + Assertions.assertEquals(1, callCompletedCount.get()); grpcClientStreamChannel.close(); - Assert.assertEquals(1, callCompletedCount.get()); + Assertions.assertEquals(1, callCompletedCount.get()); } private CountDownLatch connect(GrpcClientStreamChannel grpcClientStreamChannel, CountDownLatch connectCompleteLatch) { diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/PinpointGrpcServerTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/PinpointGrpcServerTest.java index 6e3e7ae7b842..b663c768f023 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/PinpointGrpcServerTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/PinpointGrpcServerTest.java @@ -16,6 +16,7 @@ package com.navercorp.pinpoint.collector.receiver.grpc; +import com.google.protobuf.StringValue; import com.navercorp.pinpoint.collector.cluster.AgentInfo; import com.navercorp.pinpoint.collector.cluster.ProfilerClusterManager; import com.navercorp.pinpoint.grpc.trace.PCmdEcho; @@ -28,13 +29,11 @@ import com.navercorp.pinpoint.rpc.common.SocketStateCode; import com.navercorp.pinpoint.rpc.util.TimerFactory; import com.navercorp.pinpoint.thrift.io.TCommandType; - -import com.google.protobuf.StringValue; import org.jboss.netty.util.Timer; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.net.InetSocketAddress; @@ -53,12 +52,12 @@ public class PinpointGrpcServerTest { private final PCmdEcho request = PCmdEcho.newBuilder().setMessage("hello").build(); - @BeforeClass + @BeforeAll public static void setUp() throws Exception { testTimer = TimerFactory.createHashedWheelTimer(PinpointGrpcServerTest.class + "-Timer", 100, TimeUnit.MILLISECONDS, 512); } - @AfterClass + @AfterAll public static void tearDown() throws Exception { if (testTimer != null) { testTimer.stop(); @@ -90,9 +89,9 @@ public void stateTest() { } private void requestOnInvalidState(Future future, RecordedStreamObserver recordedStreamObserver) { - Assert.assertFalse(future.isSuccess()); - Assert.assertTrue(future.getCause() instanceof IllegalStateException); - Assert.assertEquals(0, recordedStreamObserver.getRequestCount()); + Assertions.assertFalse(future.isSuccess()); + Assertions.assertTrue(future.getCause() instanceof IllegalStateException); + Assertions.assertEquals(0, recordedStreamObserver.getRequestCount()); } @Test @@ -106,12 +105,12 @@ public void requestTest() { pinpointGrpcServer.handleHandshake(supportCommandList); Future future = pinpointGrpcServer.request(this.request); - Assert.assertEquals(1, recordedStreamObserver.getRequestCount()); + Assertions.assertEquals(1, recordedStreamObserver.getRequestCount()); // timeout awaitAndAssert(future, false); future = pinpointGrpcServer.request(this.request); - Assert.assertEquals(2, recordedStreamObserver.getRequestCount()); + Assertions.assertEquals(2, recordedStreamObserver.getRequestCount()); PCmdRequest latestRequest = recordedStreamObserver.getLatestRequest(); pinpointGrpcServer.handleMessage(latestRequest.getRequestId(), PCmdEchoResponse.newBuilder().setMessage(latestRequest.getCommandEcho().getMessage()).build()); @@ -119,7 +118,7 @@ public void requestTest() { awaitAndAssert(future, true); future = pinpointGrpcServer.request(this.request); - Assert.assertEquals(3, recordedStreamObserver.getRequestCount()); + Assertions.assertEquals(3, recordedStreamObserver.getRequestCount()); latestRequest = recordedStreamObserver.getLatestRequest(); PCmdResponse.Builder builder = PCmdResponse.newBuilder(); @@ -136,12 +135,12 @@ private void awaitAndAssert(Future future, boolean expected) { future.await(); // timeout - Assert.assertEquals(expected, future.isSuccess()); + Assertions.assertEquals(expected, future.isSuccess()); } private void assertCurrentState(SocketStateCode expectedStateCode, PinpointGrpcServer pinpointGrpcServer) { SocketStateCode currentState = pinpointGrpcServer.getState(); - Assert.assertEquals(expectedStateCode, currentState); + Assertions.assertEquals(expectedStateCode, currentState); } } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/channelz/DefaultChannelzRegistryTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/channelz/DefaultChannelzRegistryTest.java index cada9cdae7a6..f0ed7cf194d8 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/channelz/DefaultChannelzRegistryTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/channelz/DefaultChannelzRegistryTest.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.collector.receiver.grpc.channelz; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.InetSocketAddress; @@ -16,7 +16,7 @@ public void testAddSocket() { registry.addSocket(logId, remote, local); Long removedLogId = registry.removeSocket(remote); - Assert.assertEquals(logId, removedLogId.longValue()); + Assertions.assertEquals(logId, removedLogId.longValue()); } @Test @@ -34,9 +34,9 @@ public void testAddSocket_multiple() { registry.addSocket(logId2, remote2, local2); Long removedLogId = registry.removeSocket(remote1); - Assert.assertEquals(logId1, removedLogId.longValue()); + Assertions.assertEquals(logId1, removedLogId.longValue()); - Assert.assertEquals(-1L, registry.removeSocket(remote1).longValue()); + Assertions.assertEquals(-1L, registry.removeSocket(remote1).longValue()); } @Test @@ -50,10 +50,10 @@ public void testMemoryleak() { registry.addSocket(logId1, remote1, local1); long removedLogId = registry.removeSocket(remote1); - Assert.assertEquals(logId1, removedLogId); + Assertions.assertEquals(logId1, removedLogId); - Assert.assertEquals(0, registry.getRemoteAddressSocketMapSize()); - Assert.assertEquals(0, registry.getSocketMapSize()); + Assertions.assertEquals(0, registry.getRemoteAddressSocketMapSize()); + Assertions.assertEquals(0, registry.getSocketMapSize()); } @Test @@ -65,6 +65,6 @@ public void testMemoryleak2() { registry.addSocket(1, remote1, local1); InetSocketAddress unkonwn = InetSocketAddress.createUnresolved("2.2.2.2", 9991); - Assert.assertEquals(-1L, registry.removeSocket(unkonwn).longValue()); + Assertions.assertEquals(-1L, registry.removeSocket(unkonwn).longValue()); } } \ No newline at end of file diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/command/GrpcCommandServiceTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/command/GrpcCommandServiceTest.java index 994daee9f71c..a18b519ef78d 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/command/GrpcCommandServiceTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/command/GrpcCommandServiceTest.java @@ -43,8 +43,8 @@ import org.awaitility.Awaitility; import org.awaitility.core.ConditionFactory; import org.awaitility.core.ConditionTimeoutException; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.io.IOException; @@ -106,14 +106,14 @@ public void oldVersionHandshakeFailTest() throws IOException, PinpointZookeeperE final TempServerCallStreamObserver requestObserver = new TempServerCallStreamObserver<>(); StreamObserver handleMessageObserver = commandService.handleCommand(requestObserver); - Assert.assertThrows(ConditionTimeoutException.class, () -> { + Assertions.assertThrows(ConditionTimeoutException.class, () -> { Awaitility.await("oldVersionHandshakeFailTest") .timeout(400, TimeUnit.MILLISECONDS) .until(manager::getClusterData, hasSize(1)); } ); - Assert.assertNotNull(requestObserver.getLatestException()); + Assertions.assertNotNull(requestObserver.getLatestException()); } } @@ -153,23 +153,23 @@ private void assertHandleMessage(GrpcCommandService commandService, TransportMet RecordedStreamObserver recordedStreamObserver = new RecordedStreamObserver<>(); PCmdEchoResponse defaultInstance = PCmdEchoResponse.getDefaultInstance(); commandService.commandEcho(defaultInstance, recordedStreamObserver); - Assert.assertNull(recordedStreamObserver.getLatestThrowable()); + Assertions.assertNull(recordedStreamObserver.getLatestThrowable()); attachContext(createTransportMetaData(transportMetaData.getRemoteAddress(), transportMetaData.getTransportId() + 1)); commandService.commandEcho(defaultInstance, recordedStreamObserver); - Assert.assertNotNull(recordedStreamObserver.getLatestThrowable()); + Assertions.assertNotNull(recordedStreamObserver.getLatestThrowable()); StreamObserver pCmdActiveThreadCountResStreamObserver = commandService.commandStreamActiveThreadCount(new TempServerCallStreamObserver<>()); - Assert.assertNotNull(pCmdActiveThreadCountResStreamObserver); + Assertions.assertNotNull(pCmdActiveThreadCountResStreamObserver); attachContext(transportMetaData); TempServerCallStreamObserver streamConnectionManagerObserver = new TempServerCallStreamObserver<>(); pCmdActiveThreadCountResStreamObserver = commandService.commandStreamActiveThreadCount(streamConnectionManagerObserver); - Assert.assertNull(streamConnectionManagerObserver.getLatestException()); + Assertions.assertNull(streamConnectionManagerObserver.getLatestException()); pCmdActiveThreadCountResStreamObserver.onNext(PCmdActiveThreadCountRes.getDefaultInstance()); - Assert.assertNotNull(streamConnectionManagerObserver.getLatestException()); + Assertions.assertNotNull(streamConnectionManagerObserver.getLatestException()); } private TransportMetadata createTransportMetaData(InetSocketAddress remoteAddress, long transportId) { diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/tcp/AgentEventAsyncTaskServiceTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/tcp/AgentEventAsyncTaskServiceTest.java index a3907c8ba37b..4d7106a447d2 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/tcp/AgentEventAsyncTaskServiceTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/tcp/AgentEventAsyncTaskServiceTest.java @@ -25,8 +25,8 @@ import com.navercorp.pinpoint.rpc.packet.HandshakePropertyType; import com.navercorp.pinpoint.rpc.server.ChannelProperties; import com.navercorp.pinpoint.rpc.server.ChannelPropertiesFactory; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -34,7 +34,7 @@ import java.util.HashMap; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -57,7 +57,7 @@ public class AgentEventAsyncTaskServiceTest { private static final Map TEST_CHANNEL_PROPERTIES = createTestChannelProperties(); - @Before + @BeforeEach public void setUp() throws Exception { MockitoAnnotations.initMocks(this); this.agentEventAsyncTaskService = new AgentEventAsyncTaskService(agentEventService); diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/tcp/AgentLifeCycleAsyncTaskServiceTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/tcp/AgentLifeCycleAsyncTaskServiceTest.java index b31fcaa2255b..7efb20b76857 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/tcp/AgentLifeCycleAsyncTaskServiceTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/tcp/AgentLifeCycleAsyncTaskServiceTest.java @@ -31,27 +31,29 @@ import com.navercorp.pinpoint.rpc.packet.HandshakePropertyType; import com.navercorp.pinpoint.rpc.server.ChannelProperties; import com.navercorp.pinpoint.rpc.server.ChannelPropertiesFactory; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Spy; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.math.BigInteger; import java.util.HashMap; import java.util.Map; import java.util.concurrent.Executor; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; /** * @author HyunGil Jeong */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class AgentLifeCycleAsyncTaskServiceTest { // FIX guava 19.0.0 update error. MoreExecutors.sameThreadExecutor(); change final class diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/tcp/AgentLifeCycleChangeEventHandlerTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/tcp/AgentLifeCycleChangeEventHandlerTest.java index 9a04222dc809..451945e75013 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/tcp/AgentLifeCycleChangeEventHandlerTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/tcp/AgentLifeCycleChangeEventHandlerTest.java @@ -27,22 +27,32 @@ import com.navercorp.pinpoint.rpc.server.ChannelProperties; import com.navercorp.pinpoint.rpc.server.ChannelPropertiesFactory; import com.navercorp.pinpoint.rpc.server.PinpointServer; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import java.util.HashSet; import java.util.Set; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.anyLong; +import static org.mockito.Mockito.anyMap; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; /** * @author HyunGil Jeong */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class AgentLifeCycleChangeEventHandlerTest { @Mock @@ -60,7 +70,7 @@ public class AgentLifeCycleChangeEventHandlerTest { @InjectMocks private AgentLifeCycleChangeEventHandler lifeCycleChangeEventHandler; - @Before + @BeforeEach public void setUp() throws Exception { doReturn("TestPinpointServer").when(this.server).toString(); when(channelPropertiesFactory.newChannelProperties(anyMap())).thenReturn(mock(ChannelProperties.class)); @@ -107,6 +117,7 @@ public void unexpectedCloseByServerStatesShouldBeHandledCorrectly() { } @Test + @MockitoSettings(strictness = Strictness.LENIENT) public void unmanagedStatesShouldNotBeHandled() { // given final Set unmanagedStates = new HashSet<>(); diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/tcp/TCPReceiverTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/tcp/TCPReceiverTest.java index 6ec3f0b0048c..2eaf6d651efb 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/tcp/TCPReceiverTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/tcp/TCPReceiverTest.java @@ -16,10 +16,10 @@ package com.navercorp.pinpoint.collector.receiver.thrift.tcp; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.InetAddress; import java.net.UnknownHostException; @@ -40,11 +40,11 @@ public void l4ip() throws UnknownHostException { public void l4ipList() throws UnknownHostException { String two = "10.12.13.10,10.12.13.20"; String[] split = two.split(","); - Assert.assertEquals(split.length, 2); + Assertions.assertEquals(split.length, 2); String twoEmpty = "10.12.13.10,"; String[] splitEmpty = twoEmpty.split(","); - Assert.assertEquals(splitEmpty.length, 1); + Assertions.assertEquals(splitEmpty.length, 1); } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/NettyUdpReceiverTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/NettyUdpReceiverTest.java index 6dd268c289ed..e42af65340fb 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/NettyUdpReceiverTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/NettyUdpReceiverTest.java @@ -16,14 +16,19 @@ package com.navercorp.pinpoint.collector.receiver.thrift.udp; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jboss.netty.bootstrap.ConnectionlessBootstrap; -import org.jboss.netty.channel.*; +import org.jboss.netty.channel.ChannelHandlerContext; +import org.jboss.netty.channel.ChannelPipeline; +import org.jboss.netty.channel.ChannelPipelineFactory; +import org.jboss.netty.channel.Channels; +import org.jboss.netty.channel.MessageEvent; +import org.jboss.netty.channel.SimpleChannelHandler; import org.jboss.netty.channel.socket.DatagramChannelFactory; import org.jboss.netty.channel.socket.nio.NioDatagramChannelFactory; -import org.junit.Ignore; -import org.junit.Test; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.springframework.util.SocketUtils; import java.io.IOException; @@ -36,17 +41,18 @@ /** * @author emeroad */ -@Ignore +@Disabled public class NettyUdpReceiverTest { public static final int PORT = SocketUtils.findAvailableUdpPort(30011); private final Logger logger = LogManager.getLogger(this.getClass()); private final CountDownLatch latch = new CountDownLatch(1); + /* - * netty io thread is single-threaded even for udp. - * this is for running multiple workers. - * */ + * netty io thread is single-threaded even for udp. + * this is for running multiple workers. + * */ @Test public void server() throws IOException, InterruptedException { @@ -73,7 +79,7 @@ public void run() { // @Override // public void run() { // try { - start(); + start(); // } catch (IOException e) { // e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. // } @@ -91,7 +97,7 @@ private void start() throws IOException, InterruptedException { DatagramSocket so = new DatagramSocket(); so.connect(new InetSocketAddress("127.0.0.1", PORT)); int count = 1000; - for (int i = 0 ; i< count; i++) { + for (int i = 0; i < count; i++) { byte[] bytes = new byte[100]; DatagramPacket datagramPacket = new DatagramPacket(bytes, bytes.length); so.send(datagramPacket); @@ -113,7 +119,7 @@ public void messageReceived(ChannelHandlerContext ctx, MessageEvent e) throws Ex logger.debug("sleep:{}", name); Thread.sleep(10000); // if (!name.equals("New I/O worker #1")) { - logger.debug("messageReceived thread-{} message:", Thread.currentThread().getName()); + logger.debug("messageReceived thread-{} message:", Thread.currentThread().getName()); // } } }); diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/NetworkAvailabilityCheckPacketFilterTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/NetworkAvailabilityCheckPacketFilterTest.java index 98b5148a10b6..0c71a532c47f 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/NetworkAvailabilityCheckPacketFilterTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/NetworkAvailabilityCheckPacketFilterTest.java @@ -18,12 +18,12 @@ import com.navercorp.pinpoint.thrift.dto.TSpan; import com.navercorp.pinpoint.thrift.io.NetworkAvailabilityCheckPacket; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.net.DatagramPacket; import java.net.DatagramSocket; @@ -41,14 +41,14 @@ public class NetworkAvailabilityCheckPacketFilterTest { private DatagramSocket senderSocket; private DatagramSocket receiverSocket; - @Before + @BeforeEach public void setUp() throws Exception { filter = new NetworkAvailabilityCheckPacketFilter(); senderSocket = new DatagramSocket(0); receiverSocket = new DatagramSocket(0); } - @After + @AfterEach public void tearDown() throws Exception { try { senderSocket.close(); @@ -66,17 +66,17 @@ public void testFilter() throws Exception { SocketAddress localSocketAddress = senderSocket.getLocalSocketAddress(); logger.debug("localSocket:{}", localSocketAddress); - NetworkAvailabilityCheckPacket packet = new NetworkAvailabilityCheckPacket(); + NetworkAvailabilityCheckPacket packet = new NetworkAvailabilityCheckPacket(); SocketAddress inetSocketAddress = new InetSocketAddress("localhost", senderSocket.getLocalPort()); boolean skipResult = filter.filter(receiverSocket, packet, inetSocketAddress); - Assert.assertEquals(skipResult, TBaseFilter.BREAK); + Assertions.assertEquals(skipResult, TBaseFilter.BREAK); DatagramPacket receivePacket = new DatagramPacket(new byte[100], 100); senderSocket.receive(receivePacket); - Assert.assertEquals(receivePacket.getLength(), NetworkAvailabilityCheckPacket.DATA_OK.length); - Assert.assertArrayEquals(Arrays.copyOf(receivePacket.getData(), NetworkAvailabilityCheckPacket.DATA_OK.length), NetworkAvailabilityCheckPacket.DATA_OK); + Assertions.assertEquals(receivePacket.getLength(), NetworkAvailabilityCheckPacket.DATA_OK.length); + Assertions.assertArrayEquals(Arrays.copyOf(receivePacket.getData(), NetworkAvailabilityCheckPacket.DATA_OK.length), NetworkAvailabilityCheckPacket.DATA_OK); } @@ -89,7 +89,7 @@ public void testFilter_Continue() { TSpan skip = new TSpan(); boolean skipResult = filter.filter(receiverSocket, skip, null); - Assert.assertEquals(skipResult, TBaseFilter.CONTINUE); + Assertions.assertEquals(skipResult, TBaseFilter.CONTINUE); } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/TBaseFilterChainTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/TBaseFilterChainTest.java index 66dcc0078e2d..31bee787c23a 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/TBaseFilterChainTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/TBaseFilterChainTest.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.collector.receiver.thrift.udp; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.InetSocketAddress; import java.util.Collections; diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/UDPReceiverTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/UDPReceiverTest.java index a4ab8ba3c9c1..45e3accd872a 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/UDPReceiverTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/thrift/udp/UDPReceiverTest.java @@ -22,12 +22,12 @@ import com.navercorp.pinpoint.collector.util.ObjectPool; import com.navercorp.pinpoint.collector.util.ObjectPoolFactory; import com.navercorp.pinpoint.common.util.IOUtils; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mockito; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; import org.springframework.util.SocketUtils; import java.io.Closeable; @@ -56,13 +56,14 @@ public class UDPReceiverTest { private final PacketHandler loggingPacketHandler = new PacketHandler() { private final Logger logger = LogManager.getLogger(this.getClass()); + @Override public void receive(DatagramSocket localSocket, DatagramPacket packet) { logger.info("receive localSocket:{} packet:{}", localSocket, packet); } }; - @Before + @BeforeEach public void setUp() throws Exception { this.port = SocketUtils.findAvailableUdpPort(10999); } @@ -83,7 +84,7 @@ public void startStop() { receiver = new UDPReceiver("test", packetHandlerFactory, executor, 8, bindAddress, socketOptionApplier, pool); } catch (Exception e) { logger.debug(e.getMessage(), e); - Assert.fail(e.getMessage()); + Assertions.fail(e.getMessage()); } finally { if (receiver != null) { receiver.shutdown(); @@ -153,12 +154,12 @@ boolean validatePacket(DatagramPacket packet) { datagramSocket.send(new DatagramPacket(new byte[1], 1, addr)); - Assert.assertTrue(awaitLatch(latch)); - Assert.assertEquals(1, zeroPacketCounter.get()); + Assertions.assertTrue(awaitLatch(latch)); + Assertions.assertEquals(1, zeroPacketCounter.get()); Mockito.verify(mockExecutor).execute(any(Runnable.class)); } catch (Exception e) { logger.debug(e.getMessage(), e); - Assert.fail(e.getMessage()); + Assertions.fail(e.getMessage()); } finally { if (receiver != null) { receiver.shutdown(); diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/thrift/config/AgentBaseDataReceiverConfigurationTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/thrift/config/AgentBaseDataReceiverConfigurationTest.java index f88e4c304aa8..2a0c11487e4e 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/thrift/config/AgentBaseDataReceiverConfigurationTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/thrift/config/AgentBaseDataReceiverConfigurationTest.java @@ -16,18 +16,17 @@ package com.navercorp.pinpoint.collector.thrift.config; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; 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.junit.jupiter.SpringExtension; @TestPropertySource(locations = "classpath:test-pinpoint-collector.properties") @ContextConfiguration(classes = AgentBaseDataReceiverConfiguration.class) -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) public class AgentBaseDataReceiverConfigurationTest { @Autowired @@ -36,11 +35,11 @@ public class AgentBaseDataReceiverConfigurationTest { @Test public void properties() { - Assert.assertEquals(configuration.getBindIp(), "0.0.0.2"); - Assert.assertEquals(configuration.getBindPort(), 39994); - Assert.assertEquals(configuration.getWorkerThreadSize(), 33); - Assert.assertEquals(configuration.getWorkerQueueSize(), 29); - Assert.assertTrue(configuration.isWorkerMonitorEnable()); + Assertions.assertEquals(configuration.getBindIp(), "0.0.0.2"); + Assertions.assertEquals(configuration.getBindPort(), 39994); + Assertions.assertEquals(configuration.getWorkerThreadSize(), 33); + Assertions.assertEquals(configuration.getWorkerQueueSize(), 29); + Assertions.assertTrue(configuration.isWorkerMonitorEnable()); } } \ No newline at end of file diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/thrift/config/SpanReceiverConfigurationTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/thrift/config/SpanReceiverConfigurationTest.java index 54dc307bb771..b352912e7143 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/thrift/config/SpanReceiverConfigurationTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/thrift/config/SpanReceiverConfigurationTest.java @@ -16,19 +16,19 @@ package com.navercorp.pinpoint.collector.thrift.config; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; 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.junit.jupiter.SpringExtension; @TestPropertySource(locations = "classpath:test-pinpoint-collector.properties") @ContextConfiguration(classes = SpanReceiverConfiguration.class) -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) public class SpanReceiverConfigurationTest { private final Logger logger = LogManager.getLogger(this.getClass()); @@ -37,15 +37,15 @@ public class SpanReceiverConfigurationTest { @Test public void properties() { - Assert.assertTrue(configuration.isUdpEnable()); - Assert.assertEquals(configuration.getUdpBindIp(), "0.0.0.3"); - Assert.assertEquals(configuration.getUdpBindPort(), 39997); - Assert.assertEquals(configuration.getUdpReceiveBufferSize(), 568); - Assert.assertFalse(configuration.isTcpEnable()); - Assert.assertEquals(configuration.getTcpBindIp(), "0.0.0.4"); - Assert.assertEquals(configuration.getTcpBindPort(), 39998); - Assert.assertEquals(configuration.getWorkerThreadSize(), 3); - Assert.assertEquals(configuration.getWorkerQueueSize(), 4); - Assert.assertFalse(configuration.isWorkerMonitorEnable()); + Assertions.assertTrue(configuration.isUdpEnable()); + Assertions.assertEquals(configuration.getUdpBindIp(), "0.0.0.3"); + Assertions.assertEquals(configuration.getUdpBindPort(), 39997); + Assertions.assertEquals(configuration.getUdpReceiveBufferSize(), 568); + Assertions.assertFalse(configuration.isTcpEnable()); + Assertions.assertEquals(configuration.getTcpBindIp(), "0.0.0.4"); + Assertions.assertEquals(configuration.getTcpBindPort(), 39998); + Assertions.assertEquals(configuration.getWorkerThreadSize(), 3); + Assertions.assertEquals(configuration.getWorkerQueueSize(), 4); + Assertions.assertFalse(configuration.isWorkerMonitorEnable()); } } \ No newline at end of file diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/thrift/config/StatReceiverConfigurationTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/thrift/config/StatReceiverConfigurationTest.java index 80b5740664dc..a30e5bd3bb4c 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/thrift/config/StatReceiverConfigurationTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/thrift/config/StatReceiverConfigurationTest.java @@ -16,17 +16,17 @@ package com.navercorp.pinpoint.collector.thrift.config; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; 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.junit.jupiter.SpringExtension; @TestPropertySource(locations = "classpath:test-pinpoint-collector.properties") @ContextConfiguration(classes = StatReceiverConfiguration.class) -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) public class StatReceiverConfigurationTest { @Autowired @@ -35,16 +35,16 @@ public class StatReceiverConfigurationTest { @Test public void properties() { - Assert.assertFalse(configuration.isUdpEnable()); - Assert.assertEquals(configuration.getUdpBindIp(), "0.0.0.1"); - Assert.assertEquals(configuration.getUdpBindPort(), 39995); - Assert.assertEquals(configuration.getUdpReceiveBufferSize(), 419); - Assert.assertTrue(configuration.isTcpEnable()); - Assert.assertEquals(configuration.getTcpBindIp(), "0.0.0.2"); - Assert.assertEquals(configuration.getTcpBindPort(), 39996); - Assert.assertEquals(configuration.getWorkerThreadSize(), 2); - Assert.assertEquals(configuration.getWorkerQueueSize(), 3); - Assert.assertTrue(configuration.isWorkerMonitorEnable()); + Assertions.assertFalse(configuration.isUdpEnable()); + Assertions.assertEquals(configuration.getUdpBindIp(), "0.0.0.1"); + Assertions.assertEquals(configuration.getUdpBindPort(), 39995); + Assertions.assertEquals(configuration.getUdpReceiveBufferSize(), 419); + Assertions.assertTrue(configuration.isTcpEnable()); + Assertions.assertEquals(configuration.getTcpBindIp(), "0.0.0.2"); + Assertions.assertEquals(configuration.getTcpBindPort(), 39996); + Assertions.assertEquals(configuration.getWorkerThreadSize(), 2); + Assertions.assertEquals(configuration.getWorkerQueueSize(), 3); + Assertions.assertTrue(configuration.isWorkerMonitorEnable()); } } \ No newline at end of file diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/util/AtomicLongMapTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/util/AtomicLongMapTest.java index 23b0b125d7fb..99377f394ad4 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/util/AtomicLongMapTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/util/AtomicLongMapTest.java @@ -18,10 +18,10 @@ import com.google.common.util.concurrent.AtomicLongMap; import com.google.common.util.concurrent.Uninterruptibles; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Map; import java.util.concurrent.CountDownLatch; @@ -47,12 +47,12 @@ public void testIncrement() { Map remove = AtomicLongMapUtils.remove(cache); - Assert.assertEquals((long) remove.get("a"), 3L); - Assert.assertEquals((long) remove.get("b"), 5L); + Assertions.assertEquals((long) remove.get("a"), 3L); + Assertions.assertEquals((long) remove.get("b"), 5L); cache.addAndGet("a", 1L); Map remove2 = AtomicLongMapUtils.remove(cache); - Assert.assertEquals((long) remove2.get("a"), 1L); + Assertions.assertEquals((long) remove2.get("a"), 1L); } @Test @@ -64,7 +64,7 @@ public void updateMax_update() { cache.put(key, 10); long updated = cache.accumulateAndGet(key, 12, Long::max); - Assert.assertEquals(12, updated); + Assertions.assertEquals(12, updated); } @Test @@ -76,7 +76,7 @@ public void updateMax_fail() { cache.put(key, 10); long updated = cache.accumulateAndGet(key, 9, Long::max); - Assert.assertEquals(10, updated); + Assertions.assertEquals(10, updated); } // @Test @@ -140,7 +140,7 @@ public void run() { executorService.shutdown(); logger.debug("total={} sum:{}", totalCounter.get(), sumCounter.get()); - Assert.assertEquals("concurrent remove and increment", totalCounter.get(), sumCounter.get()); + Assertions.assertEquals(totalCounter.get(), sumCounter.get(), "concurrent remove and increment"); } diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/util/CollectorUtilsTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/util/CollectorUtilsTest.java index 0622367e9f99..1ba20135e603 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/util/CollectorUtilsTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/util/CollectorUtilsTest.java @@ -2,8 +2,7 @@ import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; -import org.junit.Test; - +import org.junit.jupiter.api.Test; public class CollectorUtilsTest { diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/util/DatagramPacketFactoryTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/util/DatagramPacketFactoryTest.java index 28c7196a84b5..db9e5034bbc3 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/util/DatagramPacketFactoryTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/util/DatagramPacketFactoryTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.collector.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.DatagramPacket; @@ -31,7 +31,7 @@ public void testCreate() { int bufferLength = 10; DatagramPacketFactory factory = new DatagramPacketFactory(bufferLength); DatagramPacket packet = factory.create(); - Assert.assertEquals(bufferLength, packet.getLength()); + Assertions.assertEquals(bufferLength, packet.getLength()); } @Test @@ -42,7 +42,7 @@ public void testBeforeReturn() { packet.setLength(1); factory.beforeReturn(packet); - Assert.assertEquals(bufferLength, packet.getLength()); + Assertions.assertEquals(bufferLength, packet.getLength()); } } \ No newline at end of file diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/util/DefaultObjectPoolTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/util/DefaultObjectPoolTest.java index ed5a71cff19e..b38b398908e8 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/util/DefaultObjectPoolTest.java +++ b/collector/src/test/java/com/navercorp/pinpoint/collector/util/DefaultObjectPoolTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.collector.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.DatagramPacket; @@ -31,10 +31,10 @@ public void testGetObject() { DefaultObjectPool pool = new DefaultObjectPool<>(new DatagramPacketFactory(), 1); PooledObject pooledObject = pool.getObject(); - Assert.assertEquals(0, pool.size()); + Assertions.assertEquals(0, pool.size()); pooledObject.returnObject(); - Assert.assertEquals(1, pool.size()); + Assertions.assertEquals(1, pool.size()); } @Test @@ -50,7 +50,7 @@ public void testReset() { DatagramPacket check = pooledObject.getObject(); - Assert.assertSame(check, packet); - Assert.assertEquals(packet.getLength(), DatagramPacketFactory.UDP_MAX_PACKET_LENGTH); + Assertions.assertSame(check, packet); + Assertions.assertEquals(packet.getLength(), DatagramPacketFactory.UDP_MAX_PACKET_LENGTH); } } \ No newline at end of file diff --git a/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/AutomaticBufferTest.java b/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/AutomaticBufferTest.java index 984b7e04381a..bbc21a1bf3bc 100644 --- a/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/AutomaticBufferTest.java +++ b/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/AutomaticBufferTest.java @@ -17,12 +17,11 @@ package com.navercorp.pinpoint.common.buffer; import com.navercorp.pinpoint.common.util.BytesUtils; - import org.apache.commons.lang.StringUtils; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; import java.util.Arrays; @@ -42,8 +41,8 @@ public void testPutPrefixedBytes() { Buffer buffer = new AutomaticBuffer(0); buffer.putInt(1); byte[] buf = buffer.getBuffer(); - Assert.assertEquals(buf.length, 4); - Assert.assertEquals(1, BytesUtils.bytesToInt(buf, 0)); + Assertions.assertEquals(buf.length, 4); + Assertions.assertEquals(1, BytesUtils.bytesToInt(buf, 0)); } @@ -59,10 +58,10 @@ public void testPadBytes() { buffer.putPadBytes(test, TOTAL_LENGTH); byte[] result = buffer.getBuffer(); - org.junit.Assert.assertEquals(result.length, TOTAL_LENGTH); - org.junit.Assert.assertTrue("check data", Arrays.equals(Arrays.copyOfRange(test, 0, TEST_SIZE), Arrays.copyOfRange(result, 0, TEST_SIZE))); + Assertions.assertEquals(result.length, TOTAL_LENGTH); + Assertions.assertTrue(Arrays.equals(Arrays.copyOfRange(test, 0, TEST_SIZE), Arrays.copyOfRange(result, 0, TEST_SIZE)), "check data"); byte[] padBytes = new byte[TOTAL_LENGTH - TEST_SIZE]; - org.junit.Assert.assertTrue("check pad", Arrays.equals(Arrays.copyOfRange(padBytes, 0, TEST_SIZE), Arrays.copyOfRange(result, TEST_SIZE, TOTAL_LENGTH))); + Assertions.assertTrue(Arrays.equals(Arrays.copyOfRange(padBytes, 0, TEST_SIZE), Arrays.copyOfRange(result, TEST_SIZE, TOTAL_LENGTH)), "check pad"); } @@ -72,14 +71,14 @@ public void testPadBytes_Error() { Buffer buffer1_1 = new AutomaticBuffer(32); try { buffer1_1.putPadBytes(new byte[11], 10); - Assert.fail("error"); + Assertions.fail("error"); } catch (IndexOutOfBoundsException ignored) { } Buffer buffer1_2 = new AutomaticBuffer(32); try { buffer1_2.putPadBytes(new byte[20], 10); - Assert.fail("error"); + Assertions.fail("error"); } catch (IndexOutOfBoundsException ignored) { } @@ -105,13 +104,13 @@ public void testPadString() { byte[] result = buffer.getBuffer(); String decodedString = new String(result); String trimString = decodedString.trim(); - Assert.assertEquals(result.length, TOTAL_LENGTH); + Assertions.assertEquals(result.length, TOTAL_LENGTH); - Assert.assertEquals("check data", test, trimString); + Assertions.assertEquals(test, trimString, "check data"); String padString = new String(result, TOTAL_LENGTH - TEST_SIZE, PAD_SIZE, StandardCharsets.UTF_8); byte[] padBytes = new byte[TOTAL_LENGTH - TEST_SIZE]; - org.junit.Assert.assertEquals("check pad", padString, new String(padBytes, StandardCharsets.UTF_8)); + Assertions.assertEquals(padString, new String(padBytes, StandardCharsets.UTF_8), "check pad"); } @@ -121,14 +120,14 @@ public void testPadString_Error() { Buffer buffer1_1 = new AutomaticBuffer(32); try { buffer1_1.putPadString(StringUtils.repeat("a", 11), 10); - Assert.fail("error"); + Assertions.fail("error"); } catch (IndexOutOfBoundsException ignored) { } Buffer buffer1_2 = new AutomaticBuffer(32); try { buffer1_2.putPadString(StringUtils.repeat("a", 20), 10); - Assert.fail("error"); + Assertions.fail("error"); } catch (Exception ignored) { } @@ -153,9 +152,9 @@ public void testPut2PrefixedBytes() { checkPut2PrefixedBytes(null); try { - byte[] bytes4 = new byte[Short.MAX_VALUE+1]; + byte[] bytes4 = new byte[Short.MAX_VALUE + 1]; checkPut2PrefixedBytes(bytes4); - Assert.fail("too large bytes"); + Assertions.fail("too large bytes"); } catch (IndexOutOfBoundsException ignored) { } } @@ -165,7 +164,7 @@ private void checkPut2PrefixedBytes(byte[] bytes) { buffer.put2PrefixedBytes(bytes); Buffer copy = new FixedBuffer(buffer.getBuffer()); - Assert.assertArrayEquals(bytes, copy.read2PrefixedBytes()); + Assertions.assertArrayEquals(bytes, copy.read2PrefixedBytes()); } @Test @@ -185,7 +184,7 @@ private void checkPut4PrefixedBytes(byte[] bytes) { buffer.put4PrefixedBytes(bytes); Buffer copy = new FixedBuffer(buffer.getBuffer()); - Assert.assertArrayEquals(bytes, copy.read4PrefixedBytes()); + Assertions.assertArrayEquals(bytes, copy.read4PrefixedBytes()); } @Test @@ -193,11 +192,10 @@ public void testPutPrefixedBytesCheckRange() { Buffer buffer = new AutomaticBuffer(1); buffer.putPrefixedString(null); byte[] internalBuffer = buffer.getInternalBuffer(); - Assert.assertEquals(1, internalBuffer.length); + Assertions.assertEquals(1, internalBuffer.length); } - @Test public void testCurrentTime() { Buffer buffer = new AutomaticBuffer(32); @@ -206,13 +204,13 @@ public void testCurrentTime() { buffer.putSVLong(l); logger.trace("currentTime size:{}", buffer.getOffset()); buffer.setOffset(0); - Assert.assertEquals(buffer.readSVLong(), l); + Assertions.assertEquals(buffer.readSVLong(), l); } @Test - public void testPutVInt() { + public void testPutVInt() { Buffer buffer = new AutomaticBuffer(0); buffer.putVInt(Integer.MAX_VALUE); buffer.putVInt(Integer.MIN_VALUE); @@ -221,11 +219,11 @@ public void testPutVInt() { buffer.putVInt(12345); buffer.setOffset(0); - Assert.assertEquals(buffer.readVInt(), Integer.MAX_VALUE); - Assert.assertEquals(buffer.readVInt(), Integer.MIN_VALUE); - Assert.assertEquals(buffer.readVInt(), 0); - Assert.assertEquals(buffer.readVInt(), 1); - Assert.assertEquals(buffer.readVInt(), 12345); + Assertions.assertEquals(buffer.readVInt(), Integer.MAX_VALUE); + Assertions.assertEquals(buffer.readVInt(), Integer.MIN_VALUE); + Assertions.assertEquals(buffer.readVInt(), 0); + Assertions.assertEquals(buffer.readVInt(), 1); + Assertions.assertEquals(buffer.readVInt(), 12345); } @Test @@ -238,11 +236,11 @@ public void testPutVLong() { buffer.putVLong(12345L); buffer.setOffset(0); - Assert.assertEquals(buffer.readVLong(), Long.MAX_VALUE); - Assert.assertEquals(buffer.readVLong(), Long.MIN_VALUE); - Assert.assertEquals(buffer.readVLong(), 0L); - Assert.assertEquals(buffer.readVLong(), 1L); - Assert.assertEquals(buffer.readVLong(), 12345L); + Assertions.assertEquals(buffer.readVLong(), Long.MAX_VALUE); + Assertions.assertEquals(buffer.readVLong(), Long.MIN_VALUE); + Assertions.assertEquals(buffer.readVLong(), 0L); + Assertions.assertEquals(buffer.readVLong(), 1L); + Assertions.assertEquals(buffer.readVLong(), 12345L); } @Test @@ -255,11 +253,11 @@ public void testPutSVLong() { buffer.putSVLong(12345L); buffer.setOffset(0); - Assert.assertEquals(buffer.readSVLong(), Long.MAX_VALUE); - Assert.assertEquals(buffer.readSVLong(), Long.MIN_VALUE); - Assert.assertEquals(buffer.readSVLong(), 0L); - Assert.assertEquals(buffer.readSVLong(), 1L); - Assert.assertEquals(buffer.readSVLong(), 12345L); + Assertions.assertEquals(buffer.readSVLong(), Long.MAX_VALUE); + Assertions.assertEquals(buffer.readSVLong(), Long.MIN_VALUE); + Assertions.assertEquals(buffer.readSVLong(), 0L); + Assertions.assertEquals(buffer.readSVLong(), 1L); + Assertions.assertEquals(buffer.readSVLong(), 12345L); } @Test @@ -272,11 +270,11 @@ public void testPutSVInt() { buffer.putSVInt(12345); buffer.setOffset(0); - Assert.assertEquals(buffer.readSVInt(), Integer.MAX_VALUE); - Assert.assertEquals(buffer.readSVInt(), Integer.MIN_VALUE); - Assert.assertEquals(buffer.readSVInt(), 0); - Assert.assertEquals(buffer.readSVInt(), 1); - Assert.assertEquals(buffer.readSVInt(), 12345); + Assertions.assertEquals(buffer.readSVInt(), Integer.MAX_VALUE); + Assertions.assertEquals(buffer.readSVInt(), Integer.MIN_VALUE); + Assertions.assertEquals(buffer.readSVInt(), 0); + Assertions.assertEquals(buffer.readSVInt(), 1); + Assertions.assertEquals(buffer.readSVInt(), 12345); } @Test @@ -285,7 +283,7 @@ public void testPut() { buffer.putInt(1); buffer.putLong(1L); buffer.putPrefixedBytes(new byte[10]); - buffer.putByte((byte)1); + buffer.putByte((byte) 1); } @@ -295,15 +293,15 @@ public void testUdp() { // Signature:Header{signature=85, version=100, type=28704} Buffer buffer = new AutomaticBuffer(10); // l4 Udp check payload - buffer.putByte((byte)85); + buffer.putByte((byte) 85); buffer.putByte((byte) 100); - buffer.putShort((short)28704); + buffer.putShort((short) 28704); Buffer read = new FixedBuffer(buffer.getBuffer()); - logger.debug("{}", (char)read.readByte()); - logger.debug("{}", (char)read.readByte()); - logger.debug("{}", (char)read.readByte()); - logger.debug("{}", (char)read.readByte()); + logger.debug("{}", (char) read.readByte()); + logger.debug("{}", (char) read.readByte()); + logger.debug("{}", (char) read.readByte()); + logger.debug("{}", (char) read.readByte()); } @@ -311,18 +309,18 @@ public void testUdp() { public void testRemaining() { final byte[] bytes = new byte[BytesUtils.INT_BYTE_LENGTH]; Buffer buffer = new AutomaticBuffer(bytes); - Assert.assertEquals(buffer.remaining(), 4); - Assert.assertTrue(buffer.hasRemaining()); + Assertions.assertEquals(buffer.remaining(), 4); + Assertions.assertTrue(buffer.hasRemaining()); buffer.putInt(1234); - Assert.assertEquals(buffer.remaining(), 0); - Assert.assertFalse(buffer.hasRemaining()); + Assertions.assertEquals(buffer.remaining(), 0); + Assertions.assertFalse(buffer.hasRemaining()); // auto expanded buffer size - buffer.putShort((short)12); + buffer.putShort((short) 12); // remaining size increment is right operation?? - Assert.assertTrue(buffer.remaining() > 0); - Assert.assertTrue(buffer.hasRemaining()); + Assertions.assertTrue(buffer.remaining() > 0); + Assertions.assertTrue(buffer.hasRemaining()); } @@ -334,17 +332,17 @@ public void testExpendMultiplier_2multiplier() { buffer.putBytes(new byte[8]); logger.debug("bufferSize:{} offset:{}", buffer.getInternalBuffer().length, buffer.getOffset()); - Assert.assertEquals(buffer.getInternalBuffer().length, 8); + Assertions.assertEquals(buffer.getInternalBuffer().length, 8); buffer.putBytes(new byte[8]); logger.debug("bufferSize:{} offset:{}", buffer.getInternalBuffer().length, buffer.getOffset()); - Assert.assertEquals(buffer.getInternalBuffer().length, 16); + Assertions.assertEquals(buffer.getInternalBuffer().length, 16); buffer.putBytes(new byte[8]); logger.debug("bufferSize:{} offset:{}", buffer.getInternalBuffer().length, buffer.getOffset()); - Assert.assertEquals(buffer.getInternalBuffer().length, 32); + Assertions.assertEquals(buffer.getInternalBuffer().length, 32); } @Test @@ -352,15 +350,15 @@ public void testExpendMultiplier_4multiplier() { int bufferSize = 4; Buffer buffer = new AutomaticBuffer(bufferSize); - buffer.putBytes(new byte[5*4]); + buffer.putBytes(new byte[5 * 4]); logger.debug("bufferSize:{} offset:{}", buffer.getInternalBuffer().length, buffer.getOffset()); - Assert.assertEquals(buffer.getInternalBuffer().length, 32); + Assertions.assertEquals(buffer.getInternalBuffer().length, 32); - buffer.putBytes(new byte[8*4]); + buffer.putBytes(new byte[8 * 4]); logger.debug("bufferSize:{} offset:{}", buffer.getInternalBuffer().length, buffer.getOffset()); - Assert.assertEquals(buffer.getInternalBuffer().length, 64); + Assertions.assertEquals(buffer.getInternalBuffer().length, 64); } diff --git a/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/FixedBufferTest.java b/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/FixedBufferTest.java index 1b7a66ac32c0..99a5e47ac013 100644 --- a/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/FixedBufferTest.java +++ b/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/FixedBufferTest.java @@ -17,12 +17,11 @@ package com.navercorp.pinpoint.common.buffer; import com.navercorp.pinpoint.common.util.BytesUtils; - import org.apache.commons.lang.StringUtils; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; import java.nio.charset.Charset; @@ -61,10 +60,10 @@ private void testPutPrefixedBytes(String test, int expected) { Buffer actual = new FixedBuffer(buffer1); String s = actual.readPrefixedString(); - Assert.assertEquals(test, s); + Assertions.assertEquals(test, s); int i = actual.readInt(); - Assert.assertEquals(expected, i); + Assertions.assertEquals(expected, i); } @Test @@ -79,10 +78,10 @@ public void testPadBytes() { buffer.putPadBytes(test, TOTAL_LENGTH); byte[] result = buffer.getBuffer(); - Assert.assertEquals(result.length, TOTAL_LENGTH); - Assert.assertTrue("check data", Arrays.equals(Arrays.copyOfRange(test, 0, TEST_SIZE), Arrays.copyOfRange(result, 0, TEST_SIZE))); + Assertions.assertEquals(result.length, TOTAL_LENGTH); + Assertions.assertTrue(Arrays.equals(Arrays.copyOfRange(test, 0, TEST_SIZE), Arrays.copyOfRange(result, 0, TEST_SIZE)), "check data"); byte[] padBytes = new byte[TOTAL_LENGTH - TEST_SIZE]; - Assert.assertTrue("check pad", Arrays.equals(Arrays.copyOfRange(padBytes, 0, TEST_SIZE), Arrays.copyOfRange(result, TEST_SIZE, TOTAL_LENGTH))); + Assertions.assertTrue(Arrays.equals(Arrays.copyOfRange(padBytes, 0, TEST_SIZE), Arrays.copyOfRange(result, TEST_SIZE, TOTAL_LENGTH)), "check pad"); } @@ -96,9 +95,9 @@ public void readPadBytes() { Buffer readBuffer = new FixedBuffer(writeBuffer.getBuffer()); byte[] readPadBytes = readBuffer.readPadBytes(20); - Assert.assertArrayEquals(bytes, Arrays.copyOf(readPadBytes, 10)); + Assertions.assertArrayEquals(bytes, Arrays.copyOf(readPadBytes, 10)); int readInt = readBuffer.readInt(); - Assert.assertEquals(255, readInt); + Assertions.assertEquals(255, readInt); } @@ -108,14 +107,14 @@ public void testPadBytes_Error() { Buffer buffer1_1 = new FixedBuffer(32); try { buffer1_1.putPadBytes(new byte[11], 10); - Assert.fail("error"); + Assertions.fail("error"); } catch (IndexOutOfBoundsException ignored) { } Buffer buffer1_2 = new FixedBuffer(32); try { buffer1_2.putPadBytes(new byte[20], 10); - Assert.fail("error"); + Assertions.fail("error"); } catch (IndexOutOfBoundsException ignored) { } @@ -129,7 +128,7 @@ public void testPadString() throws Exception { int TOTAL_LENGTH = 20; int TEST_SIZE = 10; int PAD_SIZE = TOTAL_LENGTH - TEST_SIZE; - Buffer buffer= new FixedBuffer(32); + Buffer buffer = new FixedBuffer(32); String test = StringUtils.repeat("a", TEST_SIZE); buffer.putPadString(test, TOTAL_LENGTH); @@ -137,13 +136,13 @@ public void testPadString() throws Exception { byte[] result = buffer.getBuffer(); String decodedString = new String(result); String trimString = decodedString.trim(); - Assert.assertEquals(result.length, TOTAL_LENGTH); + Assertions.assertEquals(result.length, TOTAL_LENGTH); - Assert.assertEquals("check data", test, trimString); + Assertions.assertEquals(test, trimString, "check data"); String padString = new String(result, TOTAL_LENGTH - TEST_SIZE, PAD_SIZE, UTF8_CHARSET.name()); byte[] padBytes = new byte[TOTAL_LENGTH - TEST_SIZE]; - Assert.assertEquals("check pad", padString, new String(padBytes, UTF8_CHARSET)); + Assertions.assertEquals(padString, new String(padBytes, UTF8_CHARSET), "check pad"); } @@ -156,9 +155,9 @@ public void readPadString() { Buffer readBuffer = new FixedBuffer(writeBuffer.getBuffer()); String readPadString = readBuffer.readPadString(20); - Assert.assertEquals(testString, readPadString.substring(0, 10)); + Assertions.assertEquals(testString, readPadString.substring(0, 10)); int readInt = readBuffer.readInt(); - Assert.assertEquals(255, readInt); + Assertions.assertEquals(255, readInt); } @Test @@ -170,9 +169,9 @@ public void readPadStringAndRightTrim() { Buffer readBuffer = new FixedBuffer(writeBuffer.getBuffer()); String readPadString = readBuffer.readPadStringAndRightTrim(20); - Assert.assertEquals(testString, readPadString); + Assertions.assertEquals(testString, readPadString); int readInt = readBuffer.readInt(); - Assert.assertEquals(255, readInt); + Assertions.assertEquals(255, readInt); } @Test @@ -187,7 +186,7 @@ public void testPadString_Error() { Buffer buffer1_2 = new FixedBuffer(32); try { buffer1_2.putPadString(StringUtils.repeat("a", 20), 10); - Assert.fail("error"); + Assertions.fail("error"); } catch (IndexOutOfBoundsException ignored) { } @@ -210,7 +209,7 @@ public void testPut2PrefixedBytes() { try { byte[] bytes2 = new byte[Short.MAX_VALUE + 1]; checkPut2PrefixedBytes(BytesUtils.toString(bytes2), endExpected, Short.MAX_VALUE * 2); - Assert.fail("too large bytes"); + Assertions.fail("too large bytes"); } catch (IndexOutOfBoundsException ignored) { } @@ -233,10 +232,10 @@ private void checkPut2PrefixedBytes(String test, int expected, int bufferSize) { Buffer actual = new FixedBuffer(buffer1); String s = actual.read2PrefixedString(); - Assert.assertEquals(test, s); + Assertions.assertEquals(test, s); int i = actual.readInt(); - Assert.assertEquals(expected, i); + Assertions.assertEquals(expected, i); } @Test @@ -263,10 +262,10 @@ private void checkPut4PrefixedBytes(String test, int expected) { Buffer actual = new FixedBuffer(buffer1); String s = actual.read4PrefixedString(); - Assert.assertEquals(test, s); + Assertions.assertEquals(test, s); int i = actual.readInt(); - Assert.assertEquals(expected, i); + Assertions.assertEquals(expected, i); } @Test @@ -290,8 +289,6 @@ public void testReadLong() { } - - @Test public void testReadPrefixedString() { @@ -315,7 +312,7 @@ public void testRead4PrefixedString() { Buffer buffer = new FixedBuffer(result); String prefixedString = buffer.read4PrefixedString(); - Assert.assertEquals(prefixedString, value); + Assertions.assertEquals(prefixedString, value); } @@ -327,7 +324,7 @@ public void testRead4PrefixedString_Null() { Buffer buffer = new FixedBuffer(length); String prefixedString = buffer.read4PrefixedString(); - Assert.assertEquals(prefixedString, null); + Assertions.assertEquals(prefixedString, null); } @@ -339,12 +336,12 @@ public void testPut() { } /** - * bound 1->0 - * bound 2->128 - * bound 3->16384 - * bound 4->2097152 - * bound 5->268435456 - */ + * bound 1->0 + * bound 2->128 + * bound 3->16384 + * bound 4->2097152 + * bound 5->268435456 + */ @Test public void testPutVInt() { checkVInt(Integer.MAX_VALUE, 5); @@ -387,13 +384,13 @@ private void checkVInt_bufferSize(int v, int offset, int bufferSize) { final Buffer buffer = new FixedBuffer(bufferSize); buffer.putVInt(v); if (offset != -1) { - Assert.assertEquals(buffer.getOffset(), offset); + Assertions.assertEquals(buffer.getOffset(), offset); } else { logger.debug("{} offsetSize:{}", v, buffer.getOffset()); } buffer.setOffset(0); int readV = buffer.readVInt(); - Assert.assertEquals(readV, v); + Assertions.assertEquals(readV, v); } @Test @@ -401,7 +398,7 @@ public void testPutSVInt() { // 63 is the boundary for a 1 byte number checkSVInt(63, -1); // 8191 is the boundary for a 2 byte number - checkSVInt((1024*8)-1, -1); + checkSVInt((1024 * 8) - 1, -1); checkSVInt(3, -1); @@ -421,12 +418,12 @@ public void testPutSVInt() { } -// @Test + // @Test public void find_SVInt_errorCode() { Random random = new Random(); byte[] bytes = new byte[10]; - while(true) { + while (true) { random.nextBytes(bytes); Buffer buffer = new FixedBuffer(bytes); try { @@ -444,12 +441,12 @@ public void find_SVInt_errorCode() { } } -// @Test + // @Test public void find_SVLong_errorCode() { Random random = new Random(); byte[] bytes = new byte[10]; - while(true) { + while (true) { random.nextBytes(bytes); Buffer buffer = new FixedBuffer(bytes); try { @@ -469,41 +466,41 @@ public void find_SVLong_errorCode() { @Test public void readVInt_errorCase() { - byte[] errorCode = new byte[] {-118, -41, -17, -117, -81, -115, -64, -64, -108, -88}; + byte[] errorCode = new byte[]{-118, -41, -17, -117, -81, -115, -64, -64, -108, -88}; Buffer buffer = new FixedBuffer(errorCode); try { buffer.readVInt(); - Assert.fail("invalid VInt"); + Assertions.fail("invalid VInt"); } catch (IllegalArgumentException ignored) { } - Assert.assertEquals(0, buffer.getOffset()); + Assertions.assertEquals(0, buffer.getOffset()); } @Test public void readVLong_errorCase() { - byte[] errorCode = new byte[] {-25, -45, -47, -14, -16, -104, -53, -48, -72, -9}; + byte[] errorCode = new byte[]{-25, -45, -47, -14, -16, -104, -53, -48, -72, -9}; Buffer buffer = new FixedBuffer(errorCode); try { buffer.readVLong(); - Assert.fail("invalid VLong"); + Assertions.fail("invalid VLong"); } catch (IllegalArgumentException ignored) { } - Assert.assertEquals(0, buffer.getOffset()); + Assertions.assertEquals(0, buffer.getOffset()); } private void checkSVInt(int v, int offset) { Buffer buffer = new FixedBuffer(32); buffer.putSVInt(v); if (offset != -1) { - Assert.assertEquals(buffer.getOffset(), offset); + Assertions.assertEquals(buffer.getOffset(), offset); } else { logger.debug("{} offsetSize:{}", v, buffer.getOffset()); } buffer.setOffset(0); int readV = buffer.readSVInt(); - Assert.assertEquals(readV, v); + Assertions.assertEquals(readV, v); } @Test @@ -514,12 +511,12 @@ public void testPutVLong() { checkVLong(Long.MAX_VALUE); checkVLong(Long.MIN_VALUE); - checkVLong(Long.MAX_VALUE/2); - checkVLong(Long.MIN_VALUE/2); + checkVLong(Long.MAX_VALUE / 2); + checkVLong(Long.MIN_VALUE / 2); - checkVLong(Long.MAX_VALUE/128); + checkVLong(Long.MAX_VALUE / 128); - checkVLong(Long.MAX_VALUE/102400); + checkVLong(Long.MAX_VALUE / 102400); checkVLong(900719925474L); checkVLong(9007199254L); @@ -552,7 +549,7 @@ private void checkVLong_bufferSize(long v, int bufferSize) { buffer.setOffset(0); long readV = buffer.readVLong(); - Assert.assertEquals(readV, v); + Assertions.assertEquals(readV, v); if (logger.isTraceEnabled()) { logger.trace("v:{} offset:{}", v, buffer.getOffset()); @@ -566,7 +563,7 @@ private void checkUnsignedByte(int value) { Buffer reader = new FixedBuffer(buffer1); int i = reader.readUnsignedByte(); - Assert.assertEquals(value, i); + Assertions.assertEquals(value, i); } @@ -574,8 +571,8 @@ private void checkUnsignedByte(int value) { public void testGetBuffer() { Buffer buffer = new FixedBuffer(4); buffer.putInt(1); - Assert.assertEquals(buffer.getOffset(), 4); - Assert.assertEquals(buffer.getBuffer().length, 4); + Assertions.assertEquals(buffer.getOffset(), 4); + Assertions.assertEquals(buffer.getBuffer().length, 4); } @Test @@ -585,20 +582,20 @@ public void testWrapByteBuffer() { buffer.putInt(2); final ByteBuffer byteBuffer = buffer.wrapByteBuffer(); - Assert.assertEquals(byteBuffer.getInt(), 1); - Assert.assertEquals(byteBuffer.getInt(), 2); + Assertions.assertEquals(byteBuffer.getInt(), 1); + Assertions.assertEquals(byteBuffer.getInt(), 2); } @Test public void testSliceGetBuffer() { Buffer buffer = new FixedBuffer(5); buffer.putInt(1); - Assert.assertEquals(buffer.getOffset(), 4); - Assert.assertEquals(buffer.getBuffer().length, 4); + Assertions.assertEquals(buffer.getOffset(), 4); + Assertions.assertEquals(buffer.getBuffer().length, 4); byte[] buffer1 = buffer.getBuffer(); byte[] buffer2 = buffer.getBuffer(); - Assert.assertNotSame(buffer1, buffer2); + Assertions.assertNotSame(buffer1, buffer2); } @@ -610,10 +607,10 @@ public void testBoolean() { Buffer read = new FixedBuffer(buffer.getBuffer()); boolean b = read.readBoolean(); - Assert.assertEquals(true, b); + Assertions.assertEquals(true, b); boolean c = read.readBoolean(); - Assert.assertEquals(false, c); + Assertions.assertEquals(false, c); } @Test @@ -626,9 +623,9 @@ public void setByte() { buffer.setByte(0, (byte) buffer.getOffset()); buffer.setOffset(0); - Assert.assertEquals(13, buffer.readByte()); - Assert.assertEquals(123, buffer.readInt()); - Assert.assertEquals(456, buffer.readLong()); + Assertions.assertEquals(13, buffer.readByte()); + Assertions.assertEquals(123, buffer.readInt()); + Assertions.assertEquals(456, buffer.readLong()); } @Test @@ -643,16 +640,16 @@ public void setByte1() { buffer.setOffset(fixedSizeOffset); - Assert.assertEquals("abc", buffer.readPrefixedString()); + Assertions.assertEquals("abc", buffer.readPrefixedString()); } @Test public void testGetOffset() { Buffer buffer = new FixedBuffer(); - Assert.assertEquals(buffer.getOffset(), 0); + Assertions.assertEquals(buffer.getOffset(), 0); buffer.putInt(4); - Assert.assertEquals(buffer.getOffset(), 4); + Assertions.assertEquals(buffer.getOffset(), 4); } @@ -661,21 +658,21 @@ public void testGetOffset() { public void test_remaining() { final byte[] bytes = new byte[BytesUtils.INT_BYTE_LENGTH]; Buffer buffer = new FixedBuffer(bytes); - Assert.assertEquals(buffer.remaining(), 4); - Assert.assertTrue(buffer.hasRemaining()); + Assertions.assertEquals(buffer.remaining(), 4); + Assertions.assertTrue(buffer.hasRemaining()); buffer.putInt(1234); - Assert.assertEquals(buffer.remaining(), 0); - Assert.assertFalse(buffer.hasRemaining()); + Assertions.assertEquals(buffer.remaining(), 0); + Assertions.assertFalse(buffer.hasRemaining()); buffer.setOffset(0); - buffer.putShort((short)12); - Assert.assertEquals(buffer.remaining(), 2); - Assert.assertTrue(buffer.hasRemaining()); + buffer.putShort((short) 12); + Assertions.assertEquals(buffer.remaining(), 2); + Assertions.assertTrue(buffer.hasRemaining()); - buffer.putByte((byte)1); - Assert.assertEquals(buffer.remaining(), 1); - Assert.assertTrue(buffer.hasRemaining()); + buffer.putByte((byte) 1); + Assertions.assertEquals(buffer.remaining(), 1); + Assertions.assertTrue(buffer.hasRemaining()); } diff --git a/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/OffsetAutomaticBufferTest.java b/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/OffsetAutomaticBufferTest.java index 3ff4ba00b7e4..720468456c96 100644 --- a/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/OffsetAutomaticBufferTest.java +++ b/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/OffsetAutomaticBufferTest.java @@ -16,11 +16,10 @@ package com.navercorp.pinpoint.common.buffer; -import org.junit.Assert; - -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; @@ -40,12 +39,12 @@ public void testGetBuffer() { final int putValue = 10; buffer.putInt(putValue); byte[] intBuffer = buffer.getBuffer(); - Assert.assertNotSame("deepcopy", intBuffer, byteArray); - Assert.assertEquals(intBuffer.length, 4); + Assertions.assertNotSame(intBuffer, byteArray, "deepcopy"); + Assertions.assertEquals(intBuffer.length, 4); Buffer read = new FixedBuffer(intBuffer); int value = read.readInt(); - Assert.assertEquals(putValue, value); + Assertions.assertEquals(putValue, value); } @Test @@ -57,12 +56,12 @@ public void testGetBuffer_shallowcopy() { final int putValue = 10; buffer.putInt(putValue); byte[] intBuffer = buffer.getBuffer(); - Assert.assertSame("shallowcopy", intBuffer, byteArray); - Assert.assertEquals(intBuffer.length, 4); + Assertions.assertSame(intBuffer, byteArray, "shallowcopy"); + Assertions.assertEquals(intBuffer.length, 4); Buffer read = new FixedBuffer(intBuffer); int value = read.readInt(); - Assert.assertEquals(putValue, value); + Assertions.assertEquals(putValue, value); } @Test @@ -74,12 +73,12 @@ public void testCopyBuffer() { final int putValue = 10; buffer.putInt(putValue); byte[] intBuffer = buffer.copyBuffer(); - Assert.assertNotSame("deepcopy", intBuffer, byteArray); - Assert.assertEquals(intBuffer.length, 4); + Assertions.assertNotSame(intBuffer, byteArray, "deepcopy"); + Assertions.assertEquals(intBuffer.length, 4); Buffer read = new FixedBuffer(intBuffer); int value = read.readInt(); - Assert.assertEquals(putValue, value); + Assertions.assertEquals(putValue, value); } @Test @@ -91,9 +90,9 @@ public void testWrapByteBuffer() { buffer.putInt(2); ByteBuffer byteBuffer = buffer.wrapByteBuffer(); - Assert.assertSame("shallowcopy", byteArray, byteBuffer.array()); - Assert.assertEquals(1, byteBuffer.getInt()); - Assert.assertEquals(2, byteBuffer.getInt()); + Assertions.assertSame(byteArray, byteBuffer.array(), "shallowcopy"); + Assertions.assertEquals(1, byteBuffer.getInt()); + Assertions.assertEquals(2, byteBuffer.getInt()); } @@ -102,7 +101,7 @@ public void testCheckExpand() { final int bufferSize = 4; int startOffset = 2; Buffer buffer = new OffsetAutomaticBuffer(new byte[bufferSize], startOffset, bufferSize - startOffset); - Assert.assertEquals("remaining", buffer.remaining(), 2); + Assertions.assertEquals(buffer.remaining(), 2, "remaining"); buffer.putInt(1); buffer.putInt(2); @@ -110,8 +109,8 @@ public void testCheckExpand() { logger.debug("remaining:{}", remaining); ByteBuffer byteBuffer = buffer.wrapByteBuffer(); - Assert.assertEquals(1, byteBuffer.getInt()); - Assert.assertEquals(2, byteBuffer.getInt()); + Assertions.assertEquals(1, byteBuffer.getInt()); + Assertions.assertEquals(2, byteBuffer.getInt()); } @@ -119,17 +118,17 @@ public void testCheckExpand() { public void testCheckExpand_test() { final int bufferSize = 4; Buffer buffer = new OffsetAutomaticBuffer(new byte[bufferSize], 0, bufferSize); - Assert.assertEquals("remaining", buffer.remaining(), 4); + Assertions.assertEquals(buffer.remaining(), 4, "remaining"); buffer.putInt(1); - Assert.assertEquals("remaining", buffer.remaining(), 0); + Assertions.assertEquals(buffer.remaining(), 0, "remaining"); buffer.putInt(2); int remaining = buffer.remaining(); logger.debug("remaining:{}", remaining); ByteBuffer byteBuffer = buffer.wrapByteBuffer(); - Assert.assertEquals(1, byteBuffer.getInt()); - Assert.assertEquals(2, byteBuffer.getInt()); + Assertions.assertEquals(1, byteBuffer.getInt()); + Assertions.assertEquals(2, byteBuffer.getInt()); } } diff --git a/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/OffsetFixedBufferTest.java b/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/OffsetFixedBufferTest.java index 2716f29f787c..8b0933185b6a 100644 --- a/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/OffsetFixedBufferTest.java +++ b/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/OffsetFixedBufferTest.java @@ -16,11 +16,10 @@ package com.navercorp.pinpoint.common.buffer; -import org.junit.Assert; - -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; @@ -35,12 +34,12 @@ public void testFixedBuffer() { new OffsetFixedBuffer(new byte[10], 10, 0); try { new OffsetFixedBuffer(new byte[10], 11, 0); - Assert.fail(); + Assertions.fail(); } catch (IndexOutOfBoundsException ignored) { } try { new OffsetFixedBuffer(new byte[10], -1, 0); - Assert.fail(); + Assertions.fail(); } catch (IndexOutOfBoundsException ignored) { } } @@ -49,7 +48,7 @@ public void testFixedBuffer() { public void testFixedBuffer_length() { try { new OffsetFixedBuffer(new byte[10], 0, 11); - Assert.fail(); + Assertions.fail(); } catch (IndexOutOfBoundsException e) { } @@ -64,11 +63,11 @@ public void testGetBuffer() { final int putValue = 10; buffer.putInt(putValue); byte[] intBuffer = buffer.getBuffer(); - Assert.assertEquals(intBuffer.length, 4); + Assertions.assertEquals(intBuffer.length, 4); Buffer read = new FixedBuffer(intBuffer); int value = read.readInt(); - Assert.assertEquals(putValue, value); + Assertions.assertEquals(putValue, value); } @Test @@ -79,11 +78,11 @@ public void testCopyBuffer() { final int putValue = 10; buffer.putInt(putValue); byte[] intBuffer = buffer.copyBuffer(); - Assert.assertEquals(intBuffer.length, 4); + Assertions.assertEquals(intBuffer.length, 4); Buffer read = new FixedBuffer(intBuffer); int value = read.readInt(); - Assert.assertEquals(putValue, value); + Assertions.assertEquals(putValue, value); } @Test @@ -95,8 +94,8 @@ public void testWrapByteBuffer() { buffer.putInt(2); ByteBuffer byteBuffer = buffer.wrapByteBuffer(); - Assert.assertEquals(1, byteBuffer.getInt()); - Assert.assertEquals(2, byteBuffer.getInt()); + Assertions.assertEquals(1, byteBuffer.getInt()); + Assertions.assertEquals(2, byteBuffer.getInt()); } } diff --git a/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/StringCacheableBufferTest.java b/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/StringCacheableBufferTest.java index 3e06d689dcd1..a4a1a0f6daca 100644 --- a/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/StringCacheableBufferTest.java +++ b/commons-buffer/src/test/java/com/navercorp/pinpoint/common/buffer/StringCacheableBufferTest.java @@ -1,8 +1,8 @@ package com.navercorp.pinpoint.common.buffer; import com.navercorp.pinpoint.common.util.LRUCache; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; @@ -24,6 +24,6 @@ public void stringCache() { String s2 = buffer.readPrefixedString(); String s3 = buffer.readPrefixedString(); - Assert.assertSame(s1, s3); + Assertions.assertSame(s1, s3); } } \ No newline at end of file diff --git a/commons-buffer/src/test/java/com/navercorp/pinpoint/common/util/BytesUtilsTest.java b/commons-buffer/src/test/java/com/navercorp/pinpoint/common/util/BytesUtilsTest.java index cafcf9f7ffae..13eb6e900853 100644 --- a/commons-buffer/src/test/java/com/navercorp/pinpoint/common/util/BytesUtilsTest.java +++ b/commons-buffer/src/test/java/com/navercorp/pinpoint/common/util/BytesUtilsTest.java @@ -16,18 +16,19 @@ package com.navercorp.pinpoint.common.util; -import static org.junit.Assert.*; +import com.navercorp.pinpoint.common.buffer.Buffer; +import com.navercorp.pinpoint.common.buffer.FixedBuffer; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.Arrays; -import com.navercorp.pinpoint.common.buffer.Buffer; -import com.navercorp.pinpoint.common.buffer.FixedBuffer; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; public class BytesUtilsTest { @@ -38,37 +39,39 @@ public void testStringLongLongToBytes() { final int strLength = 24; byte[] bytes = BytesUtils.stringLongLongToBytes("123", strLength, 12345, 54321); - Assert.assertEquals("123", BytesUtils.toStringAndRightTrim(bytes, 0, strLength)); - Assert.assertEquals(12345, BytesUtils.bytesToLong(bytes, strLength)); - Assert.assertEquals(54321, BytesUtils.bytesToLong(bytes, strLength + BytesUtils.LONG_BYTE_LENGTH)); + assertEquals("123", BytesUtils.toStringAndRightTrim(bytes, 0, strLength)); + assertEquals(12345, BytesUtils.bytesToLong(bytes, strLength)); + assertEquals(54321, BytesUtils.bytesToLong(bytes, strLength + BytesUtils.LONG_BYTE_LENGTH)); } - @Test(expected = IndexOutOfBoundsException.class) + @Test public void testStringLongLongToBytes_error() { - BytesUtils.stringLongLongToBytes("123", 2, 1, 2); + Assertions.assertThrows(IndexOutOfBoundsException.class, () -> { + BytesUtils.stringLongLongToBytes("123", 2, 1, 2); + }); } @Test public void testStringLongLongToBytes2() { byte[] bytes = BytesUtils.stringLongLongToBytes("123", 10, 1, 2); String s = BytesUtils.toStringAndRightTrim(bytes, 0, 10); - Assert.assertEquals("123", s); + assertEquals("123", s); long l = BytesUtils.bytesToLong(bytes, 10); - Assert.assertEquals(l, 1); + assertEquals(l, 1); long l2 = BytesUtils.bytesToLong(bytes, 10 + BytesUtils.LONG_BYTE_LENGTH); - Assert.assertEquals(l2, 2); + assertEquals(l2, 2); } @Test public void testRightTrim() { String trim = BytesUtils.rightTrim("test "); - Assert.assertEquals("test", trim); + assertEquals("test", trim); String trim1 = BytesUtils.rightTrim("test"); - Assert.assertEquals("test", trim1); + assertEquals("test", trim1); String trim2 = BytesUtils.rightTrim(" test"); - Assert.assertEquals(" test", trim2); + assertEquals(" test", trim2); } @@ -90,52 +93,58 @@ private int byteArrayToInt(byte[] byteArray) { private void checkInt(int i) { byte[] bytes = intToByteArray(i); int i2 = BytesUtils.bytesToInt(bytes, 0); - Assert.assertEquals(i, i2); + assertEquals(i, i2); int i3 = byteArrayToInt(bytes); - Assert.assertEquals(i, i3); + assertEquals(i, i3); } @Test public void testAddStringLong() { byte[] testAgents = BytesUtils.add("testAgent", 11L); byte[] buf = ByteBuffer.allocate(17).put("testAgent".getBytes()).putLong(11L).array(); - Assert.assertArrayEquals(testAgents, buf); + Assertions.assertArrayEquals(testAgents, buf); } - @Test(expected = NullPointerException.class) + @Test public void testAddStringLong_NullError() { - BytesUtils.add((String) null, 11L); + Assertions.assertThrows(NullPointerException.class, () -> { + BytesUtils.add((String) null, 11L); + }); } @Test public void testToFixedLengthBytes() { byte[] testValue = BytesUtils.toFixedLengthBytes("test", 10); - Assert.assertEquals(testValue.length, 10); - Assert.assertEquals(testValue[5], 0); + assertEquals(testValue.length, 10); + assertEquals(testValue[5], 0); byte[] testValue2 = BytesUtils.toFixedLengthBytes(null, 10); - Assert.assertEquals(testValue2.length, 10); + assertEquals(testValue2.length, 10); } - @Test(expected = IndexOutOfBoundsException.class) + @Test public void testToFixedLengthBytes_fail1() { - BytesUtils.toFixedLengthBytes("test", 2); + Assertions.assertThrows(IndexOutOfBoundsException.class, () -> { + BytesUtils.toFixedLengthBytes("test", 2); + }); } - @Test(expected = IndexOutOfBoundsException.class) + @Test public void testToFixedLengthBytes_fail2() { - BytesUtils.toFixedLengthBytes("test", -1); + Assertions.assertThrows(IndexOutOfBoundsException.class, () -> { + BytesUtils.toFixedLengthBytes("test", -1); + }); } @Test public void testConcat() { - byte[] b1 = new byte[] { 1, 2 }; - byte[] b2 = new byte[] { 3, 4 }; + byte[] b1 = new byte[]{1, 2}; + byte[] b2 = new byte[]{3, 4}; byte[] b3 = BytesUtils.concat(b1, b2); - Assert.assertArrayEquals(new byte[] { 1, 2, 3, 4 }, b3); + Assertions.assertArrayEquals(new byte[]{1, 2, 3, 4}, b3); } @Test @@ -149,27 +158,26 @@ public void testZigZag() { private void testEncodingDecodingZigZag(int value) { int encode = BytesUtils.intToZigZag(value); int decode = BytesUtils.zigzagToInt(encode); - Assert.assertEquals(value, decode); + assertEquals(value, decode); } - @Test public void testWriteBytes1() { byte[] buffer = new byte[10]; - byte[] write = new byte[] { 1, 2, 3, 4 }; + byte[] write = new byte[]{1, 2, 3, 4}; - Assert.assertEquals(BytesUtils.writeBytes(buffer, 0, write), write.length); - Assert.assertArrayEquals(Arrays.copyOf(buffer, write.length), write); + assertEquals(BytesUtils.writeBytes(buffer, 0, write), write.length); + Assertions.assertArrayEquals(Arrays.copyOf(buffer, write.length), write); } @Test public void testWriteBytes2() { byte[] buffer = new byte[10]; - byte[] write = new byte[] { 1, 2, 3, 4 }; + byte[] write = new byte[]{1, 2, 3, 4}; int startOffset = 1; - Assert.assertEquals(BytesUtils.writeBytes(buffer, startOffset, write), write.length + startOffset); - Assert.assertArrayEquals(Arrays.copyOfRange(buffer, startOffset, write.length + startOffset), write); + assertEquals(BytesUtils.writeBytes(buffer, startOffset, write), write.length + startOffset); + Assertions.assertArrayEquals(Arrays.copyOfRange(buffer, startOffset, write.length + startOffset), write); } @Test @@ -182,23 +190,25 @@ public void testAppropriateWriteBytes() { src[3] = 4; src[4] = 5; // proper return? - Assert.assertEquals(3, BytesUtils.writeBytes(dst, 1, src, 2, 2)); + assertEquals(3, BytesUtils.writeBytes(dst, 1, src, 2, 2)); // successful write? - Assert.assertEquals(3, dst[1]); - Assert.assertEquals(4, dst[2]); + assertEquals(3, dst[1]); + assertEquals(4, dst[2]); } - @Test(expected = ArrayIndexOutOfBoundsException.class) + @Test public void testOverflowDestinationWriteBytes() { - byte[] dst = new byte[5]; - byte[] src = new byte[10]; - for (int i = 0; i < 10; i++) { - src[i] = (byte) (i + 1); - } + Assertions.assertThrows(ArrayIndexOutOfBoundsException.class, () -> { + byte[] dst = new byte[5]; + byte[] src = new byte[10]; + for (int i = 0; i < 10; i++) { + src[i] = (byte) (i + 1); + } - // overflow! - BytesUtils.writeBytes(dst, 0, src); - // if it does not catch any errors, it means memory leak! + // overflow! + BytesUtils.writeBytes(dst, 0, src); + // if it does not catch any errors, it means memory leak! + }); } @Test @@ -208,24 +218,28 @@ public void testAppropriateBytesToLong() { for (i = 0; i < 12; i++) { such_long[i] = (byte) ((i << 4) + i); } - Assert.assertEquals(0x33445566778899AAl, BytesUtils.bytesToLong(such_long, 3)); + assertEquals(0x33445566778899AAl, BytesUtils.bytesToLong(such_long, 3)); } - @Test(expected = IndexOutOfBoundsException.class) + @Test public void testOverflowBytesToLong() { - byte[] such_long = new byte[12]; - int i; - for (i = 0; i < 12; i++) { - such_long[i] = (byte) ((i << 4) + i); - } - // overflow! - BytesUtils.bytesToLong(such_long, 9); - // if it does not catch any errors, it means memory leak! + Assertions.assertThrows(IndexOutOfBoundsException.class, () -> { + byte[] such_long = new byte[12]; + int i; + for (i = 0; i < 12; i++) { + such_long[i] = (byte) ((i << 4) + i); + } + // overflow! + BytesUtils.bytesToLong(such_long, 9); + // if it does not catch any errors, it means memory leak! + }); } - @Test(expected = NullPointerException.class) + @Test public void testWriteLong_npe() { - BytesUtils.writeLong(1234, null, 0); + Assertions.assertThrows(NullPointerException.class, () -> { + BytesUtils.writeLong(1234, null, 0); + }); } @Test() @@ -246,7 +260,7 @@ public void testWriteLong_fail() { BytesUtils.writeLong(-1l, such_long, 2); for (int i = 2; i < 10; i++) { - Assert.assertEquals((byte) 0xFF, such_long[i]); + assertEquals((byte) 0xFF, such_long[i]); } } @@ -254,22 +268,22 @@ public void testWriteLong_fail() { public void testRightTrim2() { // no space String testStr = "0123456789 abc"; - Assert.assertEquals("0123456789 abc", BytesUtils.rightTrim(testStr)); + assertEquals("0123456789 abc", BytesUtils.rightTrim(testStr)); // right spaced testStr = "0123456789 abcabc! "; - Assert.assertEquals("0123456789 abcabc!", BytesUtils.rightTrim(testStr)); + assertEquals("0123456789 abcabc!", BytesUtils.rightTrim(testStr)); } @Test public void testByteRightTrim1() { byte[] bytes = writeBytes(3, "123", 0, 3); - Assert.assertEquals("123", BytesUtils.toStringAndRightTrim(bytes, 0, 3)); + assertEquals("123", BytesUtils.toStringAndRightTrim(bytes, 0, 3)); byte[] testByte2 = writeBytes(10, "123", 0, 3); - Assert.assertEquals("123", BytesUtils.toStringAndRightTrim(testByte2, 0, 10)); + assertEquals("123", BytesUtils.toStringAndRightTrim(testByte2, 0, 10)); byte[] testByte3 = writeBytes(10, "", 0, 3); - Assert.assertEquals("", BytesUtils.toStringAndRightTrim(testByte3, 0, 10)); + assertEquals("", BytesUtils.toStringAndRightTrim(testByte3, 0, 10)); } private byte[] writeBytes(int bufferSize, String s, int offset, int length) { @@ -283,30 +297,30 @@ private byte[] writeBytes(int bufferSize, String s, int offset, int length) { public void testByteRightTrim2() { // no space byte[] testByte1 = "0123456789 abc".getBytes(StandardCharsets.UTF_8); - Assert.assertEquals("23456789", BytesUtils.toStringAndRightTrim(testByte1, 2, 9)); + assertEquals("23456789", BytesUtils.toStringAndRightTrim(testByte1, 2, 9)); // right spaced byte[] testByte2 = "0123456789 abcabc! ".getBytes(StandardCharsets.UTF_8); - Assert.assertEquals(" abcabc!", BytesUtils.toStringAndRightTrim(testByte2, 10, 10)); + assertEquals(" abcabc!", BytesUtils.toStringAndRightTrim(testByte2, 10, 10)); } @Test public void testRightTrimIndex1() { String testStr = "0123 "; byte[] testBytes = testStr.getBytes(StandardCharsets.UTF_8); - Assert.assertEquals(testStr.trim().length(), BytesUtils.rightTrimIndex(testBytes, 0, testBytes.length)); + assertEquals(testStr.trim().length(), BytesUtils.rightTrimIndex(testBytes, 0, testBytes.length)); } @Test public void testRightTrimIndex2() { String testStr = "0123 "; byte[] testBytes = testStr.getBytes(StandardCharsets.UTF_8); - Assert.assertEquals(testStr.trim().length(), BytesUtils.rightTrimIndex(testBytes, 1, testBytes.length - 1)); + assertEquals(testStr.trim().length(), BytesUtils.rightTrimIndex(testBytes, 1, testBytes.length - 1)); } @Test public void testRightTrimIndex3() { byte[] testBytes = new byte[0]; - Assert.assertEquals(0, BytesUtils.rightTrimIndex(testBytes, 0, testBytes.length)); + assertEquals(0, BytesUtils.rightTrimIndex(testBytes, 0, testBytes.length)); } @Test @@ -337,9 +351,9 @@ public void toStringAndRightTrim() { // @Test public void testBoundaryValueVar32() { int boundSize = 0; - for (int i =0; i< Integer.MAX_VALUE; i++) { + for (int i = 0; i < Integer.MAX_VALUE; i++) { final int size = BytesUtils.computeVar32Size(i); - if (size> boundSize) { + if (size > boundSize) { boundSize = size; logger.debug("bound {}->{}", boundSize, i); } @@ -362,9 +376,9 @@ public void testBoundaryValueVar32() { // @Test public void testBoundaryValueVar64() { int boundSize = 0; - for (long i =0; i< Long.MAX_VALUE; i++) { + for (long i = 0; i < Long.MAX_VALUE; i++) { final int size = BytesUtils.computeVar64Size(i); - if (size> boundSize) { + if (size > boundSize) { boundSize = size; logger.debug("bound {}->{}", boundSize, i); } @@ -385,10 +399,10 @@ public void testVar32() { assertVar32(268435455); assertVar32(268435456); - assertVar32(Integer.MAX_VALUE-1); + assertVar32(Integer.MAX_VALUE - 1); assertVar32(Integer.MAX_VALUE); assertVar32(Integer.MIN_VALUE); - assertVar32(Integer.MIN_VALUE+1); + assertVar32(Integer.MIN_VALUE + 1); assertVar32(-127); assertVar32(-128); @@ -405,16 +419,16 @@ private void assertVar32(int value) { final Buffer buffer = new FixedBuffer(bytes); final int varInt = buffer.readVInt(); - Assert.assertEquals("check value", value, varInt); - assertEquals("check buffer size", buffer.getOffset(), computeBufferSize); + assertEquals(value, varInt, "check value"); + assertEquals(buffer.getOffset(), computeBufferSize, "check buffer size"); final int varInt_ByteUtils1 = BytesUtils.bytesToVar32(buffer.getBuffer(), 0); - Assert.assertEquals("check value", value, varInt_ByteUtils1); + assertEquals(value, varInt_ByteUtils1, "check value"); final byte[] max_buffer = new byte[BytesUtils.VLONG_MAX_SIZE]; BytesUtils.writeVar32(value, max_buffer, 0); final int varInt_ByteUtils2 = BytesUtils.bytesToVar32(max_buffer, 0); - Assert.assertEquals("check value", value, varInt_ByteUtils2); + assertEquals(value, varInt_ByteUtils2, "check value"); } @@ -438,10 +452,10 @@ public void testVar64() { assertVar64(34359738368L); - assertVar64(Long.MAX_VALUE-1); + assertVar64(Long.MAX_VALUE - 1); assertVar64(Long.MAX_VALUE); assertVar64(Long.MIN_VALUE); - assertVar64(Long.MIN_VALUE+1); + assertVar64(Long.MIN_VALUE + 1); assertVar64(-127); assertVar64(-128); @@ -461,7 +475,7 @@ public void testIntToSVar32() { } private void assertIntToSVar32(int value) { - Assert.assertEquals(BytesUtils.bytesToSVar32(BytesUtils.intToSVar32(value), 0), value); + assertEquals(BytesUtils.bytesToSVar32(BytesUtils.intToSVar32(value), 0), value); } @Test @@ -474,7 +488,7 @@ public void testIntToVar32() { } private void assertIntToVar32(int value) { - Assert.assertEquals(BytesUtils.bytesToVar32(BytesUtils.intToVar32(value), 0), value); + assertEquals(BytesUtils.bytesToVar32(BytesUtils.intToVar32(value), 0), value); } private void assertVar64(long value) { @@ -484,16 +498,16 @@ private void assertVar64(long value) { final Buffer buffer = new FixedBuffer(bytes); final long varLong = buffer.readVLong(); - Assert.assertEquals("check value", value, varLong); - assertEquals("check buffer size", buffer.getOffset(), computeBufferSize); + assertEquals(value, varLong, "check value"); + assertEquals(buffer.getOffset(), computeBufferSize, "check buffer size"); final long varLong_ByteUtils1 = BytesUtils.bytesToVar64(buffer.getBuffer(), 0); - Assert.assertEquals("check value", value, varLong_ByteUtils1); + assertEquals(value, varLong_ByteUtils1, "check value"); final byte[] max_buffer = new byte[BytesUtils.VLONG_MAX_SIZE]; BytesUtils.writeVar64(value, max_buffer, 0); final long varLong_ByteUtils2 = BytesUtils.bytesToVar64(max_buffer, 0); - Assert.assertEquals("check value", value, varLong_ByteUtils2); + assertEquals(value, varLong_ByteUtils2, "check value"); } @Test @@ -510,25 +524,25 @@ public void testCheckBound_fail() { try { BytesUtils.checkBounds(buffer, buffer.length, buffer.length); - Assert.fail("bound check fail"); + fail("bound check fail"); } catch (Exception ignored) { } try { BytesUtils.checkBounds(buffer, 2, buffer.length); - Assert.fail("bound check fail"); + fail("bound check fail"); } catch (Exception ignored) { } try { BytesUtils.checkBounds(buffer, -1, buffer.length); - Assert.fail("bound check fail"); + fail("bound check fail"); } catch (Exception ignored) { } try { BytesUtils.bytesToSVar32(new byte[10], 10); - Assert.fail("bound check fail"); + fail("bound check fail"); } catch (Exception ignored) { } @@ -536,10 +550,10 @@ public void testCheckBound_fail() { @Test public void testShortToUnsignedShort() { - Assert.assertEquals(BytesUtils.shortToUnsignedShort((short)0), 0); - Assert.assertEquals(BytesUtils.shortToUnsignedShort(Short.MAX_VALUE), 32767); + assertEquals(BytesUtils.shortToUnsignedShort((short) 0), 0); + assertEquals(BytesUtils.shortToUnsignedShort(Short.MAX_VALUE), 32767); final short maxOver = (short) (Short.MAX_VALUE + 1); - Assert.assertEquals(BytesUtils.shortToUnsignedShort(maxOver), 32768); - Assert.assertEquals(BytesUtils.shortToUnsignedShort((short)-1), 65535); + assertEquals(BytesUtils.shortToUnsignedShort(maxOver), 32768); + assertEquals(BytesUtils.shortToUnsignedShort((short) -1), 65535); } } diff --git a/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/HBaseClientVersionTest.java b/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/HBaseClientVersionTest.java index 915c549a4b51..523b753dbdad 100644 --- a/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/HBaseClientVersionTest.java +++ b/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/HBaseClientVersionTest.java @@ -16,27 +16,27 @@ package com.navercorp.pinpoint.common.hbase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class HBaseClientVersionTest { @Test public void acceptVersion() { HBaseClientVersion v1 = HBaseClientVersion.V1; - Assert.assertTrue(v1.acceptVersion("1.4.0")); - Assert.assertFalse(v1.acceptVersion("2.0.0")); + Assertions.assertTrue(v1.acceptVersion("1.4.0")); + Assertions.assertFalse(v1.acceptVersion("2.0.0")); } @Test public void getHBaseVersion() { - Assert.assertEquals(HBaseClientVersion.V1, HBaseClientVersion.getHBaseVersion("0.9.0")); - Assert.assertEquals(HBaseClientVersion.V1, HBaseClientVersion.getHBaseVersion("1.4.0")); + Assertions.assertEquals(HBaseClientVersion.V1, HBaseClientVersion.getHBaseVersion("0.9.0")); + Assertions.assertEquals(HBaseClientVersion.V1, HBaseClientVersion.getHBaseVersion("1.4.0")); - Assert.assertEquals(HBaseClientVersion.V2, HBaseClientVersion.getHBaseVersion("2.0.0")); + Assertions.assertEquals(HBaseClientVersion.V2, HBaseClientVersion.getHBaseVersion("2.0.0")); - Assert.assertEquals(null, HBaseClientVersion.getHBaseVersion("4.0.0")); + Assertions.assertEquals(null, HBaseClientVersion.getHBaseVersion("4.0.0")); } } \ No newline at end of file diff --git a/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/HbaseTableNameProviderTest.java b/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/HbaseTableNameProviderTest.java index c2f3843f749e..db156a422b26 100644 --- a/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/HbaseTableNameProviderTest.java +++ b/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/HbaseTableNameProviderTest.java @@ -18,11 +18,11 @@ import com.navercorp.pinpoint.common.hbase.namespace.NamespaceValidator; import org.apache.hadoop.hbase.TableName; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.only; import static org.mockito.Mockito.verify; @@ -31,7 +31,7 @@ /** * @author HyunGil Jeong */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class HbaseTableNameProviderTest { private static final String TABLE_QUALIFIER = "testTable"; @@ -39,22 +39,26 @@ public class HbaseTableNameProviderTest { @Mock private NamespaceValidator namespaceValidator; - @Test(expected = IllegalArgumentException.class) + @Test public void nullNamespaceShouldThrowException() { - // Given - final String nullNamespace = null; - // When - new HbaseTableNameProvider(nullNamespace, namespaceValidator); - Assert.fail("Expected IllegalArgumentException to be thrown"); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + // Given + final String nullNamespace = null; + // When + new HbaseTableNameProvider(nullNamespace, namespaceValidator); + Assertions.fail("Expected IllegalArgumentException to be thrown"); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void emptyNamespaceShouldThrowException() { - // Given - final String emptyNamespace = ""; - // When - new HbaseTableNameProvider(emptyNamespace, namespaceValidator); - Assert.fail("Expected IllegalArgumentException to be thrown"); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + // Given + final String emptyNamespace = ""; + // When + new HbaseTableNameProvider(emptyNamespace, namespaceValidator); + Assertions.fail("Expected IllegalArgumentException to be thrown"); + }); } @Test @@ -67,8 +71,8 @@ public void validNamespace() { final TableName tableName = tableNameProvider.getTableName(TABLE_QUALIFIER); // Then verify(namespaceValidator, only()).validate(validNamespace); - Assert.assertEquals(validNamespace, tableName.getNamespaceAsString()); - Assert.assertEquals(TABLE_QUALIFIER, tableName.getQualifierAsString()); + Assertions.assertEquals(validNamespace, tableName.getNamespaceAsString()); + Assertions.assertEquals(TABLE_QUALIFIER, tableName.getQualifierAsString()); } @Test @@ -79,7 +83,7 @@ public void invalidNamespace() { // When try { new HbaseTableNameProvider(invalidNamespace, namespaceValidator); - Assert.fail("Expected IllegalArgumentException to be thrown"); + Assertions.fail("Expected IllegalArgumentException to be thrown"); } catch (IllegalArgumentException e) { verify(namespaceValidator, only()).validate(invalidNamespace); } diff --git a/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/HbaseTableTest.java b/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/HbaseTableTest.java index b3b7b25c8a0a..ca2987508c45 100644 --- a/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/HbaseTableTest.java +++ b/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/HbaseTableTest.java @@ -17,10 +17,8 @@ package com.navercorp.pinpoint.common.hbase; import org.apache.hadoop.hbase.util.Bytes; -import org.junit.Assert; -import org.junit.Test; - -import java.util.Arrays; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Taejin Koo @@ -30,116 +28,116 @@ public class HbaseTableTest { @Test public void agentInfoInfoTest() { HbaseColumnFamily.AgentInfo agentinfoInfo = HbaseColumnFamily.AGENTINFO_INFO; - Assert.assertArrayEquals(Bytes.toBytes("Info"), agentinfoInfo.getName()); - Assert.assertEquals("AgentInfo", agentinfoInfo.getTable().getName()); - Assert.assertArrayEquals(Bytes.toBytes("m"), agentinfoInfo.QUALIFIER_SERVER_META_DATA); - Assert.assertArrayEquals(Bytes.toBytes("i"), agentinfoInfo.QUALIFIER_IDENTIFIER); - Assert.assertArrayEquals(Bytes.toBytes("j"), agentinfoInfo.QUALIFIER_JVM); + Assertions.assertArrayEquals(Bytes.toBytes("Info"), agentinfoInfo.getName()); + Assertions.assertEquals("AgentInfo", agentinfoInfo.getTable().getName()); + Assertions.assertArrayEquals(Bytes.toBytes("m"), agentinfoInfo.QUALIFIER_SERVER_META_DATA); + Assertions.assertArrayEquals(Bytes.toBytes("i"), agentinfoInfo.QUALIFIER_IDENTIFIER); + Assertions.assertArrayEquals(Bytes.toBytes("j"), agentinfoInfo.QUALIFIER_JVM); } @Test public void agentEventEventsTest() { HbaseColumnFamily agentEventEvents = HbaseColumnFamily.AGENT_EVENT_EVENTS; - Assert.assertArrayEquals(Bytes.toBytes("E"), agentEventEvents.getName()); - Assert.assertEquals("AgentEvent", agentEventEvents.getTable().getName()); + Assertions.assertArrayEquals(Bytes.toBytes("E"), agentEventEvents.getName()); + Assertions.assertEquals("AgentEvent", agentEventEvents.getTable().getName()); } @Test public void agentLifecycleStatusTest() { HbaseColumnFamily.AgentLifeCycleStatus agentLifecycleStatus = HbaseColumnFamily.AGENT_LIFECYCLE_STATUS; - Assert.assertArrayEquals(Bytes.toBytes("S"), agentLifecycleStatus.getName()); - Assert.assertEquals("AgentLifeCycle", agentLifecycleStatus.getTable().getName()); - Assert.assertArrayEquals(Bytes.toBytes("states"), agentLifecycleStatus.QUALIFIER_STATES); + Assertions.assertArrayEquals(Bytes.toBytes("S"), agentLifecycleStatus.getName()); + Assertions.assertEquals("AgentLifeCycle", agentLifecycleStatus.getTable().getName()); + Assertions.assertArrayEquals(Bytes.toBytes("states"), agentLifecycleStatus.QUALIFIER_STATES); } @Test public void agentStatStatisticsTest() { HbaseColumnFamily.AgentStatStatistics agentStatStatistics = HbaseColumnFamily.AGENT_STAT_STATISTICS; - Assert.assertArrayEquals(Bytes.toBytes("S"), agentStatStatistics.getName()); - Assert.assertEquals("AgentStatV2", agentStatStatistics.getTable().getName()); - Assert.assertEquals(5 * 60 * 1000, agentStatStatistics.TIMESPAN_MS); + Assertions.assertArrayEquals(Bytes.toBytes("S"), agentStatStatistics.getName()); + Assertions.assertEquals("AgentStatV2", agentStatStatistics.getTable().getName()); + Assertions.assertEquals(5 * 60 * 1000, agentStatStatistics.TIMESPAN_MS); } @Test public void apiMetadataApiTest() { HbaseColumnFamily.ApiMetadata apiMetadataApi = HbaseColumnFamily.API_METADATA_API; - Assert.assertArrayEquals(Bytes.toBytes("Api"), apiMetadataApi.getName()); - Assert.assertEquals("ApiMetaData", apiMetadataApi.getTable().getName()); - Assert.assertArrayEquals(Bytes.toBytes("P_api_signature"), apiMetadataApi.QUALIFIER_SIGNATURE); + Assertions.assertArrayEquals(Bytes.toBytes("Api"), apiMetadataApi.getName()); + Assertions.assertEquals("ApiMetaData", apiMetadataApi.getTable().getName()); + Assertions.assertArrayEquals(Bytes.toBytes("P_api_signature"), apiMetadataApi.QUALIFIER_SIGNATURE); } @Test public void applicationIndexAgentsTest() { HbaseColumnFamily applicationIndexAgents = HbaseColumnFamily.APPLICATION_INDEX_AGENTS; - Assert.assertArrayEquals(Bytes.toBytes("Agents"), applicationIndexAgents.getName()); - Assert.assertEquals("ApplicationIndex", applicationIndexAgents.getTable().getName()); + Assertions.assertArrayEquals(Bytes.toBytes("Agents"), applicationIndexAgents.getName()); + Assertions.assertEquals("ApplicationIndex", applicationIndexAgents.getTable().getName()); } @Test public void applicationStatStatisticsTest() { HbaseColumnFamily.ApplicationStatStatistics applicationStatStatistics = HbaseColumnFamily.APPLICATION_STAT_STATISTICS; - Assert.assertArrayEquals(Bytes.toBytes("S"), applicationStatStatistics.getName()); - Assert.assertEquals("ApplicationStatAggre", applicationStatStatistics.getTable().getName()); - Assert.assertEquals(5 * 60 * 1000, applicationStatStatistics.TIMESPAN_MS); + Assertions.assertArrayEquals(Bytes.toBytes("S"), applicationStatStatistics.getName()); + Assertions.assertEquals("ApplicationStatAggre", applicationStatStatistics.getTable().getName()); + Assertions.assertEquals(5 * 60 * 1000, applicationStatStatistics.TIMESPAN_MS); } @Test public void applicationTraceIndexTraceTest() { HbaseColumnFamily.ApplicationTraceIndexTrace applicationTraceIndexTrace = HbaseColumnFamily.APPLICATION_TRACE_INDEX_TRACE; - Assert.assertArrayEquals(Bytes.toBytes("I"), applicationTraceIndexTrace.getName()); - Assert.assertEquals("ApplicationTraceIndex", applicationTraceIndexTrace.getTable().getName()); - Assert.assertEquals(1, applicationTraceIndexTrace.ROW_DISTRIBUTE_SIZE); + Assertions.assertArrayEquals(Bytes.toBytes("I"), applicationTraceIndexTrace.getName()); + Assertions.assertEquals("ApplicationTraceIndex", applicationTraceIndexTrace.getTable().getName()); + Assertions.assertEquals(1, applicationTraceIndexTrace.ROW_DISTRIBUTE_SIZE); } @Test public void hostApplicationMapVer2MapTest() { HbaseColumnFamily hostApplicationMapVer2Map = HbaseColumnFamily.HOST_APPLICATION_MAP_VER2_MAP; - Assert.assertArrayEquals(Bytes.toBytes("M"), hostApplicationMapVer2Map.getName()); - Assert.assertEquals("HostApplicationMap_Ver2", hostApplicationMapVer2Map.getTable().getName()); + Assertions.assertArrayEquals(Bytes.toBytes("M"), hostApplicationMapVer2Map.getName()); + Assertions.assertEquals("HostApplicationMap_Ver2", hostApplicationMapVer2Map.getTable().getName()); } @Test public void mapStatisticsCalleeVer2CounterTest() { HbaseColumnFamily mapStatisticsCalleeVer2Counter = HbaseColumnFamily.MAP_STATISTICS_CALLEE_VER2_COUNTER; - Assert.assertArrayEquals(Bytes.toBytes("C"), mapStatisticsCalleeVer2Counter.getName()); - Assert.assertEquals("ApplicationMapStatisticsCallee_Ver2", mapStatisticsCalleeVer2Counter.getTable().getName()); + Assertions.assertArrayEquals(Bytes.toBytes("C"), mapStatisticsCalleeVer2Counter.getName()); + Assertions.assertEquals("ApplicationMapStatisticsCallee_Ver2", mapStatisticsCalleeVer2Counter.getTable().getName()); } @Test public void mapStatisticsCallerVer2CounterTest() { HbaseColumnFamily mapStatisticsCallerVer2Counter = HbaseColumnFamily.MAP_STATISTICS_CALLER_VER2_COUNTER; - Assert.assertArrayEquals(Bytes.toBytes("C"), mapStatisticsCallerVer2Counter.getName()); - Assert.assertEquals("ApplicationMapStatisticsCaller_Ver2", mapStatisticsCallerVer2Counter.getTable().getName()); + Assertions.assertArrayEquals(Bytes.toBytes("C"), mapStatisticsCallerVer2Counter.getName()); + Assertions.assertEquals("ApplicationMapStatisticsCaller_Ver2", mapStatisticsCallerVer2Counter.getTable().getName()); } @Test public void mapStatisticsSelfVer2CounterTest() { HbaseColumnFamily mapStatisticsSelfVer2Counter = HbaseColumnFamily.MAP_STATISTICS_SELF_VER2_COUNTER; - Assert.assertArrayEquals(Bytes.toBytes("C"), mapStatisticsSelfVer2Counter.getName()); - Assert.assertEquals("ApplicationMapStatisticsSelf_Ver2", mapStatisticsSelfVer2Counter.getTable().getName()); + Assertions.assertArrayEquals(Bytes.toBytes("C"), mapStatisticsSelfVer2Counter.getName()); + Assertions.assertEquals("ApplicationMapStatisticsSelf_Ver2", mapStatisticsSelfVer2Counter.getTable().getName()); } @Test public void sqlMetadataVer2SqlTest() { HbaseColumnFamily.SqlMetadataV2 sqlMetadataVer2Sql = HbaseColumnFamily.SQL_METADATA_VER2_SQL; - Assert.assertArrayEquals(Bytes.toBytes("Sql"), sqlMetadataVer2Sql.getName()); - Assert.assertEquals("SqlMetaData_Ver2", sqlMetadataVer2Sql.getTable().getName()); - Assert.assertArrayEquals(Bytes.toBytes("P_sql_statement"), sqlMetadataVer2Sql.QUALIFIER_SQLSTATEMENT); + Assertions.assertArrayEquals(Bytes.toBytes("Sql"), sqlMetadataVer2Sql.getName()); + Assertions.assertEquals("SqlMetaData_Ver2", sqlMetadataVer2Sql.getTable().getName()); + Assertions.assertArrayEquals(Bytes.toBytes("P_sql_statement"), sqlMetadataVer2Sql.QUALIFIER_SQLSTATEMENT); } @Test public void stringMetadataStrTest() { HbaseColumnFamily.StringMetadataStr stringMetadataStr = HbaseColumnFamily.STRING_METADATA_STR; - Assert.assertArrayEquals(Bytes.toBytes("Str"), stringMetadataStr.getName()); - Assert.assertEquals("StringMetaData", stringMetadataStr.getTable().getName()); - Assert.assertArrayEquals(Bytes.toBytes("P_string"), stringMetadataStr.QUALIFIER_STRING); + Assertions.assertArrayEquals(Bytes.toBytes("Str"), stringMetadataStr.getName()); + Assertions.assertEquals("StringMetaData", stringMetadataStr.getTable().getName()); + Assertions.assertArrayEquals(Bytes.toBytes("P_string"), stringMetadataStr.QUALIFIER_STRING); } @Test public void traceV2SpanTest() { HbaseColumnFamily traceV2Span = HbaseColumnFamily.TRACE_V2_SPAN; - Assert.assertArrayEquals(Bytes.toBytes("S"), traceV2Span.getName()); - Assert.assertEquals("TraceV2", traceV2Span.getTable().getName()); + Assertions.assertArrayEquals(Bytes.toBytes("S"), traceV2Span.getName()); + Assertions.assertEquals("TraceV2", traceV2Span.getTable().getName()); } } diff --git a/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/HbaseTemplate2IT.java b/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/HbaseTemplate2IT.java index b886ed9fb1a2..f6964765a156 100644 --- a/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/HbaseTemplate2IT.java +++ b/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/HbaseTemplate2IT.java @@ -16,9 +16,7 @@ package com.navercorp.pinpoint.common.hbase; -import java.io.IOException; -import java.util.Properties; - +import com.navercorp.pinpoint.common.util.PropertyUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.TableName; @@ -26,24 +24,26 @@ import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.client.RetriesExhaustedWithDetailsException; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - -import com.navercorp.pinpoint.common.util.PropertyUtils; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import java.io.IOException; +import java.util.Properties; /** * @author emeroad * @author minwoo.jung */ + +@Disabled public class HbaseTemplate2IT { private static Connection connection; private static HbaseTemplate2 hbaseTemplate2; - @BeforeClass + @BeforeAll public static void beforeClass() throws IOException { Properties properties = PropertyUtils.loadPropertyFromClassPath("test-hbase.properties"); @@ -58,7 +58,7 @@ public static void beforeClass() throws IOException { hbaseTemplate2.afterPropertiesSet(); } - @AfterClass + @AfterAll public static void afterClass() throws Exception { if (hbaseTemplate2 != null) { hbaseTemplate2.destroy(); @@ -69,15 +69,14 @@ public static void afterClass() throws Exception { } @Test - @Ignore public void notExist() { try { - hbaseTemplate2.put(TableName.valueOf("NOT_EXIST"), new byte[] {0, 0, 0}, "familyName".getBytes(), "columnName".getBytes(), new byte[]{0, 0, 0}); - Assert.fail("exceptions"); + hbaseTemplate2.put(TableName.valueOf("NOT_EXIST"), new byte[]{0, 0, 0}, "familyName".getBytes(), "columnName".getBytes(), new byte[]{0, 0, 0}); + Assertions.fail("exceptions"); } catch (HbaseSystemException e) { - RetriesExhaustedWithDetailsException exception = (RetriesExhaustedWithDetailsException)(e.getCause()); + RetriesExhaustedWithDetailsException exception = (RetriesExhaustedWithDetailsException) (e.getCause()); if (!(exception.getCause(0) instanceof TableNotFoundException)) { - Assert.fail("unexpected exception :" + e.getCause()); + Assertions.fail("unexpected exception :" + e.getCause()); } } diff --git a/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/bo/ColumnGetCountTest.java b/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/bo/ColumnGetCountTest.java index 1eabd1987960..5813a625ced2 100644 --- a/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/bo/ColumnGetCountTest.java +++ b/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/bo/ColumnGetCountTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.common.hbase.bo; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Taejin Koo @@ -27,12 +27,12 @@ public class ColumnGetCountTest { @Test public void columnGetCountTest() { ColumnGetCount columnGetCount = ColumnGetCountFactory.create(-1); - Assert.assertEquals(Integer.MAX_VALUE, columnGetCount.getLimit()); + Assertions.assertEquals(Integer.MAX_VALUE, columnGetCount.getLimit()); columnGetCount = ColumnGetCountFactory.create(Integer.MAX_VALUE); - Assert.assertEquals(Integer.MAX_VALUE, columnGetCount.getLimit()); + Assertions.assertEquals(Integer.MAX_VALUE, columnGetCount.getLimit()); - Assert.assertFalse(columnGetCount.isReachedLimit(Integer.MAX_VALUE)); + Assertions.assertFalse(columnGetCount.isReachedLimit(Integer.MAX_VALUE)); } @@ -41,11 +41,11 @@ public void columnGetCountTest2() { int countValue = 10; ColumnGetCount columnGetCount = ColumnGetCountFactory.create(countValue); - Assert.assertEquals(countValue, columnGetCount.getLimit()); + Assertions.assertEquals(countValue, columnGetCount.getLimit()); - Assert.assertFalse(columnGetCount.isReachedLimit(0)); + Assertions.assertFalse(columnGetCount.isReachedLimit(0)); - Assert.assertTrue(columnGetCount.isReachedLimit(++countValue)); + Assertions.assertTrue(columnGetCount.isReachedLimit(++countValue)); } diff --git a/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/namespace/HbaseNamespaceValidatorTest.java b/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/namespace/HbaseNamespaceValidatorTest.java index 484e800cd9f4..728fe832ba85 100644 --- a/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/namespace/HbaseNamespaceValidatorTest.java +++ b/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/namespace/HbaseNamespaceValidatorTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.common.hbase.namespace; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author HyunGil Jeong @@ -37,15 +37,15 @@ public void testValidate() { String invalid4 = "abc!"; String invalid5 = null; - Assert.assertTrue(valid1 + " should be valid.", HbaseNamespaceValidator.INSTANCE.validate(valid1)); - Assert.assertTrue(valid2 + " should be valid.", HbaseNamespaceValidator.INSTANCE.validate(valid2)); - Assert.assertTrue(valid3 + " should be valid.", HbaseNamespaceValidator.INSTANCE.validate(valid3)); - Assert.assertTrue(valid4 + " should be valid.", HbaseNamespaceValidator.INSTANCE.validate(valid4)); + Assertions.assertTrue(HbaseNamespaceValidator.INSTANCE.validate(valid1), valid1 + " should be valid."); + Assertions.assertTrue(HbaseNamespaceValidator.INSTANCE.validate(valid2), valid2 + " should be valid."); + Assertions.assertTrue(HbaseNamespaceValidator.INSTANCE.validate(valid3), valid2 + " should be valid."); + Assertions.assertTrue(HbaseNamespaceValidator.INSTANCE.validate(valid4), valid2 + " should be valid."); - Assert.assertFalse(invalid1 + " should be invalid.", HbaseNamespaceValidator.INSTANCE.validate(invalid1)); - Assert.assertFalse(invalid2 + " should be invalid.", HbaseNamespaceValidator.INSTANCE.validate(invalid2)); - Assert.assertFalse(invalid3 + " should be invalid.", HbaseNamespaceValidator.INSTANCE.validate(invalid3)); - Assert.assertFalse(invalid4 + " should be invalid.", HbaseNamespaceValidator.INSTANCE.validate(invalid4)); - Assert.assertFalse(invalid4 + " should be invalid.", HbaseNamespaceValidator.INSTANCE.validate(invalid5)); + Assertions.assertFalse(HbaseNamespaceValidator.INSTANCE.validate(invalid1), invalid1 + " should be invalid."); + Assertions.assertFalse(HbaseNamespaceValidator.INSTANCE.validate(invalid2), invalid2 + " should be invalid."); + Assertions.assertFalse(HbaseNamespaceValidator.INSTANCE.validate(invalid3), invalid3 + " should be invalid."); + Assertions.assertFalse(HbaseNamespaceValidator.INSTANCE.validate(invalid4), invalid4 + " should be invalid."); + Assertions.assertFalse(HbaseNamespaceValidator.INSTANCE.validate(invalid5), invalid5 + " should be invalid."); } } diff --git a/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/util/CellUtilsTest.java b/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/util/CellUtilsTest.java index 59b03665aa73..cf2adad267d4 100644 --- a/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/util/CellUtilsTest.java +++ b/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/util/CellUtilsTest.java @@ -3,8 +3,8 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.util.Bytes; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -23,7 +23,7 @@ public void rowToString() { Cell[] cells = new Cell[]{cell}; when(result.rawCells()).thenReturn(cells); - Assert.assertEquals(CellUtils.rowToString(result), value); + Assertions.assertEquals(CellUtils.rowToString(result), value); } @Test @@ -35,7 +35,7 @@ public void qualifierToInt() { when(cell.getQualifierOffset()).thenReturn(0); when(cell.getQualifierLength()).thenReturn(bytes.length); - Assert.assertEquals(CellUtils.qualifierToInt(cell), value); + Assertions.assertEquals(CellUtils.qualifierToInt(cell), value); } @Test @@ -47,7 +47,7 @@ public void qualifierToString() { when(cell.getQualifierOffset()).thenReturn(0); when(cell.getQualifierLength()).thenReturn(bytes.length); - Assert.assertEquals(CellUtils.qualifierToString(cell), value); + Assertions.assertEquals(CellUtils.qualifierToString(cell), value); } @Test @@ -59,6 +59,6 @@ public void valueToShort() { when(cell.getValueOffset()).thenReturn(0); when(cell.getValueLength()).thenReturn(bytes.length); - Assert.assertEquals(CellUtils.valueToShort(cell), value); + Assertions.assertEquals(CellUtils.valueToShort(cell), value); } } \ No newline at end of file diff --git a/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/util/HbaseTableNameCacheTest.java b/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/util/HbaseTableNameCacheTest.java index c81e7ca38fb8..ad28809fbf18 100644 --- a/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/util/HbaseTableNameCacheTest.java +++ b/commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/util/HbaseTableNameCacheTest.java @@ -18,8 +18,8 @@ import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.TableName; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author HyunGil Jeong @@ -39,12 +39,12 @@ public void emptyNamespaceShouldReturnDefaultNamespace() { TableName tableName2 = cache.get(nullNamespace, qualifier); TableName tableName3 = cache.get(emptyNamespace, qualifier); // Then - Assert.assertEquals(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR, tableName1.getNamespaceAsString()); - Assert.assertEquals(qualifier, tableName1.getQualifierAsString()); - Assert.assertEquals(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR, tableName2.getNamespaceAsString()); - Assert.assertEquals(qualifier, tableName2.getQualifierAsString()); - Assert.assertEquals(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR, tableName3.getNamespaceAsString()); - Assert.assertEquals(qualifier, tableName3.getQualifierAsString()); + Assertions.assertEquals(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR, tableName1.getNamespaceAsString()); + Assertions.assertEquals(qualifier, tableName1.getQualifierAsString()); + Assertions.assertEquals(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR, tableName2.getNamespaceAsString()); + Assertions.assertEquals(qualifier, tableName2.getQualifierAsString()); + Assertions.assertEquals(NamespaceDescriptor.DEFAULT_NAMESPACE_NAME_STR, tableName3.getNamespaceAsString()); + Assertions.assertEquals(qualifier, tableName3.getQualifierAsString()); } @Test @@ -55,17 +55,19 @@ public void specifiedNamespace() { // When TableName tableName = cache.get(namespace, qualifier); // Then - Assert.assertEquals(namespace, tableName.getNamespaceAsString()); - Assert.assertEquals(qualifier, tableName.getQualifierAsString()); + Assertions.assertEquals(namespace, tableName.getNamespaceAsString()); + Assertions.assertEquals(qualifier, tableName.getQualifierAsString()); } - @Test(expected = NullPointerException.class) + @Test public void nullQualifierShouldThrowException() { - // Given - final String nullQualifier = null; - // When - cache.get(nullQualifier); - // Then - Assert.fail(); + Assertions.assertThrows(NullPointerException.class, () -> { + // Given + final String nullQualifier = null; + // When + cache.get(nullQualifier); + // Then + Assertions.fail(); + }); } } diff --git a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/concurrent/PinpointThreadFactoryTest.java b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/concurrent/PinpointThreadFactoryTest.java index c776baf01037..787f12f20a2e 100644 --- a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/concurrent/PinpointThreadFactoryTest.java +++ b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/concurrent/PinpointThreadFactoryTest.java @@ -16,12 +16,10 @@ package com.navercorp.pinpoint.common.profiler.concurrent; -import org.junit.Assert; - -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; - +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.concurrent.atomic.AtomicInteger; @@ -45,12 +43,12 @@ public void run() { thread.start(); thread.join(); - Assert.assertEquals(counter.get(), 1); + Assertions.assertEquals(counter.get(), 1); String threadName = thread.getName(); logger.debug(threadName); - Assert.assertTrue(threadName.startsWith("pinpoint(")); - Assert.assertTrue(threadName.endsWith(")")); + Assertions.assertTrue(threadName.startsWith("pinpoint(")); + Assertions.assertTrue(threadName.endsWith(")")); Thread thread2 = pinpoint.newThread(new Runnable() { @Override diff --git a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/encoding/BitFieldUtilsTest.java b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/encoding/BitFieldUtilsTest.java index fabc5a04a333..b44cf1c72728 100644 --- a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/encoding/BitFieldUtilsTest.java +++ b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/encoding/BitFieldUtilsTest.java @@ -16,11 +16,10 @@ package com.navercorp.pinpoint.common.profiler.encoding; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; - +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -35,13 +34,13 @@ public void testBitField() { int position = 5; bitField = BitFieldUtils.setBit(bitField, position, true); - Assert.assertTrue(BitFieldUtils.testBit(bitField, position)); + Assertions.assertTrue(BitFieldUtils.testBit(bitField, position)); - Assert.assertEquals(BitFieldUtils.getBit(bitField, position), 1); + Assertions.assertEquals(BitFieldUtils.getBit(bitField, position), 1); bitField = -1; bitField = BitFieldUtils.clearBit(bitField, position); - Assert.assertEquals(BitFieldUtils.getBit(bitField, position), 0); + Assertions.assertEquals(BitFieldUtils.getBit(bitField, position), 0); } @@ -52,9 +51,9 @@ public void testGetBit_byte() { int position = 2; bitField = BitFieldUtils.setBit(bitField, position, true); - Assert.assertTrue(BitFieldUtils.testBit(bitField, position)); + Assertions.assertTrue(BitFieldUtils.testBit(bitField, position)); - Assert.assertEquals(BitFieldUtils.getBit(bitField, position), 1); + Assertions.assertEquals(BitFieldUtils.getBit(bitField, position), 1); } @Test @@ -64,36 +63,36 @@ public void testGetBit_int() { int position = 2; bitField = BitFieldUtils.setBit(bitField, position, true); - Assert.assertTrue(BitFieldUtils.testBit(bitField, position)); + Assertions.assertTrue(BitFieldUtils.testBit(bitField, position)); - Assert.assertEquals(BitFieldUtils.getBit(bitField, position), 1); + Assertions.assertEquals(BitFieldUtils.getBit(bitField, position), 1); } @Test public void testGetBit_int_unsigned_shift() { int bitField = 0; - int position = Integer.SIZE-1; + int position = Integer.SIZE - 1; bitField = BitFieldUtils.setBit(bitField, position, true); - Assert.assertTrue(BitFieldUtils.testBit(bitField, position)); - Assert.assertEquals(BitFieldUtils.getBit(bitField, position), 1); + Assertions.assertTrue(BitFieldUtils.testBit(bitField, position)); + Assertions.assertEquals(BitFieldUtils.getBit(bitField, position), 1); } @Test public void testGetBit_long_unsigned_shift() { long bitField = 0; - int position = Long.SIZE -1; + int position = Long.SIZE - 1; bitField = BitFieldUtils.setBit(bitField, position, true); - Assert.assertTrue(BitFieldUtils.testBit(bitField, position)); - Assert.assertEquals(BitFieldUtils.getBit(bitField, position), 1); + Assertions.assertTrue(BitFieldUtils.testBit(bitField, position)); + Assertions.assertEquals(BitFieldUtils.getBit(bitField, position), 1); bitField = BitFieldUtils.setBit(bitField, position, false); - Assert.assertFalse(BitFieldUtils.testBit(bitField, position)); - Assert.assertEquals(BitFieldUtils.getBit(bitField, position), 0); + Assertions.assertFalse(BitFieldUtils.testBit(bitField, position)); + Assertions.assertEquals(BitFieldUtils.getBit(bitField, position), 0); } @Test @@ -102,29 +101,29 @@ public void test_2Bit() { int bitField = 0; int position = 2; - Assert.assertEquals(BitFieldUtils.get2Bit(bitField, position), 0); + Assertions.assertEquals(BitFieldUtils.get2Bit(bitField, position), 0); bitField = set2Bit(bitField, position, true, false); - Assert.assertEquals(BitFieldUtils.get2Bit(bitField, position), 1); + Assertions.assertEquals(BitFieldUtils.get2Bit(bitField, position), 1); bitField = set2Bit(bitField, position, false, true); - Assert.assertEquals(BitFieldUtils.get2Bit(bitField, position), 2); + Assertions.assertEquals(BitFieldUtils.get2Bit(bitField, position), 2); bitField = set2Bit(bitField, position, true, true); - Assert.assertEquals(BitFieldUtils.get2Bit(bitField, position), 3); + Assertions.assertEquals(BitFieldUtils.get2Bit(bitField, position), 3); bitField = -1; - Assert.assertEquals(BitFieldUtils.get2Bit(bitField, position), 3); + Assertions.assertEquals(BitFieldUtils.get2Bit(bitField, position), 3); bitField = set2Bit(bitField, position, false, false); - Assert.assertEquals(BitFieldUtils.get2Bit(bitField, position), 0); + Assertions.assertEquals(BitFieldUtils.get2Bit(bitField, position), 0); } private int set2Bit(int bitField, int position, boolean first, boolean second) { bitField = BitFieldUtils.setBit(bitField, position, first); - bitField = BitFieldUtils.setBit(bitField, position+1, second); + bitField = BitFieldUtils.setBit(bitField, position + 1, second); return bitField; } diff --git a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/logging/ThrottledLoggerTest.java b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/logging/ThrottledLoggerTest.java index 3e507ef81a09..67835e015440 100644 --- a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/logging/ThrottledLoggerTest.java +++ b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/logging/ThrottledLoggerTest.java @@ -2,13 +2,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import org.junit.jupiter.api.Test; public class ThrottledLoggerTest { diff --git a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/sql/DefaultSqlParserTest.java b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/sql/DefaultSqlParserTest.java index 206ea8aa8112..4ca4b09b3bfe 100644 --- a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/sql/DefaultSqlParserTest.java +++ b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/sql/DefaultSqlParserTest.java @@ -16,11 +16,10 @@ package com.navercorp.pinpoint.common.profiler.sql; -import org.junit.Assert; - -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.List; @@ -250,60 +249,60 @@ public void combineBindValue() { String expected = "select * from table a = 1 and b=50 and c='foo' and d='11'"; List bindValues = parameterParser.parseOutputParameter("foo"); String result = sqlParser.combineBindValues(sql, bindValues); - Assert.assertEquals(expected, result); + Assertions.assertEquals(expected, result); sql = "select * from table a = ? and b=? and c=? and d=?"; expected = "select * from table a = '1' and b='50' and c=' foo ' and d='11'"; bindValues = parameterParser.parseOutputParameter("1,50, foo ,11"); result = sqlParser.combineBindValues(sql, bindValues); - Assert.assertEquals(expected, result); + Assertions.assertEquals(expected, result); sql = "select * from table id = \"foo ? bar\" and number=?"; expected = "select * from table id = \"foo ? bar\" and number='99'"; bindValues = parameterParser.parseOutputParameter("99"); result = sqlParser.combineBindValues(sql, bindValues); - Assert.assertEquals(expected, result); + Assertions.assertEquals(expected, result); sql = "select * from table id = 'hi ? name''s foo' and number=?"; expected = "select * from table id = 'hi ? name's foo' and number='99'"; bindValues = parameterParser.parseOutputParameter("99"); result = sqlParser.combineBindValues(sql, bindValues); - Assert.assertEquals(expected, result); + Assertions.assertEquals(expected, result); // check comment sql = "/** comment ? */ select * from table id = ?"; expected = "/** comment ? */ select * from table id = 'foo,bar'"; bindValues = parameterParser.parseOutputParameter("foo,,bar"); result = sqlParser.combineBindValues(sql, bindValues); - Assert.assertEquals(expected, result); + Assertions.assertEquals(expected, result); sql = "select /*! STRAIGHT_JOIN ? */ * from table id = ?"; expected = "select /*! STRAIGHT_JOIN ? */ * from table id = 'foo,bar'"; bindValues = parameterParser.parseOutputParameter("foo,,bar"); result = sqlParser.combineBindValues(sql, bindValues); - Assert.assertEquals(expected, result); + Assertions.assertEquals(expected, result); sql = "select * from table id = ?; -- This ? comment"; expected = "select * from table id = 'foo'; -- This ? comment"; bindValues = parameterParser.parseOutputParameter("foo"); result = sqlParser.combineBindValues(sql, bindValues); - Assert.assertEquals(expected, result); + Assertions.assertEquals(expected, result); } private void assertCombine(String result, String sql, String outputParams) { List output = this.outputParameterParser.parseOutputParameter(outputParams); NormalizedSql parsingResult = this.sqlParser.normalizedSql(result); - Assert.assertEquals("sql", parsingResult.getNormalizedSql(), sql); + Assertions.assertEquals(parsingResult.getNormalizedSql(), sql, "sql"); String combine = this.sqlParser.combineOutputParams(sql, output); - Assert.assertEquals("combine", result, combine); + Assertions.assertEquals(result, combine, "combine"); } private void assertCombineErrorCase(String expectedError, String sql, String outputParams) { List output = this.outputParameterParser.parseOutputParameter(outputParams); // ParsingResult parsingResult = this.sqlParser.normalizedSql(result); String combine = this.sqlParser.combineOutputParams(sql, output); - Assert.assertEquals("combine", expectedError, combine); + Assertions.assertEquals(expectedError, combine, "combine"); } @@ -311,7 +310,7 @@ private void assertEqual(String expected) { NormalizedSql parsingResult = sqlParser.normalizedSql(expected); String normalizedSql = parsingResult.getNormalizedSql(); try { - Assert.assertEquals(expected, normalizedSql); + Assertions.assertEquals(expected, normalizedSql); } catch (AssertionError e) { logger.warn("Original :{}", expected); throw e; @@ -322,7 +321,7 @@ private void assertEqual(String expected, String actual) { NormalizedSql parsingResult = sqlParser.normalizedSql(expected); String normalizedSql = parsingResult.getNormalizedSql(); try { - Assert.assertEquals(actual, normalizedSql); + Assertions.assertEquals(actual, normalizedSql); } catch (AssertionError e) { logger.warn("Original :{}", expected); throw e; @@ -337,21 +336,21 @@ private void assertEqual(String expected, String actual, String outputExpected) String s = sqlParser.combineOutputParams(normalizedSql, outputParams); logger.debug("combine:" + s); try { - Assert.assertEquals("normalizedSql check", actual, normalizedSql); + Assertions.assertEquals(actual, normalizedSql, "normalizedSql check"); } catch (AssertionError e) { logger.warn("Original :{}", expected); throw e; } - Assert.assertEquals("outputParam check", outputExpected, parsingResult.getParseParameter()); + Assertions.assertEquals(outputExpected, parsingResult.getParseParameter(), "outputParam check"); } private void assertEqualObject(String expected) { NormalizedSql parsingResult = sqlParser.normalizedSql(expected); String normalizedSql = parsingResult.getNormalizedSql(); try { - Assert.assertEquals("normalizedSql check", expected, normalizedSql); - Assert.assertSame(expected, normalizedSql); + Assertions.assertEquals(expected, normalizedSql, "normalizedSql check"); + Assertions.assertSame(expected, normalizedSql); } catch (AssertionError e) { logger.warn("Original :{}", expected); throw e; diff --git a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/sql/OutputParameterParserTest.java b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/sql/OutputParameterParserTest.java index 5afbe0bf6df3..07d681889789 100644 --- a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/sql/OutputParameterParserTest.java +++ b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/sql/OutputParameterParserTest.java @@ -16,10 +16,10 @@ package com.navercorp.pinpoint.common.profiler.sql; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.List; @@ -51,7 +51,7 @@ private void assertOutputParameter(String outputParam, String... params) { List result = parser.parseOutputParameter(outputParam); logger.debug("parseResult:{}", result); try { - Assert.assertArrayEquals(result.toArray(new String[0]), params); + Assertions.assertArrayEquals(result.toArray(new String[0]), params); } catch (AssertionError e) { logger.warn("parseResult:{}", result); logger.warn("params:{}", (Object[]) params); diff --git a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/trace/ServiceTypeInitializerTest.java b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/trace/ServiceTypeInitializerTest.java index d446d9fa36cb..9f85ad71ce7f 100644 --- a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/trace/ServiceTypeInitializerTest.java +++ b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/trace/ServiceTypeInitializerTest.java @@ -15,12 +15,6 @@ */ package com.navercorp.pinpoint.common.profiler.trace; -import static com.navercorp.pinpoint.common.trace.ServiceTypeProperty.*; -import static org.junit.Assert.*; - -import java.util.Arrays; -import java.util.List; - import com.navercorp.pinpoint.common.trace.AnnotationKey; import com.navercorp.pinpoint.common.trace.AnnotationKeyFactory; import com.navercorp.pinpoint.common.trace.AnnotationKeyLocator; @@ -31,34 +25,42 @@ import com.navercorp.pinpoint.common.trace.TraceMetadataSetupContext; import com.navercorp.pinpoint.common.util.logger.CommonLoggerFactory; import com.navercorp.pinpoint.common.util.logger.StdoutCommonLoggerFactory; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.util.Arrays; +import java.util.List; + +import static com.navercorp.pinpoint.common.trace.ServiceTypeProperty.INCLUDE_DESTINATION_ID; +import static com.navercorp.pinpoint.common.trace.ServiceTypeProperty.RECORD_STATISTICS; +import static com.navercorp.pinpoint.common.trace.ServiceTypeProperty.TERMINAL; +import static org.junit.jupiter.api.Assertions.assertSame; /** * @author Jongho Moon - * */ public class ServiceTypeInitializerTest { private final CommonLoggerFactory loggerFactory = StdoutCommonLoggerFactory.INSTANCE; private static final ServiceType[] TEST_TYPES = { - ServiceTypeFactory.of(1209, "FOR_UNIT_TEST", "UNDEFINED", TERMINAL, RECORD_STATISTICS, INCLUDE_DESTINATION_ID) + ServiceTypeFactory.of(1209, "FOR_UNIT_TEST", "UNDEFINED", TERMINAL, RECORD_STATISTICS, INCLUDE_DESTINATION_ID) }; - + private static final AnnotationKey[] TEST_KEYS = { - AnnotationKeyFactory.of(1209, "Duplicate-API") + AnnotationKeyFactory.of(1209, "Duplicate-API") }; private static final ServiceType[] DUPLICATED_CODE_WITH_DEFAULT_TYPE = { - ServiceTypeFactory.of(ServiceType.USER.getCode(), "FOR_UNIT_TEST", "UNDEFINED", TERMINAL, RECORD_STATISTICS, INCLUDE_DESTINATION_ID) + ServiceTypeFactory.of(ServiceType.USER.getCode(), "FOR_UNIT_TEST", "UNDEFINED", TERMINAL, RECORD_STATISTICS, INCLUDE_DESTINATION_ID) }; - + private static final ServiceType[] DUPLICATED_NAME_WITH_DEFAULT_TYPE = { - ServiceTypeFactory.of(1209, ServiceType.USER.getName(), "UNDEFINED", TERMINAL, RECORD_STATISTICS, INCLUDE_DESTINATION_ID) + ServiceTypeFactory.of(1209, ServiceType.USER.getName(), "UNDEFINED", TERMINAL, RECORD_STATISTICS, INCLUDE_DESTINATION_ID) }; - + private static final AnnotationKey[] DUPLICATED_CODE_WITH_DEFAULT_KEY = { - AnnotationKeyFactory.of(AnnotationKey.ARGS0.getCode(), "API") + AnnotationKeyFactory.of(AnnotationKey.ARGS0.getCode(), "API") }; private void verifyAnnotationKeys(List annotationKeys, AnnotationKeyLocator annotationKeyRegistry) { @@ -81,83 +83,94 @@ public void testWithPlugins() { verifyAnnotationKeys(Arrays.asList(TEST_KEYS), annotationKeyRegistry); } - - @Test(expected=RuntimeException.class) - public void testDuplicated() { - List providers = Arrays.asList( - new TestProvider(TEST_TYPES, TEST_KEYS), - new TestProvider(new ServiceType[0], TEST_KEYS) - ); - - TraceMetadataLoader loader = new TraceMetadataLoader(StdoutCommonLoggerFactory.INSTANCE); - loader.load(providers); + @Test + public void testDuplicated() { + Assertions.assertThrows(RuntimeException.class, () -> { + List providers = Arrays.asList( + new TestProvider(TEST_TYPES, TEST_KEYS), + new TestProvider(new ServiceType[0], TEST_KEYS) + ); + + TraceMetadataLoader loader = new TraceMetadataLoader(StdoutCommonLoggerFactory.INSTANCE); + loader.load(providers); + }); } - - @Test(expected=RuntimeException.class) - public void testDuplicated2() { - List providers = Arrays.asList( - new TestProvider(TEST_TYPES, TEST_KEYS), - new TestProvider(TEST_TYPES, new AnnotationKey[0]) - ); - TraceMetadataLoader loader = new TraceMetadataLoader(StdoutCommonLoggerFactory.INSTANCE); - loader.load(providers); + @Test + public void testDuplicated2() { + Assertions.assertThrows(RuntimeException.class, () -> { + List providers = Arrays.asList( + new TestProvider(TEST_TYPES, TEST_KEYS), + new TestProvider(TEST_TYPES, new AnnotationKey[0]) + ); + + TraceMetadataLoader loader = new TraceMetadataLoader(StdoutCommonLoggerFactory.INSTANCE); + loader.load(providers); + }); } - - @Test(expected=RuntimeException.class) - public void testDuplicated3() { - List providers = Arrays.asList( - new TestProvider(TEST_TYPES, TEST_KEYS), - new TestProvider(TEST_TYPES, new AnnotationKey[0]) - ); - TraceMetadataLoader loader = new TraceMetadataLoader(StdoutCommonLoggerFactory.INSTANCE); - loader.load(providers); + @Test + public void testDuplicated3() { + Assertions.assertThrows(RuntimeException.class, () -> { + List providers = Arrays.asList( + new TestProvider(TEST_TYPES, TEST_KEYS), + new TestProvider(TEST_TYPES, new AnnotationKey[0]) + ); + + TraceMetadataLoader loader = new TraceMetadataLoader(StdoutCommonLoggerFactory.INSTANCE); + loader.load(providers); + }); } - @Test(expected=RuntimeException.class) + @Test public void testDuplicatedWithDefault() { - List providers = Arrays.asList( - new TestProvider(DUPLICATED_CODE_WITH_DEFAULT_TYPE, TEST_KEYS) - ); - - TraceMetadataLoader traceMetadataLoader = new TraceMetadataLoader(loggerFactory); - traceMetadataLoader.load(providers); - ServiceTypeLocator unused = traceMetadataLoader.createServiceTypeRegistry(); + Assertions.assertThrows(RuntimeException.class, () -> { + List providers = Arrays.asList( + new TestProvider(DUPLICATED_CODE_WITH_DEFAULT_TYPE, TEST_KEYS) + ); + + TraceMetadataLoader traceMetadataLoader = new TraceMetadataLoader(loggerFactory); + traceMetadataLoader.load(providers); + ServiceTypeLocator unused = traceMetadataLoader.createServiceTypeRegistry(); + }); } - @Test(expected=RuntimeException.class) + @Test public void testDuplicatedWithDefault2() { - List providers = Arrays.asList( - new TestProvider(DUPLICATED_NAME_WITH_DEFAULT_TYPE, TEST_KEYS) - ); - - TraceMetadataLoader traceMetadataLoader = new TraceMetadataLoader(loggerFactory); - traceMetadataLoader.load(providers); - ServiceTypeLocator unused = traceMetadataLoader.createServiceTypeRegistry(); + Assertions.assertThrows(RuntimeException.class, () -> { + List providers = Arrays.asList( + new TestProvider(DUPLICATED_NAME_WITH_DEFAULT_TYPE, TEST_KEYS) + ); + + TraceMetadataLoader traceMetadataLoader = new TraceMetadataLoader(loggerFactory); + traceMetadataLoader.load(providers); + ServiceTypeLocator unused = traceMetadataLoader.createServiceTypeRegistry(); + }); } - @Test(expected=RuntimeException.class) + @Test public void testDuplicatedWithDefault3() { - List providers = Arrays.asList( - new TestProvider(TEST_TYPES, DUPLICATED_CODE_WITH_DEFAULT_KEY) - ); - - TraceMetadataLoader traceMetadataLoader = new TraceMetadataLoader(loggerFactory); - traceMetadataLoader.load(providers); - AnnotationKeyLocator unused = traceMetadataLoader.createAnnotationKeyRegistry(); + Assertions.assertThrows(RuntimeException.class, () -> { + List providers = Arrays.asList( + new TestProvider(TEST_TYPES, DUPLICATED_CODE_WITH_DEFAULT_KEY) + ); + + TraceMetadataLoader traceMetadataLoader = new TraceMetadataLoader(loggerFactory); + traceMetadataLoader.load(providers); + AnnotationKeyLocator unused = traceMetadataLoader.createAnnotationKeyRegistry(); + }); } private static class TestProvider implements TraceMetadataProvider { private final ServiceType[] serviceTypes; private final AnnotationKey[] annotationKeys; - + public TestProvider(ServiceType[] serviceTypes, AnnotationKey[] annotationKeys) { this.serviceTypes = serviceTypes; this.annotationKeys = annotationKeys; } - + @Override public void setup(TraceMetadataSetupContext context) { for (ServiceType type : serviceTypes) { diff --git a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/trace/StaticFieldLookUpTest.java b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/trace/StaticFieldLookUpTest.java index a61cb9497149..a04ac520f9a0 100644 --- a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/trace/StaticFieldLookUpTest.java +++ b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/trace/StaticFieldLookUpTest.java @@ -16,13 +16,12 @@ package com.navercorp.pinpoint.common.profiler.trace; -import java.util.List; - +import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.trace.ServiceTypeFactory; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import com.navercorp.pinpoint.common.trace.ServiceType; +import java.util.List; public class StaticFieldLookUpTest { @@ -31,8 +30,8 @@ public void testFindServiceType() { StaticFieldLookUp staticFieldLookUp = new StaticFieldLookUp(ServiceType.class, ServiceType.class); List lookup = staticFieldLookUp.lookup(); - Assert.assertTrue(findType(lookup, ServiceType.UNKNOWN_DB)); - Assert.assertTrue(findType(lookup, ServiceType.UNDEFINED)); + Assertions.assertTrue(findType(lookup, ServiceType.UNKNOWN_DB)); + Assertions.assertTrue(findType(lookup, ServiceType.UNDEFINED)); } @Test @@ -42,7 +41,7 @@ public void testNotFindServiceType() { final int SERVER_CATEGORY_MAX = 1999; ServiceType notExist = ServiceTypeFactory.of(SERVER_CATEGORY_MAX, "test", "test"); - Assert.assertFalse(findType(lookup, notExist)); + Assertions.assertFalse(findType(lookup, notExist)); } @@ -51,7 +50,7 @@ public void testFindString() { StaticFieldLookUp staticFieldLookUp = new StaticFieldLookUp(StaticFieldLookUpTestClass.class, String.class); List lookup = staticFieldLookUp.lookup(); - Assert.assertTrue(findType(lookup, StaticFieldLookUpTestClass.string1)); + Assertions.assertTrue(findType(lookup, StaticFieldLookUpTestClass.string1)); } @@ -60,7 +59,7 @@ public void testNotFindString() { StaticFieldLookUp staticFieldLookUp = new StaticFieldLookUp(StaticFieldLookUpTestClass.class, String.class); List lookup = staticFieldLookUp.lookup(); - Assert.assertFalse(findType(lookup, "notExist")); + Assertions.assertFalse(findType(lookup, "notExist")); } diff --git a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/trace/TraceMetadataLoaderTest.java b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/trace/TraceMetadataLoaderTest.java index 74770d04a23a..6792a8fd83f6 100644 --- a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/trace/TraceMetadataLoaderTest.java +++ b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/trace/TraceMetadataLoaderTest.java @@ -16,21 +16,11 @@ package com.navercorp.pinpoint.common.profiler.trace; -import com.navercorp.pinpoint.common.trace.AnnotationKey; -import com.navercorp.pinpoint.common.trace.AnnotationKeyFactory; -import com.navercorp.pinpoint.common.trace.AnnotationKeyMatcher; -import com.navercorp.pinpoint.common.trace.AnnotationKeyMatchers; -import com.navercorp.pinpoint.common.trace.DefaultServiceTypeInfo; -import com.navercorp.pinpoint.common.trace.ServiceType; -import com.navercorp.pinpoint.common.trace.ServiceTypeFactory; -import com.navercorp.pinpoint.common.trace.ServiceTypeInfo; -import com.navercorp.pinpoint.common.trace.ServiceTypeProperty; -import com.navercorp.pinpoint.common.trace.TraceMetadataProvider; -import com.navercorp.pinpoint.common.trace.TraceMetadataSetupContext; +import com.navercorp.pinpoint.common.trace.*; import com.navercorp.pinpoint.common.util.logger.CommonLoggerFactory; import com.navercorp.pinpoint.common.util.logger.StdoutCommonLoggerFactory; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; @@ -112,8 +102,8 @@ public void unregisteredServiceTypeTest() { ServiceTypeRegistry serviceTypeRegistry = traceMetadataLoader.createServiceTypeRegistry(); verifyServiceType(serviceTypeRegistry, registeredServiceType); - Assert.assertSame(ServiceType.UNDEFINED, serviceTypeRegistry.findServiceType(unregisteredServiceType.getCode())); - Assert.assertSame(ServiceType.UNDEFINED, serviceTypeRegistry.findServiceTypeByName(unregisteredServiceType.getName())); + Assertions.assertSame(ServiceType.UNDEFINED, serviceTypeRegistry.findServiceType(unregisteredServiceType.getCode())); + Assertions.assertSame(ServiceType.UNDEFINED, serviceTypeRegistry.findServiceTypeByName(unregisteredServiceType.getName())); } @Test @@ -129,11 +119,12 @@ public void unregisteredAnnotationKeyTest() { AnnotationKeyRegistry annotationKeyRegistry = traceMetadataLoader.createAnnotationKeyRegistry(); verifyAnnotationKey(annotationKeyRegistry, registeredAnnotationKey); - Assert.assertSame(AnnotationKey.UNKNOWN, annotationKeyRegistry.findAnnotationKey(unregisteredAnnotationKey.getCode())); + Assertions.assertSame(AnnotationKey.UNKNOWN, annotationKeyRegistry.findAnnotationKey(unregisteredAnnotationKey.getCode())); try { annotationKeyRegistry.findAnnotationKeyByName(unregisteredAnnotationKey.getName()); - Assert.fail(); - } catch (NoSuchElementException expected) {} + Assertions.fail(); + } catch (NoSuchElementException expected) { + } } @Test @@ -150,12 +141,12 @@ public void unregisteredAnnotationKeyMatcherTest() { AnnotationKeyMatcherRegistry annotationKeyMatcherRegistry = traceMetadataLoader.createAnnotationKeyMatcherRegistry(); verifyAnnotationKeyMatcher(annotationKeyMatcherRegistry, registeredServiceType, registeredAnnotationKeyMatcher); - Assert.assertNull(annotationKeyMatcherRegistry.findAnnotationKeyMatcher(unregisteredServiceType.getCode())); + Assertions.assertNull(annotationKeyMatcherRegistry.findAnnotationKeyMatcher(unregisteredServiceType.getCode())); } private void verifyServiceType(ServiceTypeRegistry serviceTypeRegistry, ServiceType serviceType) { - Assert.assertSame(serviceType, serviceTypeRegistry.findServiceType(serviceType.getCode())); - Assert.assertSame(serviceType, serviceTypeRegistry.findServiceTypeByName(serviceType.getName())); + Assertions.assertSame(serviceType, serviceTypeRegistry.findServiceType(serviceType.getCode())); + Assertions.assertSame(serviceType, serviceTypeRegistry.findServiceTypeByName(serviceType.getName())); if (serviceType.isRecordStatistics()) { boolean found = false; List descMatchedServiceTypes = serviceTypeRegistry.findDesc(serviceType.getDesc()); @@ -164,22 +155,22 @@ private void verifyServiceType(ServiceTypeRegistry serviceTypeRegistry, ServiceT found = true; } } - Assert.assertTrue(found); + Assertions.assertTrue(found); try { descMatchedServiceTypes.add(serviceType); - Assert.fail("Adding to unmodifiable list should have failed"); + Assertions.fail("Adding to unmodifiable list should have failed"); } catch (Exception expected) { } } } private void verifyAnnotationKey(AnnotationKeyRegistry annotationKeyRegistry, AnnotationKey annotationKey) { - Assert.assertSame(annotationKey, annotationKeyRegistry.findAnnotationKey(annotationKey.getCode())); - Assert.assertSame(annotationKey, annotationKeyRegistry.findAnnotationKeyByName(annotationKey.getName())); + Assertions.assertSame(annotationKey, annotationKeyRegistry.findAnnotationKey(annotationKey.getCode())); + Assertions.assertSame(annotationKey, annotationKeyRegistry.findAnnotationKeyByName(annotationKey.getName())); } private void verifyAnnotationKeyMatcher(AnnotationKeyMatcherRegistry annotationKeyMatcherRegistry, ServiceType serviceType, AnnotationKeyMatcher annotationKeyMatcher) { - Assert.assertSame(annotationKeyMatcher, annotationKeyMatcherRegistry.findAnnotationKeyMatcher(serviceType.getCode())); + Assertions.assertSame(annotationKeyMatcher, annotationKeyMatcherRegistry.findAnnotationKeyMatcher(serviceType.getCode())); } private TraceMetadataProvider createTraceMetadataProvider(ServiceTypeInfo serviceTypeInfo) { diff --git a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/trace/TraceMetadataRegistrarTest.java b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/trace/TraceMetadataRegistrarTest.java index c6ba53420844..dc35185d42bb 100644 --- a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/trace/TraceMetadataRegistrarTest.java +++ b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/trace/TraceMetadataRegistrarTest.java @@ -23,8 +23,8 @@ import com.navercorp.pinpoint.common.trace.ServiceTypeFactory; import com.navercorp.pinpoint.common.trace.ServiceTypeLocator; import com.navercorp.pinpoint.common.trace.ServiceTypeProvider; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -44,12 +44,13 @@ public void undefinedServiceTypeShouldThrowException() { TraceMetadataRegistrar.registerServiceTypes(serviceTypeRegistry); try { ServiceTypeProvider.getByCode(unknownServiceType.getCode()); - Assert.fail("Retrieving UNDEFINED ServiceType by code should throw IllegalStateException"); + Assertions.fail("Retrieving UNDEFINED ServiceType by code should throw IllegalStateException"); } catch (IllegalStateException expected1) { try { ServiceTypeProvider.getByName(unknownServiceType.getName()); - Assert.fail("Retrieving UNDEFINED ServiceType by name should throw IllegalStateException"); - } catch (IllegalStateException expected2) {} + Assertions.fail("Retrieving UNDEFINED ServiceType by name should throw IllegalStateException"); + } catch (IllegalStateException expected2) { + } } } @@ -64,10 +65,10 @@ public void registeredServiceTypes() { when(serviceTypeRegistry.findServiceTypeByName(plugin2ServiceType.getName())).thenReturn(plugin2ServiceType); TraceMetadataRegistrar.registerServiceTypes(serviceTypeRegistry); - Assert.assertSame(plugin1ServiceType, ServiceTypeProvider.getByCode(plugin1ServiceType.getCode())); - Assert.assertSame(plugin1ServiceType, ServiceTypeProvider.getByName(plugin1ServiceType.getName())); - Assert.assertSame(plugin2ServiceType, ServiceTypeProvider.getByCode(plugin2ServiceType.getCode())); - Assert.assertSame(plugin2ServiceType, ServiceTypeProvider.getByName(plugin2ServiceType.getName())); + Assertions.assertSame(plugin1ServiceType, ServiceTypeProvider.getByCode(plugin1ServiceType.getCode())); + Assertions.assertSame(plugin1ServiceType, ServiceTypeProvider.getByName(plugin1ServiceType.getName())); + Assertions.assertSame(plugin2ServiceType, ServiceTypeProvider.getByCode(plugin2ServiceType.getCode())); + Assertions.assertSame(plugin2ServiceType, ServiceTypeProvider.getByName(plugin2ServiceType.getName())); } @Test @@ -79,8 +80,9 @@ public void unknownAnnotationKeyShouldThrowException() { TraceMetadataRegistrar.registerAnnotationKeys(annotationKeyRegistry); try { AnnotationKeyProvider.getByCode(unknownAnnotationKey.getCode()); - Assert.fail("Retrieving UNKNOWN AnnotationKey should throw IllegalStateException"); - } catch (IllegalStateException expected) {} + Assertions.fail("Retrieving UNKNOWN AnnotationKey should throw IllegalStateException"); + } catch (IllegalStateException expected) { + } } @Test @@ -92,7 +94,7 @@ public void registeredAnnotationKey() { when(annotationKeyRegistry.findAnnotationKey(annotationKey2.getCode())).thenReturn(annotationKey2); TraceMetadataRegistrar.registerAnnotationKeys(annotationKeyRegistry); - Assert.assertSame(annotationKey1, AnnotationKeyProvider.getByCode(annotationKey1.getCode())); - Assert.assertSame(annotationKey2, AnnotationKeyProvider.getByCode(annotationKey2.getCode())); + Assertions.assertSame(annotationKey1, AnnotationKeyProvider.getByCode(annotationKey1.getCode())); + Assertions.assertSame(annotationKey2, AnnotationKeyProvider.getByCode(annotationKey2.getCode())); } } diff --git a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/util/TransactionIdComparatorTest.java b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/util/TransactionIdComparatorTest.java index 864b8e841893..8defa67d744a 100644 --- a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/util/TransactionIdComparatorTest.java +++ b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/util/TransactionIdComparatorTest.java @@ -16,19 +16,16 @@ package com.navercorp.pinpoint.common.profiler.util; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -import com.navercorp.pinpoint.common.profiler.util.TransactionId; -import com.navercorp.pinpoint.common.profiler.util.TransactionIdComparator; -import org.junit.Assert; - -import org.junit.Test; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; - public class TransactionIdComparatorTest { private final Logger logger = LogManager.getLogger(this.getClass()); @@ -38,14 +35,14 @@ public class TransactionIdComparatorTest { public void sameAll() { TransactionId id1 = new TransactionId("A1", 1, 1); TransactionId id2 = new TransactionId("A1", 1, 1); - Assert.assertEquals(0, comparator.compare(id1, id2)); + Assertions.assertEquals(0, comparator.compare(id1, id2)); } @Test public void diffAgentStartTimeAsc() { TransactionId id1 = new TransactionId("A1", 1, 1); TransactionId id2 = new TransactionId("A1", 2, 1); - Assert.assertEquals(-1, comparator.compare(id1, id2)); + Assertions.assertEquals(-1, comparator.compare(id1, id2)); } @Test @@ -53,21 +50,21 @@ public void diffAgentStartTimeDesc() { TransactionId id1 = new TransactionId("A1", 2, 1); TransactionId id2 = new TransactionId("A1", 1, 1); - Assert.assertEquals(1, comparator.compare(id1, id2)); + Assertions.assertEquals(1, comparator.compare(id1, id2)); } @Test public void diffSeqAsc() { TransactionId id1 = new TransactionId("A1", 1, 1); TransactionId id2 = new TransactionId("A1", 1, 2); - Assert.assertEquals(-1, comparator.compare(id1, id2)); + Assertions.assertEquals(-1, comparator.compare(id1, id2)); } @Test public void diffSeqDesc() { TransactionId id1 = new TransactionId("A1", 1, 2); TransactionId id2 = new TransactionId("A1", 1, 1); - Assert.assertEquals(1, comparator.compare(id1, id2)); + Assertions.assertEquals(1, comparator.compare(id1, id2)); } @Test @@ -87,7 +84,7 @@ public void order() { Collections.sort(list, comparator); int i = 0; for (TransactionId transactionId : list) { - Assert.assertEquals(i, transactionId.getTransactionSequence()); + Assertions.assertEquals(i, transactionId.getTransactionSequence()); i++; } logger.debug("{}", list); diff --git a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/util/TransactionIdUtilsTest.java b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/util/TransactionIdUtilsTest.java index 2bea3bcf47df..c3472e447cfe 100644 --- a/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/util/TransactionIdUtilsTest.java +++ b/commons-profiler/src/test/java/com/navercorp/pinpoint/common/profiler/util/TransactionIdUtilsTest.java @@ -20,13 +20,11 @@ import com.navercorp.pinpoint.common.buffer.AutomaticBuffer; import com.navercorp.pinpoint.common.buffer.Buffer; import org.apache.commons.lang3.StringUtils; -import org.junit.Assert; - -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; - /** * @author emeroad */ @@ -37,30 +35,31 @@ public class TransactionIdUtilsTest { @Test public void testParseTransactionId() { TransactionId transactionId = TransactionIdUtils.parseTransactionId(AGENT_ID + TransactionIdUtils.TRANSACTION_ID_DELIMITER + "1" + TransactionIdUtils.TRANSACTION_ID_DELIMITER + "2"); - Assert.assertEquals(transactionId.getAgentId(), "test"); - Assert.assertEquals(transactionId.getAgentStartTime(), 1L); - Assert.assertEquals(transactionId.getTransactionSequence(), 2L); + Assertions.assertEquals(transactionId.getAgentId(), "test"); + Assertions.assertEquals(transactionId.getAgentStartTime(), 1L); + Assertions.assertEquals(transactionId.getTransactionSequence(), 2L); } @Test public void testParseTransactionId2() { TransactionId transactionId = TransactionIdUtils.parseTransactionId(AGENT_ID + TransactionIdUtils.TRANSACTION_ID_DELIMITER + "1" + TransactionIdUtils.TRANSACTION_ID_DELIMITER + "2" + TransactionIdUtils.TRANSACTION_ID_DELIMITER); - Assert.assertEquals(transactionId.getAgentId(), AGENT_ID); - Assert.assertEquals(transactionId.getAgentStartTime(), 1L); - Assert.assertEquals(transactionId.getTransactionSequence(), 2L); + Assertions.assertEquals(transactionId.getAgentId(), AGENT_ID); + Assertions.assertEquals(transactionId.getAgentStartTime(), 1L); + Assertions.assertEquals(transactionId.getTransactionSequence(), 2L); } - - @Test(expected = Exception.class) + @Test public void testParseTransactionId_RpcHeaderDuplicateAdd_BugReproduce() { - // #27 http://yobi.navercorp.com/pinpoint/pinpoint/issue/27 - String id1 = AGENT_ID + TransactionIdUtils.TRANSACTION_ID_DELIMITER + "1" + TransactionIdUtils.TRANSACTION_ID_DELIMITER + "2"; - String id2 = AGENT_ID + TransactionIdUtils.TRANSACTION_ID_DELIMITER + "1" + TransactionIdUtils.TRANSACTION_ID_DELIMITER + "3"; - TransactionId transactionId = TransactionIdUtils.parseTransactionId(id1 + ", " + id2); - Assert.assertEquals(transactionId.getAgentId(), "test"); - Assert.assertEquals(transactionId.getAgentStartTime(), 1L); - Assert.assertEquals(transactionId.getTransactionSequence(), 2L); + Assertions.assertThrows(Exception.class, () -> { + // #27 http://yobi.navercorp.com/pinpoint/pinpoint/issue/27 + String id1 = AGENT_ID + TransactionIdUtils.TRANSACTION_ID_DELIMITER + "1" + TransactionIdUtils.TRANSACTION_ID_DELIMITER + "2"; + String id2 = AGENT_ID + TransactionIdUtils.TRANSACTION_ID_DELIMITER + "1" + TransactionIdUtils.TRANSACTION_ID_DELIMITER + "3"; + TransactionId transactionId = TransactionIdUtils.parseTransactionId(id1 + ", " + id2); + Assertions.assertEquals(transactionId.getAgentId(), "test"); + Assertions.assertEquals(transactionId.getAgentStartTime(), 1L); + Assertions.assertEquals(transactionId.getTransactionSequence(), 2L); + }); } @@ -69,9 +68,9 @@ public void testParseTransactionIdByte1() { long time = System.currentTimeMillis(); byte[] bytes = TransactionIdUtils.formatBytes(AGENT_ID, time, 2); TransactionId transactionId = TransactionIdUtils.parseTransactionId(bytes, AGENT_ID); - Assert.assertEquals(transactionId.getAgentId(), AGENT_ID); - Assert.assertEquals(transactionId.getAgentStartTime(), time); - Assert.assertEquals(transactionId.getTransactionSequence(), 2L); + Assertions.assertEquals(transactionId.getAgentId(), AGENT_ID); + Assertions.assertEquals(transactionId.getAgentStartTime(), time); + Assertions.assertEquals(transactionId.getTransactionSequence(), 2L); } @Test @@ -79,9 +78,9 @@ public void testParseTransactionIdByte2() { long time = Long.MAX_VALUE; byte[] bytes = TransactionIdUtils.formatBytes(AGENT_ID, time, Long.MAX_VALUE); TransactionId transactionId = TransactionIdUtils.parseTransactionId(bytes, AGENT_ID); - Assert.assertEquals(transactionId.getAgentId(), AGENT_ID); - Assert.assertEquals(transactionId.getAgentStartTime(), Long.MAX_VALUE); - Assert.assertEquals(transactionId.getTransactionSequence(), Long.MAX_VALUE); + Assertions.assertEquals(transactionId.getAgentId(), AGENT_ID); + Assertions.assertEquals(transactionId.getAgentStartTime(), Long.MAX_VALUE); + Assertions.assertEquals(transactionId.getTransactionSequence(), Long.MAX_VALUE); } @Test @@ -89,17 +88,19 @@ public void testParseTransactionIdByte3() { long time = Long.MIN_VALUE; byte[] bytes = TransactionIdUtils.formatBytes(AGENT_ID, time, Long.MIN_VALUE); TransactionId transactionId = TransactionIdUtils.parseTransactionId(bytes, AGENT_ID); - Assert.assertEquals(transactionId.getAgentId(), AGENT_ID); - Assert.assertEquals(transactionId.getAgentStartTime(), Long.MIN_VALUE); - Assert.assertEquals(transactionId.getTransactionSequence(), Long.MIN_VALUE); + Assertions.assertEquals(transactionId.getAgentId(), AGENT_ID); + Assertions.assertEquals(transactionId.getAgentStartTime(), Long.MIN_VALUE); + Assertions.assertEquals(transactionId.getTransactionSequence(), Long.MIN_VALUE); } - @Test(expected = NullPointerException.class) + @Test public void testParseTransactionIdByte_AgentIdisNull() { - long time = System.currentTimeMillis(); - byte[] bytes = TransactionIdUtils.formatBytes(null, time, 1); - TransactionIdUtils.parseTransactionId(bytes, null); + Assertions.assertThrows(NullPointerException.class, () -> { + long time = System.currentTimeMillis(); + byte[] bytes = TransactionIdUtils.formatBytes(null, time, 1); + TransactionIdUtils.parseTransactionId(bytes, null); + }); } @Test @@ -107,7 +108,7 @@ public void testParseTransactionIdByte_compatibility1() { long time = System.currentTimeMillis(); ByteBuffer byteBuffer1 = ByteBuffer.wrap(TransactionIdUtils.formatBytes(AGENT_ID, time, 2)); ByteBuffer byteBuffer2 = writeTransactionId_for_compatibility(AGENT_ID, time, 2); - Assert.assertEquals(byteBuffer1, byteBuffer2); + Assertions.assertEquals(byteBuffer1, byteBuffer2); } @Test @@ -115,7 +116,7 @@ public void testParseTransactionIdByte_compatibility2() { long time = System.currentTimeMillis(); ByteBuffer byteBuffer1 = ByteBuffer.wrap(TransactionIdUtils.formatBytes(null, time, 2)); ByteBuffer byteBuffer2 = writeTransactionId_for_compatibility(null, time, 2); - Assert.assertEquals(byteBuffer1, byteBuffer2); + Assertions.assertEquals(byteBuffer1, byteBuffer2); } @@ -128,23 +129,27 @@ private static ByteBuffer writeTransactionId_for_compatibility(String agentId, l return buffer.wrapByteBuffer(); } - @Test(expected = IllegalArgumentException.class) + @Test public void validateAgentId() { - TransactionIdUtils.parseTransactionId("ag$$ent^1^2"); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + TransactionIdUtils.parseTransactionId("ag$$ent^1^2"); + }); } @Test public void longAgentId() { String agentId = StringUtils.repeat('a', PinpointConstants.AGENT_ID_MAX_LEN); TransactionId transactionId = TransactionIdUtils.parseTransactionId(agentId + "^1^2"); - Assert.assertEquals(agentId, transactionId.getAgentId()); + Assertions.assertEquals(agentId, transactionId.getAgentId()); } - @Test(expected = IllegalArgumentException.class) + @Test public void tooLongAgentId() { - String agentId = StringUtils.repeat('a', PinpointConstants.AGENT_ID_MAX_LEN+1); - TransactionId transactionId = TransactionIdUtils.parseTransactionId(agentId + "^1^2"); - Assert.assertEquals(agentId, transactionId.getAgentId()); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + String agentId = StringUtils.repeat('a', PinpointConstants.AGENT_ID_MAX_LEN + 1); + TransactionId transactionId = TransactionIdUtils.parseTransactionId(agentId + "^1^2"); + Assertions.assertEquals(agentId, transactionId.getAgentId()); + }); } } diff --git a/commons-server-cluster/src/test/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/ConnectionTest.java b/commons-server-cluster/src/test/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/ConnectionTest.java index ee02c5afbd6d..e328382f8a55 100644 --- a/commons-server-cluster/src/test/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/ConnectionTest.java +++ b/commons-server-cluster/src/test/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/ConnectionTest.java @@ -26,10 +26,10 @@ import org.awaitility.Awaitility; import org.awaitility.core.ConditionFactory; import org.awaitility.core.ConditionTimeoutException; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; @@ -54,7 +54,7 @@ private ConditionFactory awaitility() { private static int zookeeperPort; private static TestingServer ts = null; - @BeforeClass + @BeforeAll public static void setUp() throws Exception { zookeeperPort = SocketUtils.findAvailableTcpPort(); ts = createTestingServer(); @@ -64,7 +64,7 @@ private static TestingServer createTestingServer() throws Exception { return new TestingServer(zookeeperPort); } - @AfterClass + @AfterAll public static void tearDown() throws Exception { if (ts != null) { ts.stop(); @@ -96,7 +96,7 @@ public void process(WatchedEvent watchedEvent) { ts = createTestingServer(); - Assert.assertThrows(ConditionTimeoutException.class, () -> assertAwaitState(ZooKeeper.States.CONNECTED, zookeeper)); + Assertions.assertThrows(ConditionTimeoutException.class, () -> assertAwaitState(ZooKeeper.States.CONNECTED, zookeeper)); } finally { ZKUtils.closeQuietly(zookeeper); @@ -156,7 +156,7 @@ public void curatorExpiredTest() throws Exception { @Test public void curatorReconnectTest() throws Exception { CuratorZookeeperClient curatorZookeeperClient = new CuratorZookeeperClient(ts.getConnectString(), 5000, new LoggingZookeeperEventWatcher()); - try (curatorZookeeperClient){ + try (curatorZookeeperClient) { curatorZookeeperClient.connect(); assertAwaitState(true, curatorZookeeperClient); @@ -173,6 +173,7 @@ private void assertAwaitState(boolean expectedConnected, CuratorZookeeperClient private static class LoggingZookeeperEventWatcher implements ZookeeperEventWatcher { private final Logger logger = LogManager.getLogger(LoggingZookeeperEventWatcher.class); + @Override public boolean handleConnected() { logger.info("handleConnected()"); diff --git a/commons-server-cluster/src/test/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/CuratorZookeeperClientTest.java b/commons-server-cluster/src/test/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/CuratorZookeeperClientTest.java index 9e292e32542c..51cccc11863e 100644 --- a/commons-server-cluster/src/test/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/CuratorZookeeperClientTest.java +++ b/commons-server-cluster/src/test/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/CuratorZookeeperClientTest.java @@ -32,11 +32,11 @@ import org.apache.zookeeper.data.Stat; import org.awaitility.Awaitility; import org.awaitility.core.ConditionFactory; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.List; @@ -67,7 +67,7 @@ private ConditionFactory awaitility() { private static final AtomicInteger TEST_NODE_ID = new AtomicInteger(); - @BeforeClass + @BeforeAll public static void setUpClass() throws Exception { int availablePort = SocketUtils.findAvailableTcpPort(); ts = new TestingServer(availablePort); @@ -77,7 +77,7 @@ public static void setUpClass() throws Exception { curatorZookeeperClient.createPath(PARENT_PATH); } - @Before + @BeforeEach public void setUp() throws Exception { List nodeList = curatorZookeeperClient.getChildNodeList(PARENT_PATH, false); for (String node : nodeList) { @@ -94,7 +94,7 @@ private static CuratorZookeeperClient createCuratorZookeeperClient(String connec return curatorZookeeperClient; } - @AfterClass + @AfterAll public static void tearDownClass() throws Exception { try { if (curatorZookeeperClient != null) { @@ -121,11 +121,11 @@ public void createAndDeleteTest() throws Exception { curatorZookeeperClient.createNode(new CreateNodeMessage(testNodePath, message.getBytes())); byte[] result = curatorZookeeperClient.getData(testNodePath); - Assert.assertEquals(message, new String(result)); + Assertions.assertEquals(message, new String(result)); curatorZookeeperClient.delete(testNodePath); - Assert.assertFalse(isExistNode(zooKeeper, testNodePath)); + Assertions.assertFalse(isExistNode(zooKeeper, testNodePath)); } finally { ZKUtils.closeQuietly(zooKeeper); } @@ -145,20 +145,20 @@ public void createOrSetNodeTest() throws Exception { try { curatorZookeeperClient.createOrSetNode(new CreateNodeMessage(testNodePath, message.getBytes())); - Assert.fail(); + Assertions.fail(); } catch (Exception ignored) { } boolean existNode = isExistNode(zooKeeper, path); - Assert.assertFalse(existNode); + Assertions.assertFalse(existNode); existNode = isExistNode(zooKeeper, testNodePath); - Assert.assertFalse(existNode); + Assertions.assertFalse(existNode); curatorZookeeperClient.createOrSetNode(new CreateNodeMessage(testNodePath, message.getBytes(), true)); existNode = isExistNode(zooKeeper, testNodePath); - Assert.assertTrue(existNode); + Assertions.assertTrue(existNode); curatorZookeeperClient.delete(testNodePath); } finally { @@ -166,20 +166,22 @@ public void createOrSetNodeTest() throws Exception { } } - @Test(expected = BadOperationException.class) + @Test public void alreadyExistNodeCreateTest() throws Exception { - ZooKeeper zooKeeper = createZookeeper(); - try { - String message = createTestMessage(); - String testNodePath = createTestNodePath(); + Assertions.assertThrows(BadOperationException.class, () -> { + ZooKeeper zooKeeper = createZookeeper(); + try { + String message = createTestMessage(); + String testNodePath = createTestNodePath(); - curatorZookeeperClient.createNode(new CreateNodeMessage(testNodePath, message.getBytes())); - Assert.assertTrue(isExistNode(zooKeeper, testNodePath)); + curatorZookeeperClient.createNode(new CreateNodeMessage(testNodePath, message.getBytes())); + Assertions.assertTrue(isExistNode(zooKeeper, testNodePath)); - curatorZookeeperClient.createNode(new CreateNodeMessage(testNodePath, "test".getBytes())); - } finally { - ZKUtils.closeQuietly(zooKeeper); - } + curatorZookeeperClient.createNode(new CreateNodeMessage(testNodePath, "test".getBytes())); + } finally { + ZKUtils.closeQuietly(zooKeeper); + } + }); } @Test @@ -189,7 +191,7 @@ public void getTest() throws Exception { String testNodePath = createTestNodePath(); curatorZookeeperClient.createNode(new CreateNodeMessage(testNodePath, "".getBytes())); - Assert.assertTrue(isExistNode(zooKeeper, testNodePath)); + Assertions.assertTrue(isExistNode(zooKeeper, testNodePath)); curatorZookeeperClient.getData(testNodePath, true); @@ -210,10 +212,10 @@ private void assertGetWatchedEvent(String path, String message) throws PinpointZ .until(eventHoldingZookeeperEventWatcher::getLastWatchedEvent, notNullValue()); WatchedEvent lastWatchedEvent = eventHoldingZookeeperEventWatcher.getLastWatchedEvent(); - Assert.assertEquals(Watcher.Event.EventType.NodeDataChanged, lastWatchedEvent.getType()); + Assertions.assertEquals(Watcher.Event.EventType.NodeDataChanged, lastWatchedEvent.getType()); byte[] result = curatorZookeeperClient.getData(path); - Assert.assertEquals(message, new String(result)); + Assertions.assertEquals(message, new String(result)); } @Test @@ -225,7 +227,7 @@ public void getChildrenTest() throws Exception { ZKPaths.PathAndNode pathAndNode = ZKPaths.getPathAndNode(testNodePath); List childrenNode = curatorZookeeperClient.getChildNodeList(pathAndNode.getPath(), true); - Assert.assertTrue(childrenNode.isEmpty()); + Assertions.assertTrue(childrenNode.isEmpty()); zooKeeper.create(testNodePath, new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.EPHEMERAL); @@ -233,10 +235,10 @@ public void getChildrenTest() throws Exception { .until(eventHoldingZookeeperEventWatcher::getLastWatchedEvent, notNullValue()); WatchedEvent lastWatchedEvent = eventHoldingZookeeperEventWatcher.getLastWatchedEvent(); - Assert.assertEquals(Watcher.Event.EventType.NodeChildrenChanged, lastWatchedEvent.getType()); + Assertions.assertEquals(Watcher.Event.EventType.NodeChildrenChanged, lastWatchedEvent.getType()); childrenNode = curatorZookeeperClient.getChildNodeList(pathAndNode.getPath(), false); - Assert.assertFalse(childrenNode.isEmpty()); + Assertions.assertFalse(childrenNode.isEmpty()); } finally { ZKUtils.closeQuietly(zooKeeper); } diff --git a/commons-server-cluster/src/test/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/ReconnectConditionTest.java b/commons-server-cluster/src/test/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/ReconnectConditionTest.java index 593584def6a6..f8c59acafb4f 100644 --- a/commons-server-cluster/src/test/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/ReconnectConditionTest.java +++ b/commons-server-cluster/src/test/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/ReconnectConditionTest.java @@ -16,15 +16,15 @@ package com.navercorp.pinpoint.common.server.cluster.zookeeper; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * @author Taejin Koo */ public class ReconnectConditionTest { - @Ignore + @Disabled @Test public void functionTest() { ReconnectCondition condition = new ReconnectCondition(1, 1); diff --git a/commons-server-cluster/src/test/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/config/ClusterConfigurationTest.java b/commons-server-cluster/src/test/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/config/ClusterConfigurationTest.java index 170b8e3986af..7c1a1e160f62 100644 --- a/commons-server-cluster/src/test/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/config/ClusterConfigurationTest.java +++ b/commons-server-cluster/src/test/java/com/navercorp/pinpoint/common/server/cluster/zookeeper/config/ClusterConfigurationTest.java @@ -19,15 +19,15 @@ import com.navercorp.pinpoint.common.server.cluster.zookeeper.ZookeeperClusterConfiguration; import com.navercorp.pinpoint.common.server.cluster.zookeeper.ZookeeperConstants; import org.apache.curator.utils.ZKPaths; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.Objects; @@ -37,7 +37,7 @@ @EnableConfigurationProperties @TestPropertySource(locations = "classpath:test-cluster.properties") @ContextConfiguration(classes = ClusterConfigurationFactory.class) -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) public class ClusterConfigurationTest { @Autowired @@ -56,36 +56,36 @@ public class ClusterConfigurationTest { public void clusterConfigurationTest() { ZNodePathFactory zNodePathFactory = new ZNodePathFactory("/cluster"); - Assert.assertTrue(defaultClusterConfiguration.isEnable()); - Assert.assertEquals("localhost", defaultClusterConfiguration.getAddress()); - Assert.assertEquals(zNodePathFactory.create("webs"), defaultClusterConfiguration.getWebZNodePath()); - Assert.assertEquals(zNodePathFactory.createCollectorPath(), defaultClusterConfiguration.getCollectorZNodePath()); - Assert.assertEquals(zNodePathFactory.createFlinkPath(), defaultClusterConfiguration.getFlinkZNodePath()); - Assert.assertEquals(1000, defaultClusterConfiguration.getSessionTimeout()); + Assertions.assertTrue(defaultClusterConfiguration.isEnable()); + Assertions.assertEquals("localhost", defaultClusterConfiguration.getAddress()); + Assertions.assertEquals(zNodePathFactory.create("webs"), defaultClusterConfiguration.getWebZNodePath()); + Assertions.assertEquals(zNodePathFactory.createCollectorPath(), defaultClusterConfiguration.getCollectorZNodePath()); + Assertions.assertEquals(zNodePathFactory.createFlinkPath(), defaultClusterConfiguration.getFlinkZNodePath()); + Assertions.assertEquals(1000, defaultClusterConfiguration.getSessionTimeout()); } @Test public void flinkClusterConfigurationTest() { ZNodePathFactory zNodePathFactory = new ZNodePathFactory("/flink-cluster"); - Assert.assertFalse(flinkClusterConfiguration.isEnable()); - Assert.assertEquals("127.0.0.1", flinkClusterConfiguration.getAddress()); - Assert.assertEquals(zNodePathFactory.createWebPath(), flinkClusterConfiguration.getWebZNodePath()); - Assert.assertEquals(zNodePathFactory.create("collectors"), flinkClusterConfiguration.getCollectorZNodePath()); - Assert.assertEquals(zNodePathFactory.createFlinkPath(), flinkClusterConfiguration.getFlinkZNodePath()); - Assert.assertEquals(2000, flinkClusterConfiguration.getSessionTimeout()); + Assertions.assertFalse(flinkClusterConfiguration.isEnable()); + Assertions.assertEquals("127.0.0.1", flinkClusterConfiguration.getAddress()); + Assertions.assertEquals(zNodePathFactory.createWebPath(), flinkClusterConfiguration.getWebZNodePath()); + Assertions.assertEquals(zNodePathFactory.create("collectors"), flinkClusterConfiguration.getCollectorZNodePath()); + Assertions.assertEquals(zNodePathFactory.createFlinkPath(), flinkClusterConfiguration.getFlinkZNodePath()); + Assertions.assertEquals(2000, flinkClusterConfiguration.getSessionTimeout()); } @Test public void spanStatFlinkClusterConfigurationTest() { ZNodePathFactory zNodePathFactory = new ZNodePathFactory("/span-stat-flink-cluster"); - Assert.assertTrue(defaultClusterConfiguration.isEnable()); - Assert.assertEquals("0.0.0.0", spanStatFlinkClusterConfiguration.getAddress()); - Assert.assertEquals(zNodePathFactory.createWebPath(), spanStatFlinkClusterConfiguration.getWebZNodePath()); - Assert.assertEquals(zNodePathFactory.createCollectorPath(), spanStatFlinkClusterConfiguration.getCollectorZNodePath()); - Assert.assertEquals(zNodePathFactory.create("flinks"), spanStatFlinkClusterConfiguration.getFlinkZNodePath()); - Assert.assertEquals(3000, spanStatFlinkClusterConfiguration.getSessionTimeout()); + Assertions.assertTrue(defaultClusterConfiguration.isEnable()); + Assertions.assertEquals("0.0.0.0", spanStatFlinkClusterConfiguration.getAddress()); + Assertions.assertEquals(zNodePathFactory.createWebPath(), spanStatFlinkClusterConfiguration.getWebZNodePath()); + Assertions.assertEquals(zNodePathFactory.createCollectorPath(), spanStatFlinkClusterConfiguration.getCollectorZNodePath()); + Assertions.assertEquals(zNodePathFactory.create("flinks"), spanStatFlinkClusterConfiguration.getFlinkZNodePath()); + Assertions.assertEquals(3000, spanStatFlinkClusterConfiguration.getSessionTimeout()); } private static class ZNodePathFactory { diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/AnnotationTranscoderTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/AnnotationTranscoderTest.java index 2a22f45d926f..28bc6bcb1207 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/AnnotationTranscoderTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/AnnotationTranscoderTest.java @@ -20,15 +20,14 @@ import com.navercorp.pinpoint.common.util.IntBooleanIntBooleanValue; import com.navercorp.pinpoint.common.util.IntStringValue; import com.navercorp.pinpoint.common.util.LongIntIntByteByteStringValue; - +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; import org.apache.thrift.protocol.TCompactProtocol; import org.apache.thrift.protocol.TProtocol; import org.apache.thrift.transport.TIOStreamTransport; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; import java.util.Arrays; @@ -90,7 +89,7 @@ private void typeCode(Object value) { byte[] bytes = transcoder.encode(value, typeCode); Object decode = transcoder.decode(typeCode, bytes); - Assert.assertEquals(value, decode); + Assertions.assertEquals(value, decode); } private void typeUnsupportCode(Object value) { @@ -100,7 +99,7 @@ private void typeUnsupportCode(Object value) { byte[] bytes = transcoder.encode(value, typeCode); Object decode = transcoder.decode(typeCode, bytes); - Assert.assertEquals(value.toString(), decode.toString()); + Assertions.assertEquals(value.toString(), decode.toString()); } private void typeBinaryCode(byte[] value) { @@ -110,7 +109,7 @@ private void typeBinaryCode(byte[] value) { byte[] bytes = transcoder.encode(value, typeCode); Object decode = transcoder.decode(typeCode, bytes); - Assert.assertArrayEquals(value, (byte[]) decode); + Assertions.assertArrayEquals(value, (byte[]) decode); } @Test @@ -144,13 +143,13 @@ private void testIntString(int intValue, String stringValue) { IntStringValue tIntStringValue = new IntStringValue(intValue, stringValue); byte[] encode = transcoder.encode(tIntStringValue, AnnotationTranscoder.CODE_INT_STRING); IntStringValue decode = (IntStringValue) transcoder.decode(AnnotationTranscoder.CODE_INT_STRING, encode); - Assert.assertEquals(tIntStringValue.getIntValue(), decode.getIntValue()); - Assert.assertEquals(tIntStringValue.getStringValue(), decode.getStringValue()); + Assertions.assertEquals(tIntStringValue.getIntValue(), decode.getIntValue()); + Assertions.assertEquals(tIntStringValue.getStringValue(), decode.getStringValue()); } @Test public void testLongIntIntByteByteString() { - testLongIntIntByteByteString(999999, 0, 123, (byte)99, (byte)1, "app7"); + testLongIntIntByteByteString(999999, 0, 123, (byte) 99, (byte) 1, "app7"); } private void testLongIntIntByteByteString(long longValue, int intValue1, int intValue2, byte byteValue1, byte byteValue2, String stringValue) { @@ -160,12 +159,12 @@ private void testLongIntIntByteByteString(long longValue, int intValue1, int int byte[] encode = transcoder.encode(value, AnnotationTranscoder.CODE_LONG_INT_INT_BYTE_BYTE_STRING); LongIntIntByteByteStringValue decode = (LongIntIntByteByteStringValue) transcoder.decode(AnnotationTranscoder.CODE_LONG_INT_INT_BYTE_BYTE_STRING, encode); - Assert.assertEquals(value.getLongValue(), decode.getLongValue()); - Assert.assertEquals(value.getIntValue1(), decode.getIntValue1()); - Assert.assertEquals(value.getIntValue2(), decode.getIntValue2()); - Assert.assertEquals(value.getByteValue1(), decode.getByteValue1()); - Assert.assertEquals(value.getByteValue2(), decode.getByteValue2()); - Assert.assertEquals(value.getStringValue(), decode.getStringValue()); + Assertions.assertEquals(value.getLongValue(), decode.getLongValue()); + Assertions.assertEquals(value.getIntValue1(), decode.getIntValue1()); + Assertions.assertEquals(value.getIntValue2(), decode.getIntValue2()); + Assertions.assertEquals(value.getByteValue1(), decode.getByteValue1()); + Assertions.assertEquals(value.getByteValue2(), decode.getByteValue2()); + Assertions.assertEquals(value.getStringValue(), decode.getStringValue()); } @Test @@ -175,10 +174,10 @@ public void testIntBooleanIntBoolean() { byte[] encode = transcoder.encode(value, AnnotationTranscoder.CODE_INT_BOOLEAN_INT_BOOLEAN); IntBooleanIntBooleanValue decode = (IntBooleanIntBooleanValue) transcoder.decode(AnnotationTranscoder.CODE_INT_BOOLEAN_INT_BOOLEAN, encode); - Assert.assertEquals(value.getIntValue1(), decode.getIntValue1()); - Assert.assertFalse(decode.isBooleanValue1()); - Assert.assertEquals(value.getIntValue2(), decode.getIntValue2()); - Assert.assertTrue(decode.isBooleanValue2()); + Assertions.assertEquals(value.getIntValue1(), decode.getIntValue1()); + Assertions.assertFalse(decode.isBooleanValue1()); + Assertions.assertEquals(value.getIntValue2(), decode.getIntValue2()); + Assertions.assertTrue(decode.isBooleanValue2()); } private void write(int value) throws TException { diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/ServerMetaDataBoTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/ServerMetaDataBoTest.java index 7a890ba42741..cf2dcfad1c6f 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/ServerMetaDataBoTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/ServerMetaDataBoTest.java @@ -16,12 +16,12 @@ package com.navercorp.pinpoint.common.server.bo; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author hyungil.jeong @@ -31,7 +31,7 @@ public class ServerMetaDataBoTest { @Test public void testByteArrayConversion() { // Given - final ServerMetaDataBo testBo = createTestBo("testServer", Arrays.asList("arg1", "arg2"), + final ServerMetaDataBo testBo = createTestBo("testServer", Arrays.asList("arg1", "arg2"), Arrays.asList(ServiceInfoBoTest.createTestBo("testService", Arrays.asList("lib1", "lib2")))); // When final byte[] serializedBo = testBo.writeValue(); @@ -39,7 +39,7 @@ public void testByteArrayConversion() { // Then assertEquals(testBo, deserializedBo); } - + @Test public void testByteArrayConversionNullValues() { // Given @@ -50,7 +50,7 @@ public void testByteArrayConversionNullValues() { // Then assertEquals(testBo, deserializedBo); } - + static ServerMetaDataBo createTestBo(String serverInfo, List vmArgs, List serviceInfos) { final ServerMetaDataBo.Builder builder = new ServerMetaDataBo.Builder(); builder.serverInfo(serverInfo); diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/ServiceInfoBoTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/ServiceInfoBoTest.java index b94f24e61cb4..6bdafb4dbe0b 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/ServiceInfoBoTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/ServiceInfoBoTest.java @@ -16,14 +16,12 @@ package com.navercorp.pinpoint.common.server.bo; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import org.junit.Test; - -import com.navercorp.pinpoint.common.server.bo.ServiceInfoBo; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author hyungil.jeong @@ -40,7 +38,7 @@ public void testByteArrayConversion() { // Then assertEquals(testBo, deserializedBo); } - + @Test public void testByteArrayConversionNullValues() { // Given @@ -51,7 +49,7 @@ public void testByteArrayConversionNullValues() { // Then assertEquals(testBo, deserializedBo); } - + static ServiceInfoBo createTestBo(String serviceName, List serviceLibs) { final ServiceInfoBo.Builder builder = new ServiceInfoBo.Builder(); return builder.serviceName(serviceName).serviceLibs(serviceLibs).build(); diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/SpanFactoryAssert.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/SpanFactoryAssert.java index 5eb70820c7ee..6ee60078b2df 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/SpanFactoryAssert.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/SpanFactoryAssert.java @@ -23,7 +23,7 @@ import com.navercorp.pinpoint.thrift.dto.TSpanChunk; import com.navercorp.pinpoint.thrift.dto.TSpanEvent; import org.apache.commons.collections4.CollectionUtils; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import java.nio.ByteBuffer; import java.util.HashMap; @@ -36,36 +36,36 @@ public class SpanFactoryAssert { public void assertSpan(TSpan tSpan, SpanBo spanBo) { - Assert.assertEquals(tSpan.getAgentId(), spanBo.getAgentId()); - Assert.assertEquals(tSpan.getApplicationName(), spanBo.getApplicationId()); - Assert.assertEquals(tSpan.getAgentStartTime(), spanBo.getAgentStartTime()); + Assertions.assertEquals(tSpan.getAgentId(), spanBo.getAgentId()); + Assertions.assertEquals(tSpan.getApplicationName(), spanBo.getApplicationId()); + Assertions.assertEquals(tSpan.getAgentStartTime(), spanBo.getAgentStartTime()); TransactionId transactionId = spanBo.getTransactionId(); ByteBuffer byteBuffer = TransactionIdUtils.formatByteBuffer(transactionId.getAgentId(), transactionId.getAgentStartTime(), transactionId.getTransactionSequence()); - Assert.assertEquals(ByteBuffer.wrap(tSpan.getTransactionId()), byteBuffer); + Assertions.assertEquals(ByteBuffer.wrap(tSpan.getTransactionId()), byteBuffer); - Assert.assertEquals(tSpan.getSpanId(), spanBo.getSpanId()); - Assert.assertEquals(tSpan.getParentSpanId(), spanBo.getParentSpanId()); - Assert.assertEquals(tSpan.getStartTime(), spanBo.getStartTime()); - Assert.assertEquals(tSpan.getElapsed(), spanBo.getElapsed()); - Assert.assertEquals(tSpan.getElapsed(), spanBo.getElapsed()); - Assert.assertEquals(tSpan.getRpc(), spanBo.getRpc()); + Assertions.assertEquals(tSpan.getSpanId(), spanBo.getSpanId()); + Assertions.assertEquals(tSpan.getParentSpanId(), spanBo.getParentSpanId()); + Assertions.assertEquals(tSpan.getStartTime(), spanBo.getStartTime()); + Assertions.assertEquals(tSpan.getElapsed(), spanBo.getElapsed()); + Assertions.assertEquals(tSpan.getElapsed(), spanBo.getElapsed()); + Assertions.assertEquals(tSpan.getRpc(), spanBo.getRpc()); - Assert.assertEquals(tSpan.getServiceType(), spanBo.getServiceType()); - Assert.assertEquals(tSpan.getEndPoint(), spanBo.getEndPoint()); - Assert.assertEquals(tSpan.getRemoteAddr(), spanBo.getRemoteAddr()); + Assertions.assertEquals(tSpan.getServiceType(), spanBo.getServiceType()); + Assertions.assertEquals(tSpan.getEndPoint(), spanBo.getEndPoint()); + Assertions.assertEquals(tSpan.getRemoteAddr(), spanBo.getRemoteAddr()); assertAnnotation(tSpan.getAnnotations(), spanBo.getAnnotationBoList()); - Assert.assertEquals(tSpan.getFlag(), spanBo.getFlag()); - Assert.assertEquals(tSpan.getErr(), spanBo.getErrCode()); + Assertions.assertEquals(tSpan.getFlag(), spanBo.getFlag()); + Assertions.assertEquals(tSpan.getErr(), spanBo.getErrCode()); - Assert.assertEquals(tSpan.getParentApplicationName(), spanBo.getParentApplicationId()); - Assert.assertEquals(tSpan.getParentApplicationType(), spanBo.getParentApplicationServiceType()); - Assert.assertEquals(tSpan.getAcceptorHost(), spanBo.getAcceptorHost()); + Assertions.assertEquals(tSpan.getParentApplicationName(), spanBo.getParentApplicationId()); + Assertions.assertEquals(tSpan.getParentApplicationType(), spanBo.getParentApplicationServiceType()); + Assertions.assertEquals(tSpan.getAcceptorHost(), spanBo.getAcceptorHost()); - Assert.assertEquals(tSpan.getApiId(), spanBo.getApiId()); - Assert.assertEquals(tSpan.getApplicationServiceType(), spanBo.getApplicationServiceType()); + Assertions.assertEquals(tSpan.getApiId(), spanBo.getApiId()); + Assertions.assertEquals(tSpan.getApplicationServiceType(), spanBo.getApplicationServiceType()); List spanEventBoList = spanBo.getSpanEventBoList(); List spanEventList = tSpan.getSpanEventList(); @@ -73,13 +73,13 @@ public void assertSpan(TSpan tSpan, SpanBo spanBo) { boolean hasException = tSpan.getExceptionInfo() != null; - Assert.assertEquals(hasException, spanBo.hasException()); + Assertions.assertEquals(hasException, spanBo.hasException()); if (hasException) { - Assert.assertEquals(tSpan.getExceptionInfo().getIntValue(), spanBo.getExceptionId()); - Assert.assertEquals(tSpan.getExceptionInfo().getStringValue(), spanBo.getExceptionMessage()); + Assertions.assertEquals(tSpan.getExceptionInfo().getIntValue(), spanBo.getExceptionId()); + Assertions.assertEquals(tSpan.getExceptionInfo().getStringValue(), spanBo.getExceptionMessage()); } - Assert.assertEquals(tSpan.getLoggingTransactionInfo(), spanBo.getLoggingTransactionInfo()); + Assertions.assertEquals(tSpan.getLoggingTransactionInfo(), spanBo.getLoggingTransactionInfo()); } @@ -87,7 +87,7 @@ public void assertAnnotation(List tAnnotationList, List tAnnotationList, List spanEventBoList = spanChunkBo.getSpanEventBoList(); @@ -156,18 +156,18 @@ public void assertSpanChunk(TSpanChunk tSpanChunk, SpanChunkBo spanChunkBo) { } private void assertSpanEventList(List spanEventBoList, List spanEventList) { - Assert.assertEquals(CollectionUtils.isEmpty(spanEventBoList), CollectionUtils.isEmpty(spanEventList)); + Assertions.assertEquals(CollectionUtils.isEmpty(spanEventBoList), CollectionUtils.isEmpty(spanEventList)); if (CollectionUtils.isNotEmpty(spanEventBoList)) { Map spanEventBoMap = new HashMap<>(); for (int i = 0; i < spanEventBoList.size(); i++) { SpanEventBo spanEventBo = spanEventBoList.get(i); - spanEventBoMap.put((int)spanEventBo.getSequence(), spanEventBo); + spanEventBoMap.put((int) spanEventBo.getSequence(), spanEventBo); } for (int i = 0; i < spanEventList.size(); i++) { TSpanEvent tSpanEvent = spanEventList.get(i); SpanEventBo spanEventBo = spanEventBoMap.get((int) tSpanEvent.getSequence()); - Assert.assertNotNull(spanEventBo); + Assertions.assertNotNull(spanEventBo); assertSpanEvent(tSpanEvent, spanEventBo); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/AgentStatCodecTestBase.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/AgentStatCodecTestBase.java index f77a7934637b..dcb0e0ae9d23 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/AgentStatCodecTestBase.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/AgentStatCodecTestBase.java @@ -22,8 +22,8 @@ import com.navercorp.pinpoint.common.server.bo.serializer.stat.AgentStatDecodingContext; import com.navercorp.pinpoint.common.server.bo.serializer.stat.AgentStatUtils; import com.navercorp.pinpoint.common.server.bo.stat.AgentStatDataPoint; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.List; @@ -66,7 +66,7 @@ private void runTest() { Buffer valueBuffer = new FixedBuffer(encodedValueBuffer.getBuffer()); List actualAgentStats = getCodec().decodeValues(valueBuffer, decodingContext); - Assert.assertEquals(expectedAgentStats.size(), actualAgentStats.size()); + Assertions.assertEquals(expectedAgentStats.size(), actualAgentStats.size()); for (int i = 0; i < expectedAgentStats.size(); i++) { T expectedAgentStat = expectedAgentStats.get(i); T actualAgentStat = actualAgentStats.get(i); diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/AgentStatDataPointCodecTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/AgentStatDataPointCodecTest.java index b2358d9b37a1..d3137421b92e 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/AgentStatDataPointCodecTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/AgentStatDataPointCodecTest.java @@ -19,11 +19,10 @@ import com.navercorp.pinpoint.common.buffer.AutomaticBuffer; import com.navercorp.pinpoint.common.buffer.Buffer; import com.navercorp.pinpoint.common.buffer.FixedBuffer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -46,7 +45,7 @@ public void test_timestamps() { codec.encodeTimestamps(timestampBuffer, expectedTimestamps); // Then List decodedTimestamps = codec.decodeTimestamps(initialTimestamp, new FixedBuffer(timestampBuffer.getBuffer()), numValues); - Assert.assertEquals(expectedTimestamps, decodedTimestamps); + Assertions.assertEquals(expectedTimestamps, decodedTimestamps); } @Test @@ -59,7 +58,7 @@ public void test_single_timestamp() { codec.encodeTimestamps(timestampBuffer, expectedTimestamp); // Then List decodedTimestamp = codec.decodeTimestamps(givenTimestamp, new FixedBuffer(timestampBuffer.getBuffer()), 1); - Assert.assertEquals(expectedTimestamp, decodedTimestamp); + Assertions.assertEquals(expectedTimestamp, decodedTimestamp); } private List createTimestamps(long initialTimestampMs, long intervalMs, long randomDelta, int numValues) { diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/AgentStatEncoderTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/AgentStatEncoderTest.java index 9358e9051328..0c5c75ab16e2 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/AgentStatEncoderTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/AgentStatEncoderTest.java @@ -23,8 +23,8 @@ import com.navercorp.pinpoint.common.server.bo.stat.AgentStatDataPoint; import com.navercorp.pinpoint.common.server.bo.stat.AgentStatType; import org.apache.commons.lang3.RandomUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -83,7 +83,7 @@ private List createTestAgentStats(long initialTimestamp, int numS } protected void verify(List expectedAgentStats, List actualAgentStats) { - Assert.assertEquals(expectedAgentStats, actualAgentStats); + Assertions.assertEquals(expectedAgentStats, actualAgentStats); } private List decode(Buffer encodedQualifierBuffer, Buffer encodedValueBuffer, AgentStatDecodingContext decodingContext) { diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/header/BitCountingHeaderEncoderTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/header/BitCountingHeaderEncoderTest.java index 1842be8b4dff..4160221e6997 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/header/BitCountingHeaderEncoderTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/header/BitCountingHeaderEncoderTest.java @@ -17,8 +17,8 @@ package com.navercorp.pinpoint.common.server.bo.codec.stat.header; import org.apache.commons.lang3.RandomUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -54,7 +54,7 @@ public void test_with_random_codes() { int code = decoder.getCode(); decodedCodes.add(code); } - Assert.assertEquals(givenCodes, decodedCodes); + Assertions.assertEquals(givenCodes, decodedCodes); } @Test @@ -70,7 +70,7 @@ public void test_zeroes() { // Then AgentStatHeaderDecoder decoder = new BitCountingHeaderDecoder(header); for (int i = 0; i < numCodes; i++) { - Assert.assertEquals(0, decoder.getCode()); + Assertions.assertEquals(0, decoder.getCode()); } } @@ -99,7 +99,7 @@ public void test_zeroes_followed_by_random_codes() { for (int i = 0; i < numTotalCodes; i++) { decodedCodes.add(decoder.getCode()); } - Assert.assertEquals(givenCodes, decodedCodes); + Assertions.assertEquals(givenCodes, decodedCodes); } @Test @@ -107,6 +107,6 @@ public void test_empty_codes() { AgentStatHeaderEncoder encoder = new BitCountingHeaderEncoder(); final byte[] header = encoder.getHeader(); AgentStatHeaderDecoder decoder = new BitCountingHeaderDecoder(header); - Assert.assertEquals(0, decoder.getCode()); + Assertions.assertEquals(0, decoder.getCode()); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/ActiveTraceCodecTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/ActiveTraceCodecTest.java index 929bc09fbc1f..117625131284 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/ActiveTraceCodecTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/ActiveTraceCodecTest.java @@ -24,13 +24,13 @@ import com.navercorp.pinpoint.common.server.bo.serializer.stat.AgentStatUtils; import com.navercorp.pinpoint.common.server.bo.serializer.stat.ApplicationStatDecodingContext; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinActiveTraceBo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Date; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung @@ -65,11 +65,11 @@ public void encodeValuesTest() { private List createJoinActiveTRaceBoList(long currentTime) { final String id = "test_app"; List joinActiveTraceBoList = new ArrayList<>(); - JoinActiveTraceBo joinActiveTraceBo1 = new JoinActiveTraceBo(id, 1, (short)2, 31, 11, "app_1_1", 41, "app_1_2", currentTime); - JoinActiveTraceBo joinActiveTraceBo2 = new JoinActiveTraceBo(id, 1, (short)2, 32, 12, "app_2_1", 42, "app_2_2", currentTime + 5000); - JoinActiveTraceBo joinActiveTraceBo3 = new JoinActiveTraceBo(id, 1, (short)2, 33, 13, "app_3_1", 43, "app_3_2", currentTime + 10000); - JoinActiveTraceBo joinActiveTraceBo4 = new JoinActiveTraceBo(id, 1, (short)2, 34, 14, "app_4_1", 44, "app_4_2", currentTime + 15000); - JoinActiveTraceBo joinActiveTraceBo5 = new JoinActiveTraceBo(id, 1, (short)2, 35, 15, "app_5_1", 45, "app_5_2", currentTime + 20000); + JoinActiveTraceBo joinActiveTraceBo1 = new JoinActiveTraceBo(id, 1, (short) 2, 31, 11, "app_1_1", 41, "app_1_2", currentTime); + JoinActiveTraceBo joinActiveTraceBo2 = new JoinActiveTraceBo(id, 1, (short) 2, 32, 12, "app_2_1", 42, "app_2_2", currentTime + 5000); + JoinActiveTraceBo joinActiveTraceBo3 = new JoinActiveTraceBo(id, 1, (short) 2, 33, 13, "app_3_1", 43, "app_3_2", currentTime + 10000); + JoinActiveTraceBo joinActiveTraceBo4 = new JoinActiveTraceBo(id, 1, (short) 2, 34, 14, "app_4_1", 44, "app_4_2", currentTime + 15000); + JoinActiveTraceBo joinActiveTraceBo5 = new JoinActiveTraceBo(id, 1, (short) 2, 35, 15, "app_5_1", 45, "app_5_2", currentTime + 20000); joinActiveTraceBoList.add(joinActiveTraceBo1); joinActiveTraceBoList.add(joinActiveTraceBo2); joinActiveTraceBoList.add(joinActiveTraceBo3); diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/CpuLoadCodecTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/CpuLoadCodecTest.java index b0d31723c2d9..60d32e76edb3 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/CpuLoadCodecTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/CpuLoadCodecTest.java @@ -23,13 +23,13 @@ import com.navercorp.pinpoint.common.server.bo.serializer.stat.AgentStatUtils; import com.navercorp.pinpoint.common.server.bo.serializer.stat.ApplicationStatDecodingContext; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinCpuLoadBo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Date; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung @@ -37,7 +37,7 @@ public class CpuLoadCodecTest { @Test - public void encodeAndDecodeTest(){ + public void encodeAndDecodeTest() { final String id = "test_app"; final long currentTime = new Date().getTime(); final AgentStatDataPointCodec agentStatDataPointCodec = new AgentStatDataPointCodec(); diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/DataSourceCodecTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/DataSourceCodecTest.java index d8828e7f0bf9..b26e53ab2f21 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/DataSourceCodecTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/DataSourceCodecTest.java @@ -25,13 +25,13 @@ import com.navercorp.pinpoint.common.server.bo.serializer.stat.ApplicationStatDecodingContext; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinDataSourceBo; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinDataSourceListBo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Date; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung @@ -49,7 +49,7 @@ public void encodeAndDecodeTest() { encodedValueBuffer.putByte(dataSourceCodec.getVersion()); dataSourceCodec.encodeValues(encodedValueBuffer, joinDataSourceListBoList); - final Buffer valueBuffer = new FixedBuffer(encodedValueBuffer.getBuffer());; + final Buffer valueBuffer = new FixedBuffer(encodedValueBuffer.getBuffer()); final long baseTimestamp = AgentStatUtils.getBaseTimestamp(currentTime); final long timestampDelta = currentTime - baseTimestamp; final ApplicationStatDecodingContext decodingContext = new ApplicationStatDecodingContext(); @@ -59,7 +59,7 @@ public void encodeAndDecodeTest() { assertEquals(valueBuffer.readByte(), dataSourceCodec.getVersion()); List decodedJoinDataSourceListBoList = dataSourceCodec.decodeValues(valueBuffer, decodingContext); - for (int i = 0 ; i < decodedJoinDataSourceListBoList.size(); ++i) { + for (int i = 0; i < decodedJoinDataSourceListBoList.size(); ++i) { assertEquals(decodedJoinDataSourceListBoList.get(i), joinDataSourceListBoList.get(i)); } } @@ -86,11 +86,11 @@ private List createJoinDataSourceListBoList(long currentTi private List createJoinDataSourceBoList(int plus) { List joinDataSourceBoList = new ArrayList<>(); - JoinDataSourceBo joinDataSourceBo1 = new JoinDataSourceBo((short)1000, "jdbc:mysql", 30 + plus, 25 + plus, "agent_id_1", 60 + plus, "agent_id_6"); - JoinDataSourceBo joinDataSourceBo2 = new JoinDataSourceBo((short)2000, "jdbc:mssql", 20 + plus, 5 + plus, "agent_id_2", 30 + plus, "agent_id_7"); - JoinDataSourceBo joinDataSourceBo3 = new JoinDataSourceBo((short)3000, "jdbc:postgre", 10 + plus, 25 + plus, "agent_id_3", 50 + plus, "agent_id_8"); - JoinDataSourceBo joinDataSourceBo4 = new JoinDataSourceBo((short)4000, "jdbc:oracle", 40 + plus, 5 + plus, "agent_id_4", 70 + plus, "agent_id_9"); - JoinDataSourceBo joinDataSourceBo5 = new JoinDataSourceBo((short)5000, "jdbc:cubrid", 50 + plus, 25 + plus, "agent_id_5", 80 + plus, "agent_id_10"); + JoinDataSourceBo joinDataSourceBo1 = new JoinDataSourceBo((short) 1000, "jdbc:mysql", 30 + plus, 25 + plus, "agent_id_1", 60 + plus, "agent_id_6"); + JoinDataSourceBo joinDataSourceBo2 = new JoinDataSourceBo((short) 2000, "jdbc:mssql", 20 + plus, 5 + plus, "agent_id_2", 30 + plus, "agent_id_7"); + JoinDataSourceBo joinDataSourceBo3 = new JoinDataSourceBo((short) 3000, "jdbc:postgre", 10 + plus, 25 + plus, "agent_id_3", 50 + plus, "agent_id_8"); + JoinDataSourceBo joinDataSourceBo4 = new JoinDataSourceBo((short) 4000, "jdbc:oracle", 40 + plus, 5 + plus, "agent_id_4", 70 + plus, "agent_id_9"); + JoinDataSourceBo joinDataSourceBo5 = new JoinDataSourceBo((short) 5000, "jdbc:cubrid", 50 + plus, 25 + plus, "agent_id_5", 80 + plus, "agent_id_10"); joinDataSourceBoList.add(joinDataSourceBo1); joinDataSourceBoList.add(joinDataSourceBo2); diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/DirectBufferCodecTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/DirectBufferCodecTest.java index 5719f66cb38c..abe24641b93d 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/DirectBufferCodecTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/DirectBufferCodecTest.java @@ -24,13 +24,13 @@ import com.navercorp.pinpoint.common.server.bo.serializer.stat.AgentStatUtils; import com.navercorp.pinpoint.common.server.bo.serializer.stat.ApplicationStatDecodingContext; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinDirectBufferBo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Date; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Roy Kim @@ -38,7 +38,7 @@ public class DirectBufferCodecTest { @Test - public void encodeAndDecodeTest(){ + public void encodeAndDecodeTest() { final String id = "test_app"; final long currentTime = new Date().getTime(); final AgentStatDataPointCodec agentStatDataPointCodec = new AgentStatDataPointCodec(); @@ -48,7 +48,7 @@ public void encodeAndDecodeTest(){ encodedValueBuffer.putByte(directBufferCodec.getVersion()); directBufferCodec.encodeValues(encodedValueBuffer, joinDirectBufferBoList); - final Buffer valueBuffer = new FixedBuffer(encodedValueBuffer.getBuffer());; + final Buffer valueBuffer = new FixedBuffer(encodedValueBuffer.getBuffer()); final long baseTimestamp = AgentStatUtils.getBaseTimestamp(currentTime); final long timestampDelta = currentTime - baseTimestamp; final ApplicationStatDecodingContext decodingContext = new ApplicationStatDecodingContext(); @@ -68,7 +68,7 @@ private List createJoinDirectBufferBoList(long currentTime) final List joinDirectBufferBoList = new ArrayList<>(); JoinDirectBufferBo joinDirectBufferBo1 = new JoinDirectBufferBo(id, 80, 1000, "agent1_1", 30, "agent1_2", 80, 1000, "agent1_1", 30, "agent1_2", 80, 1000, "agent1_1", 30, "agent1_2", 80, 1000, "agent1_1", 30, "agent1_2", currentTime); JoinDirectBufferBo joinDirectBufferBo2 = new JoinDirectBufferBo(id, 70, 900, "agent2_1", 20, "agent2_2", 70, 900, "agent2_1", 20, "agent2_2", 70, 900, "agent2_1", 20, "agent2_2", 70, 900, "agent2_1", 20, "agent2_2", currentTime + 5000); - JoinDirectBufferBo joinDirectBufferBo4 = new JoinDirectBufferBo(id, 60, 800, "agent4_1", 15, "agent4_2", 60, 800, "agent4_1", 15, "agent4_2", 60, 800, "agent4_1", 15, "agent4_2", 60, 800, "agent4_1", 15, "agent4_2", currentTime + 15000); + JoinDirectBufferBo joinDirectBufferBo4 = new JoinDirectBufferBo(id, 60, 800, "agent4_1", 15, "agent4_2", 60, 800, "agent4_1", 15, "agent4_2", 60, 800, "agent4_1", 15, "agent4_2", 60, 800, "agent4_1", 15, "agent4_2", currentTime + 15000); JoinDirectBufferBo joinDirectBufferBo3 = new JoinDirectBufferBo(id, 50, 700, "agent3_1", 10, "agent3_2", 50, 700, "agent3_1", 10, "agent3_2", 50, 700, "agent3_1", 10, "agent3_2", 50, 700, "agent3_1", 10, "agent3_2", currentTime + 10000); JoinDirectBufferBo joinDirectBufferBo5 = new JoinDirectBufferBo(id, 40, 600, "agent5_1", 5, "agent5_2", 40, 600, "agent5_1", 5, "agent5_2", 40, 600, "agent5_1", 5, "agent5_2", 40, 600, "agent5_1", 5, "agent5_2", currentTime + 20000); joinDirectBufferBoList.add(joinDirectBufferBo1); diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/FileDescriptorCodecTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/FileDescriptorCodecTest.java index 8d99a854245b..1ddf78dc589f 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/FileDescriptorCodecTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/FileDescriptorCodecTest.java @@ -24,13 +24,13 @@ import com.navercorp.pinpoint.common.server.bo.serializer.stat.AgentStatUtils; import com.navercorp.pinpoint.common.server.bo.serializer.stat.ApplicationStatDecodingContext; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinFileDescriptorBo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Date; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Roy Kim @@ -38,7 +38,7 @@ public class FileDescriptorCodecTest { @Test - public void encodeAndDecodeTest(){ + public void encodeAndDecodeTest() { final String id = "test_app"; final long currentTime = new Date().getTime(); final AgentStatDataPointCodec agentStatDataPointCodec = new AgentStatDataPointCodec(); @@ -48,7 +48,7 @@ public void encodeAndDecodeTest(){ encodedValueBuffer.putByte(fileDescriptorCodec.getVersion()); fileDescriptorCodec.encodeValues(encodedValueBuffer, joinFileDescriptorBoList); - final Buffer valueBuffer = new FixedBuffer(encodedValueBuffer.getBuffer());; + final Buffer valueBuffer = new FixedBuffer(encodedValueBuffer.getBuffer()); final long baseTimestamp = AgentStatUtils.getBaseTimestamp(currentTime); final long timestampDelta = currentTime - baseTimestamp; final ApplicationStatDecodingContext decodingContext = new ApplicationStatDecodingContext(); @@ -68,7 +68,7 @@ private List createJoinFileDescriptorBoList(long currentTi final List joinFileDescriptorBoList = new ArrayList<>(); JoinFileDescriptorBo joinFileDescriptorBo1 = new JoinFileDescriptorBo(id, 80, 1000, "agent1_1", 30, "agent1_2", currentTime); JoinFileDescriptorBo joinFileDescriptorBo2 = new JoinFileDescriptorBo(id, 70, 900, "agent2_1", 20, "agent2_2", currentTime + 5000); - JoinFileDescriptorBo joinFileDescriptorBo4 = new JoinFileDescriptorBo(id, 60, 800, "agent4_1", 15, "agent4_2", currentTime + 15000); + JoinFileDescriptorBo joinFileDescriptorBo4 = new JoinFileDescriptorBo(id, 60, 800, "agent4_1", 15, "agent4_2", currentTime + 15000); JoinFileDescriptorBo joinFileDescriptorBo3 = new JoinFileDescriptorBo(id, 50, 700, "agent3_1", 10, "agent3_2", currentTime + 10000); JoinFileDescriptorBo joinFileDescriptorBo5 = new JoinFileDescriptorBo(id, 40, 600, "agent5_1", 5, "agent5_2", currentTime + 20000); joinFileDescriptorBoList.add(joinFileDescriptorBo1); diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/LoadedClassCountCodecTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/LoadedClassCountCodecTest.java index 3e7d0e285d3b..f9f0e18a7c3f 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/LoadedClassCountCodecTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/LoadedClassCountCodecTest.java @@ -24,18 +24,18 @@ import com.navercorp.pinpoint.common.server.bo.serializer.stat.AgentStatUtils; import com.navercorp.pinpoint.common.server.bo.serializer.stat.ApplicationStatDecodingContext; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLoadedClassBo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Date; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class LoadedClassCountCodecTest { @Test - public void encodeAndDecodeTest(){ + public void encodeAndDecodeTest() { final String id = "test_app"; final long currentTime = new Date().getTime(); final AgentStatDataPointCodec agentStatDataPointCodec = new AgentStatDataPointCodec(); @@ -45,7 +45,7 @@ public void encodeAndDecodeTest(){ encodedValueBuffer.putByte(loadedClassCodec.getVersion()); loadedClassCodec.encodeValues(encodedValueBuffer, joinLoadedClassBoList); - final Buffer valueBuffer = new FixedBuffer(encodedValueBuffer.getBuffer());; + final Buffer valueBuffer = new FixedBuffer(encodedValueBuffer.getBuffer()); final long baseTimestamp = AgentStatUtils.getBaseTimestamp(currentTime); final long timestampDelta = currentTime - baseTimestamp; final ApplicationStatDecodingContext decodingContext = new ApplicationStatDecodingContext(); @@ -64,14 +64,15 @@ private List createJoinLoadedClassCountBoList(long currentTim final String id = "test_app"; final List joinLoadedClassBoList = new ArrayList<>(); JoinLoadedClassBo joinLoadedClassBo1 = new JoinLoadedClassBo(id, 80, 900, "agent2_1", 20, "agent2_2", 70, 900, "agent2_1", 20, "agent2_2", currentTime); - JoinLoadedClassBo joinLoadedClassBo2 = new JoinLoadedClassBo(id, 70, 900, "agent2_1", 20, "agent2_2", 70, 900, "agent2_1", 20, "agent2_2", currentTime+5000); - JoinLoadedClassBo joinLoadedClassBo3 = new JoinLoadedClassBo(id, 60, 800, "agent4_1", 15, "agent4_2", 60, 800, "agent4_1", 15, "agent4_2", currentTime+15000); - JoinLoadedClassBo joinLoadedClassBo4 = new JoinLoadedClassBo(id, 50, 700, "agent3_1", 10, "agent3_2", 50, 700, "agent3_1", 10, "agent3_2", currentTime+10000); - JoinLoadedClassBo joinLoadedClassBo5 = new JoinLoadedClassBo(id, 40, 600, "agent5_1", 5, "agent5_2", 40, 600, "agent5_1", 5, "agent5_2", currentTime+20000); + JoinLoadedClassBo joinLoadedClassBo2 = new JoinLoadedClassBo(id, 70, 900, "agent2_1", 20, "agent2_2", 70, 900, "agent2_1", 20, "agent2_2", currentTime + 5000); + JoinLoadedClassBo joinLoadedClassBo3 = new JoinLoadedClassBo(id, 60, 800, "agent4_1", 15, "agent4_2", 60, 800, "agent4_1", 15, "agent4_2", currentTime + 15000); + JoinLoadedClassBo joinLoadedClassBo4 = new JoinLoadedClassBo(id, 50, 700, "agent3_1", 10, "agent3_2", 50, 700, "agent3_1", 10, "agent3_2", currentTime + 10000); + JoinLoadedClassBo joinLoadedClassBo5 = new JoinLoadedClassBo(id, 40, 600, "agent5_1", 5, "agent5_2", 40, 600, "agent5_1", 5, "agent5_2", currentTime + 20000); joinLoadedClassBoList.add(joinLoadedClassBo1); joinLoadedClassBoList.add(joinLoadedClassBo2); joinLoadedClassBoList.add(joinLoadedClassBo3); joinLoadedClassBoList.add(joinLoadedClassBo4); joinLoadedClassBoList.add(joinLoadedClassBo5); return joinLoadedClassBoList; - }} + } +} diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/MemoryCodecTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/MemoryCodecTest.java index 198acb389c75..7a60c9729c63 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/MemoryCodecTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/MemoryCodecTest.java @@ -24,13 +24,13 @@ import com.navercorp.pinpoint.common.server.bo.serializer.stat.AgentStatUtils; import com.navercorp.pinpoint.common.server.bo.serializer.stat.ApplicationStatDecodingContext; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinMemoryBo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Date; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung @@ -48,7 +48,7 @@ public void encodeAndDecodeTest() { encodedValueBuffer.putByte(memoryCodec.getVersion()); memoryCodec.encodeValues(encodedValueBuffer, joinMemoryBoList); - final Buffer valueBuffer = new FixedBuffer(encodedValueBuffer.getBuffer());; + final Buffer valueBuffer = new FixedBuffer(encodedValueBuffer.getBuffer()); final long baseTimestamp = AgentStatUtils.getBaseTimestamp(currentTime); final long timestampDelta = currentTime - baseTimestamp; final ApplicationStatDecodingContext decodingContext = new ApplicationStatDecodingContext(); diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/ResponseTimeCodecTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/ResponseTimeCodecTest.java index 705ac2694c4c..265b985db205 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/ResponseTimeCodecTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/ResponseTimeCodecTest.java @@ -23,13 +23,13 @@ import com.navercorp.pinpoint.common.server.bo.serializer.stat.AgentStatUtils; import com.navercorp.pinpoint.common.server.bo.serializer.stat.ApplicationStatDecodingContext; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinResponseTimeBo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Date; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung @@ -47,7 +47,7 @@ public void encodeAndDecodeTest() { encodedValueBuffer.putByte(responseTimeCodec.getVersion()); responseTimeCodec.encodeValues(encodedValueBuffer, joinResponseTimeBoList); - final Buffer valueBuffer = new FixedBuffer(encodedValueBuffer.getBuffer());; + final Buffer valueBuffer = new FixedBuffer(encodedValueBuffer.getBuffer()); final long baseTimestamp = AgentStatUtils.getBaseTimestamp(currentTime); final long timestampDelta = currentTime - baseTimestamp; final ApplicationStatDecodingContext decodingContext = new ApplicationStatDecodingContext(); @@ -57,7 +57,7 @@ public void encodeAndDecodeTest() { assertEquals(valueBuffer.readByte(), responseTimeCodec.getVersion()); List decodedJoinResponseTimeBoList = responseTimeCodec.decodeValues(valueBuffer, decodingContext); - for (int i = 0 ; i < decodedJoinResponseTimeBoList.size(); i++) { + for (int i = 0; i < decodedJoinResponseTimeBoList.size(); i++) { assertEquals(decodedJoinResponseTimeBoList.get(i), joinResponseTimeBoList.get(i)); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/TotalThreadCountCodecTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/TotalThreadCountCodecTest.java index e7725d01febe..70bef15e7e5a 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/TotalThreadCountCodecTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/TotalThreadCountCodecTest.java @@ -24,18 +24,18 @@ import com.navercorp.pinpoint.common.server.bo.serializer.stat.AgentStatUtils; import com.navercorp.pinpoint.common.server.bo.serializer.stat.ApplicationStatDecodingContext; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinTotalThreadCountBo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Date; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TotalThreadCountCodecTest { @Test - public void encodeAndDecodeTest(){ + public void encodeAndDecodeTest() { final String id = "test_app"; final long currentTime = new Date().getTime(); final AgentStatDataPointCodec agentStatDataPointCodec = new AgentStatDataPointCodec(); @@ -45,7 +45,7 @@ public void encodeAndDecodeTest(){ encodedValueBuffer.putByte(totalThreadCountCodec.getVersion()); totalThreadCountCodec.encodeValues(encodedValueBuffer, joinTotalThreadCountBoList); - final Buffer valueBuffer = new FixedBuffer(encodedValueBuffer.getBuffer());; + final Buffer valueBuffer = new FixedBuffer(encodedValueBuffer.getBuffer()); final long baseTimestamp = AgentStatUtils.getBaseTimestamp(currentTime); final long timestampDelta = currentTime - baseTimestamp; final ApplicationStatDecodingContext decodingContext = new ApplicationStatDecodingContext(); @@ -64,14 +64,15 @@ private List createJoinTotalThreadCountBoList(long curre final String id = "test_app"; final List joinTotalThreadCountBoList = new ArrayList<>(); JoinTotalThreadCountBo joinTotalThreadCountBo1 = new JoinTotalThreadCountBo(id, currentTime, 80, 1000, "agent1_1", 30, "agent1_2"); - JoinTotalThreadCountBo joinTotalThreadCountBo2 = new JoinTotalThreadCountBo(id, currentTime+5000, 70, 900, "agent2_1", 20, "agent2_2"); - JoinTotalThreadCountBo joinTotalThreadCountBo3 = new JoinTotalThreadCountBo(id, currentTime+15000, 60, 800, "agent4_1", 15, "agent4_2"); - JoinTotalThreadCountBo joinTotalThreadCountBo4 = new JoinTotalThreadCountBo(id, currentTime+10000, 50, 700, "agent3_1", 10, "agent3_2"); - JoinTotalThreadCountBo joinTotalThreadCountBo5 = new JoinTotalThreadCountBo(id, currentTime+20000, 40, 600, "agent5_1", 5, "agent5_2"); + JoinTotalThreadCountBo joinTotalThreadCountBo2 = new JoinTotalThreadCountBo(id, currentTime + 5000, 70, 900, "agent2_1", 20, "agent2_2"); + JoinTotalThreadCountBo joinTotalThreadCountBo3 = new JoinTotalThreadCountBo(id, currentTime + 15000, 60, 800, "agent4_1", 15, "agent4_2"); + JoinTotalThreadCountBo joinTotalThreadCountBo4 = new JoinTotalThreadCountBo(id, currentTime + 10000, 50, 700, "agent3_1", 10, "agent3_2"); + JoinTotalThreadCountBo joinTotalThreadCountBo5 = new JoinTotalThreadCountBo(id, currentTime + 20000, 40, 600, "agent5_1", 5, "agent5_2"); joinTotalThreadCountBoList.add(joinTotalThreadCountBo1); joinTotalThreadCountBoList.add(joinTotalThreadCountBo2); joinTotalThreadCountBoList.add(joinTotalThreadCountBo3); joinTotalThreadCountBoList.add(joinTotalThreadCountBo4); joinTotalThreadCountBoList.add(joinTotalThreadCountBo5); return joinTotalThreadCountBoList; - }} + } +} diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/TransactionCodecTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/TransactionCodecTest.java index 83f4f1459fcb..b0cad04e6b79 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/TransactionCodecTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/join/TransactionCodecTest.java @@ -24,13 +24,13 @@ import com.navercorp.pinpoint.common.server.bo.serializer.stat.AgentStatUtils; import com.navercorp.pinpoint.common.server.bo.serializer.stat.ApplicationStatDecodingContext; import com.navercorp.pinpoint.common.server.bo.stat.join.JoinTransactionBo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Date; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/EncodingStrategyTestBase.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/EncodingStrategyTestBase.java index 2520efe21fc8..5a5ef4446cc3 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/EncodingStrategyTestBase.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/EncodingStrategyTestBase.java @@ -20,9 +20,9 @@ import com.navercorp.pinpoint.common.buffer.Buffer; import com.navercorp.pinpoint.common.server.bo.codec.stat.AgentStatDataPointCodec; import com.navercorp.pinpoint.common.server.bo.codec.strategy.EncodingStrategy; -import org.junit.Assert; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.junit.jupiter.api.Assertions; import java.util.HashMap; import java.util.HashSet; @@ -65,7 +65,7 @@ private void checkStrategy(StrategyAnalyzer analyzer, Set chosenStrategy = analyzer.getBestStrategy(); List values = analyzer.getValues(); logger.debug("Chosen : {}", analyzer.getBestStrategy()); - Assert.assertTrue(createTestFailMessage(values, bestStrategies, chosenStrategy), bestStrategies.contains(chosenStrategy)); + Assertions.assertTrue(bestStrategies.contains(chosenStrategy), createTestFailMessage(values, bestStrategies, chosenStrategy)); } private > String createTestFailMessage(List values, Set bestStrategies, EncodingStrategy chosenStrategy) { diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/StringEncodingStrategyTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/StringEncodingStrategyTest.java index c85ef8066e09..92c1c8c7bf39 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/StringEncodingStrategyTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/StringEncodingStrategyTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.common.server.bo.codec.stat.strategy; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Taejin Koo @@ -33,7 +33,7 @@ public void noneTest() throws Exception { builder.addValue(string); } StrategyAnalyzer build = builder.build(); - Assert.assertEquals(build.getBestStrategy(), StringEncodingStrategy.NONE); + Assertions.assertEquals(build.getBestStrategy(), StringEncodingStrategy.NONE); } @Test @@ -44,7 +44,7 @@ public void repeatTest() throws Exception { builder.addValue(string); } StrategyAnalyzer build = builder.build(); - Assert.assertEquals(build.getBestStrategy(), StringEncodingStrategy.REPEAT_COUNT); + Assertions.assertEquals(build.getBestStrategy(), StringEncodingStrategy.REPEAT_COUNT); } @Test @@ -56,7 +56,7 @@ public void alwaysSameTest() throws Exception { builder.addValue(STRING_CANDIDATES[0]); StrategyAnalyzer build = builder.build(); - Assert.assertEquals(build.getBestStrategy(), StringEncodingStrategy.ALWAYS_SAME_VALUE); + Assertions.assertEquals(build.getBestStrategy(), StringEncodingStrategy.ALWAYS_SAME_VALUE); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/UnsignedIntegerEncodingStrategyTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/UnsignedIntegerEncodingStrategyTest.java index 1803f62a9f11..e5871cbebf58 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/UnsignedIntegerEncodingStrategyTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/UnsignedIntegerEncodingStrategyTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.common.server.bo.codec.stat.TestAgentStatDataPointFactory; import com.navercorp.pinpoint.common.server.bo.codec.strategy.EncodingStrategy; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; @@ -47,10 +47,10 @@ protected void checkBuilder(StrategyAnalyzer.StrategyAnalyzerBuilder an int actualRepeatCountEncodedSize = bufferSizes.get(UnsignedIntegerEncodingStrategy.REPEAT_COUNT); int actualDeltaEncodedSize = bufferSizes.get(UnsignedIntegerEncodingStrategy.DELTA); int actualDeltaOfDeltaEncodedSize = bufferSizes.get(UnsignedIntegerEncodingStrategy.DELTA_OF_DELTA); - Assert.assertEquals(actualValueEncodedSize, builder.getByteSizeValue()); - Assert.assertEquals(actualRepeatCountEncodedSize, builder.getByteSizeRepeatCount()); - Assert.assertEquals(actualDeltaEncodedSize, builder.getByteSizeDelta()); - Assert.assertEquals(actualDeltaOfDeltaEncodedSize, builder.getByteSizeDeltaOfDelta()); + Assertions.assertEquals(actualValueEncodedSize, builder.getByteSizeValue()); + Assertions.assertEquals(actualRepeatCountEncodedSize, builder.getByteSizeRepeatCount()); + Assertions.assertEquals(actualDeltaEncodedSize, builder.getByteSizeDelta()); + Assertions.assertEquals(actualDeltaOfDeltaEncodedSize, builder.getByteSizeDeltaOfDelta()); } @Test @@ -66,6 +66,7 @@ public void test_medium_values() { int maxValue = 1000000; testValues(minValue, maxValue); } + @Test public void test_large_values() { int minValue = 1000000; diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/UnsignedLongEncodingStrategyTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/UnsignedLongEncodingStrategyTest.java index d5620bac4b1b..8e3633310227 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/UnsignedLongEncodingStrategyTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/UnsignedLongEncodingStrategyTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.common.server.bo.codec.stat.TestAgentStatDataPointFactory; import com.navercorp.pinpoint.common.server.bo.codec.strategy.EncodingStrategy; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; @@ -47,10 +47,10 @@ protected void checkBuilder(StrategyAnalyzer.StrategyAnalyzerBuilder analy int actualRepeatCountEncodedSize = bufferSizes.get(UnsignedLongEncodingStrategy.REPEAT_COUNT); int actualDeltaEncodedSize = bufferSizes.get(UnsignedLongEncodingStrategy.DELTA); int actualDeltaOfDeltaEncodedSize = bufferSizes.get(UnsignedLongEncodingStrategy.DELTA_OF_DELTA); - Assert.assertEquals(actualValueEncodedSize, builder.getByteSizeValue()); - Assert.assertEquals(actualRepeatCountEncodedSize, builder.getByteSizeRepeatCount()); - Assert.assertEquals(actualDeltaEncodedSize, builder.getByteSizeDelta()); - Assert.assertEquals(actualDeltaOfDeltaEncodedSize, builder.getByteSizeDeltaOfDelta()); + Assertions.assertEquals(actualValueEncodedSize, builder.getByteSizeValue()); + Assertions.assertEquals(actualRepeatCountEncodedSize, builder.getByteSizeRepeatCount()); + Assertions.assertEquals(actualDeltaEncodedSize, builder.getByteSizeDelta()); + Assertions.assertEquals(actualDeltaOfDeltaEncodedSize, builder.getByteSizeDeltaOfDelta()); } @Test @@ -73,6 +73,7 @@ public void test_large_values() { long maxValue = 1000000000; testValues(minValue, maxValue); } + @Test public void test_huge_values() { long minValue = 1000000000; diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/UnsignedShortEncodingStrategyTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/UnsignedShortEncodingStrategyTest.java index 1c674d1146db..24aadea0f834 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/UnsignedShortEncodingStrategyTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/strategy/UnsignedShortEncodingStrategyTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.common.server.bo.codec.stat.TestAgentStatDataPointFactory; import com.navercorp.pinpoint.common.server.bo.codec.strategy.EncodingStrategy; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; @@ -45,8 +45,8 @@ protected void checkBuilder(StrategyAnalyzer.StrategyAnalyzerBuilder anal UnsignedShortEncodingStrategy.Analyzer.Builder builder = (UnsignedShortEncodingStrategy.Analyzer.Builder) analyzerBuilder; int actualValueEncodedSize = bufferSizes.get(UnsignedShortEncodingStrategy.NONE); int actualRepeatCountEncodedSize = bufferSizes.get(UnsignedShortEncodingStrategy.REPEAT_COUNT); - Assert.assertEquals("none", actualValueEncodedSize, builder.getByteSizeValue()); - Assert.assertEquals("repeatCount", actualRepeatCountEncodedSize, builder.getByteSizeRepeatCount()); + Assertions.assertEquals(actualValueEncodedSize, builder.getByteSizeValue(), "none"); + Assertions.assertEquals(actualRepeatCountEncodedSize, builder.getByteSizeRepeatCount(), "repeatCount"); } @Test diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/ActiveTraceCodecV2Test.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/ActiveTraceCodecV2Test.java index d9afe5f919b9..d7b8ceb71fc2 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/ActiveTraceCodecV2Test.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/ActiveTraceCodecV2Test.java @@ -20,18 +20,18 @@ import com.navercorp.pinpoint.common.server.bo.codec.stat.AgentStatCodecTestBase; import com.navercorp.pinpoint.common.server.bo.codec.stat.TestAgentStatFactory; import com.navercorp.pinpoint.common.server.bo.stat.ActiveTraceBo; -import org.junit.Assert; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.List; /** * @author HyunGil Jeong */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration("classpath:applicationContext-test.xml") public class ActiveTraceCodecV2Test extends AgentStatCodecTestBase { @@ -50,11 +50,11 @@ protected AgentStatCodec getCodec() { @Override protected void verify(ActiveTraceBo expected, ActiveTraceBo actual) { - Assert.assertEquals("agentId", expected.getAgentId(), actual.getAgentId()); - Assert.assertEquals("startTimestamp", expected.getStartTimestamp(), actual.getStartTimestamp()); - Assert.assertEquals("timestamp", expected.getTimestamp(), actual.getTimestamp()); - Assert.assertEquals("version", expected.getVersion(), actual.getVersion()); - Assert.assertEquals("histogramSchemaType", expected.getHistogramSchemaType(), actual.getHistogramSchemaType()); - Assert.assertEquals("activeTraceCounts", expected.getActiveTraceHistogram(), actual.getActiveTraceHistogram()); + Assertions.assertEquals(expected.getAgentId(), actual.getAgentId(), "agentId"); + Assertions.assertEquals(expected.getStartTimestamp(), actual.getStartTimestamp(), "startTimestamp"); + Assertions.assertEquals(expected.getTimestamp(), actual.getTimestamp(), "timestamp"); + Assertions.assertEquals(expected.getVersion(), actual.getVersion(), "version"); + Assertions.assertEquals(expected.getHistogramSchemaType(), actual.getHistogramSchemaType(), "histogramSchemaType"); + Assertions.assertEquals(expected.getActiveTraceHistogram(), actual.getActiveTraceHistogram(), "activeTraceCounts"); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/AgentUriStatCodecV2Test.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/AgentUriStatCodecV2Test.java index 35b2ce04e17c..348f76847675 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/AgentUriStatCodecV2Test.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/AgentUriStatCodecV2Test.java @@ -23,19 +23,18 @@ import com.navercorp.pinpoint.common.server.bo.stat.AgentUriStatBo; import com.navercorp.pinpoint.common.server.bo.stat.EachUriStatBo; import com.navercorp.pinpoint.common.server.bo.stat.UriStatHistogram; - -import org.junit.Assert; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.List; /** * @author Taejin Koo */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration("classpath:applicationContext-test.xml") public class AgentUriStatCodecV2Test extends AgentStatCodecTestBase { @@ -54,16 +53,16 @@ protected AgentStatCodec getCodec() { @Override protected void verify(AgentUriStatBo expected, AgentUriStatBo actual) { - Assert.assertEquals(expected.getAgentId(), actual.getAgentId()); - Assert.assertEquals(expected.getStartTimestamp(), actual.getStartTimestamp()); - Assert.assertEquals(expected.getTimestamp(), actual.getTimestamp()); - Assert.assertEquals(expected.getAgentStatType(), actual.getAgentStatType()); - Assert.assertEquals(expected.getBucketVersion(), actual.getBucketVersion()); + Assertions.assertEquals(expected.getAgentId(), actual.getAgentId()); + Assertions.assertEquals(expected.getStartTimestamp(), actual.getStartTimestamp()); + Assertions.assertEquals(expected.getTimestamp(), actual.getTimestamp()); + Assertions.assertEquals(expected.getAgentStatType(), actual.getAgentStatType()); + Assertions.assertEquals(expected.getBucketVersion(), actual.getBucketVersion()); List expectedEachUriStatBoList = expected.getEachUriStatBoList(); List actualEachUriStatBoList = actual.getEachUriStatBoList(); - Assert.assertEquals(expectedEachUriStatBoList.size(), actualEachUriStatBoList.size()); + Assertions.assertEquals(expectedEachUriStatBoList.size(), actualEachUriStatBoList.size()); int eachUriStatBoSize = actualEachUriStatBoList.size(); for (int i = 0; i < eachUriStatBoSize; i++) { @@ -72,7 +71,7 @@ protected void verify(AgentUriStatBo expected, AgentUriStatBo actual) { } private void assertEachUriStatBo(EachUriStatBo expected, EachUriStatBo actual) { - Assert.assertEquals(expected.getUri(), actual.getUri()); + Assertions.assertEquals(expected.getUri(), actual.getUri()); assertUriStatHistogram(expected.getTotalHistogram(), actual.getTotalHistogram()); assertUriStatHistogram(expected.getFailedHistogram(), actual.getFailedHistogram()); @@ -82,10 +81,10 @@ private void assertUriStatHistogram(UriStatHistogram expected, UriStatHistogram if (expected == null && actual == null) { return; } - Assert.assertEquals(expected.getCount(), actual.getCount()); - Assert.assertEquals(AgentStatUtils.convertDoubleToLong(expected.getAvg()), AgentStatUtils.convertDoubleToLong(actual.getAvg())); - Assert.assertEquals(expected.getMax(), actual.getMax()); - Assert.assertArrayEquals(expected.getTimestampHistogram(), actual.getTimestampHistogram()); + Assertions.assertEquals(expected.getCount(), actual.getCount()); + Assertions.assertEquals(AgentStatUtils.convertDoubleToLong(expected.getAvg()), AgentStatUtils.convertDoubleToLong(actual.getAvg())); + Assertions.assertEquals(expected.getMax(), actual.getMax()); + Assertions.assertArrayEquals(expected.getTimestampHistogram(), actual.getTimestampHistogram()); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/CpuLoadCodecV2Test.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/CpuLoadCodecV2Test.java index 43cba906714d..efd430041db9 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/CpuLoadCodecV2Test.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/CpuLoadCodecV2Test.java @@ -21,18 +21,18 @@ import com.navercorp.pinpoint.common.server.bo.codec.stat.TestAgentStatFactory; import com.navercorp.pinpoint.common.server.bo.serializer.stat.AgentStatUtils; import com.navercorp.pinpoint.common.server.bo.stat.CpuLoadBo; -import org.junit.Assert; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.List; /** * @author HyunGil Jeong */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration("classpath:applicationContext-test.xml") public class CpuLoadCodecV2Test extends AgentStatCodecTestBase { @@ -53,11 +53,11 @@ protected AgentStatCodec getCodec() { @Override protected void verify(CpuLoadBo expected, CpuLoadBo actual) { - Assert.assertEquals("agentId", expected.getAgentId(), actual.getAgentId()); - Assert.assertEquals("startTimestamp", expected.getStartTimestamp(), actual.getStartTimestamp()); - Assert.assertEquals("timestamp", expected.getTimestamp(), actual.getTimestamp()); - Assert.assertEquals("agentStatType", expected.getAgentStatType(), actual.getAgentStatType()); - Assert.assertEquals("jvmCpuLoad", expected.getJvmCpuLoad(), actual.getJvmCpuLoad(), DOUBLE_COMPARISON_DELTA); - Assert.assertEquals("systemCpuLoad", expected.getSystemCpuLoad(), actual.getSystemCpuLoad(), DOUBLE_COMPARISON_DELTA); + Assertions.assertEquals(expected.getAgentId(), actual.getAgentId(), "agentId"); + Assertions.assertEquals(expected.getStartTimestamp(), actual.getStartTimestamp(), "startTimestamp"); + Assertions.assertEquals(expected.getTimestamp(), actual.getTimestamp(), "timestamp"); + Assertions.assertEquals(expected.getAgentStatType(), actual.getAgentStatType(), "agentStatType"); + Assertions.assertEquals(expected.getJvmCpuLoad(), actual.getJvmCpuLoad(), DOUBLE_COMPARISON_DELTA, "jvmCpuLoad"); + Assertions.assertEquals(expected.getSystemCpuLoad(), actual.getSystemCpuLoad(), DOUBLE_COMPARISON_DELTA, "systemCpuLoad"); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/DataSourceCodecV2Test.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/DataSourceCodecV2Test.java index e62295572a29..6e3b58b453a4 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/DataSourceCodecV2Test.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/DataSourceCodecV2Test.java @@ -21,18 +21,18 @@ import com.navercorp.pinpoint.common.server.bo.codec.stat.TestAgentStatFactory; import com.navercorp.pinpoint.common.server.bo.stat.DataSourceBo; import com.navercorp.pinpoint.common.server.bo.stat.DataSourceListBo; -import org.junit.Assert; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.List; /** * @author Taejin Koo */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration("classpath:applicationContext-test.xml") public class DataSourceCodecV2Test extends AgentStatCodecTestBase { @@ -51,10 +51,10 @@ protected AgentStatCodec getCodec() { @Override protected void verify(DataSourceListBo expected, DataSourceListBo actual) { - Assert.assertEquals("agentId", expected.getAgentId(), actual.getAgentId()); - Assert.assertEquals("startTimestamp", expected.getStartTimestamp(), actual.getStartTimestamp()); - Assert.assertEquals("timestamp", expected.getTimestamp(), actual.getTimestamp()); - Assert.assertEquals(expected.size(), actual.size()); + Assertions.assertEquals(expected.getAgentId(), actual.getAgentId(), "agentId"); + Assertions.assertEquals(expected.getStartTimestamp(), actual.getStartTimestamp(), "startTimestamp"); + Assertions.assertEquals(expected.getTimestamp(), actual.getTimestamp(), "timestamp"); + Assertions.assertEquals(expected.size(), actual.size()); List expectedDataSourceList = expected.getList(); List actualDataSourceList = actual.getList(); @@ -65,16 +65,16 @@ protected void verify(DataSourceListBo expected, DataSourceListBo actual) { } private void verify(DataSourceBo expected, DataSourceBo actual) { - Assert.assertEquals("agentId", expected.getAgentId(), actual.getAgentId()); - Assert.assertEquals("startTimestamp", expected.getStartTimestamp(), actual.getStartTimestamp()); - Assert.assertEquals("timestamp", expected.getTimestamp(), actual.getTimestamp()); + Assertions.assertEquals(expected.getAgentId(), actual.getAgentId(), "agentId"); + Assertions.assertEquals(expected.getStartTimestamp(), actual.getStartTimestamp(), "startTimestamp"); + Assertions.assertEquals(expected.getTimestamp(), actual.getTimestamp(), "timestamp"); - Assert.assertEquals("id", expected.getId(), actual.getId()); - Assert.assertEquals("serviceTypeCode", expected.getServiceTypeCode(), actual.getServiceTypeCode()); - Assert.assertEquals("name", expected.getDatabaseName(), actual.getDatabaseName()); - Assert.assertEquals("jdbcUrl", expected.getJdbcUrl(), actual.getJdbcUrl()); - Assert.assertEquals("activeConnectionSize", expected.getActiveConnectionSize(), actual.getActiveConnectionSize()); - Assert.assertEquals("maxConnectionSize", expected.getMaxConnectionSize(), actual.getMaxConnectionSize()); + Assertions.assertEquals(expected.getId(), actual.getId(), "id"); + Assertions.assertEquals(expected.getServiceTypeCode(), actual.getServiceTypeCode(), "serviceTypeCode"); + Assertions.assertEquals(expected.getDatabaseName(), actual.getDatabaseName(), "name"); + Assertions.assertEquals(expected.getJdbcUrl(), actual.getJdbcUrl(), "jdbcUrl"); + Assertions.assertEquals(expected.getActiveConnectionSize(), actual.getActiveConnectionSize(), "activeConnectionSize"); + Assertions.assertEquals(expected.getMaxConnectionSize(), actual.getMaxConnectionSize(), "maxConnectionSize"); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/DeadlockCodecV2Test.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/DeadlockCodecV2Test.java index 35d6ce525d35..4bbf418ca239 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/DeadlockCodecV2Test.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/DeadlockCodecV2Test.java @@ -20,18 +20,18 @@ import com.navercorp.pinpoint.common.server.bo.codec.stat.AgentStatCodecTestBase; import com.navercorp.pinpoint.common.server.bo.codec.stat.TestAgentStatFactory; import com.navercorp.pinpoint.common.server.bo.stat.DeadlockThreadCountBo; -import org.junit.Assert; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.List; /** * @author Taejin Koo */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration("classpath:applicationContext-test.xml") public class DeadlockCodecV2Test extends AgentStatCodecTestBase { @@ -50,10 +50,10 @@ protected AgentStatCodec getCodec() { @Override protected void verify(DeadlockThreadCountBo expected, DeadlockThreadCountBo actual) { - Assert.assertEquals("agentId", expected.getAgentId(), actual.getAgentId()); - Assert.assertEquals("startTimestamp", expected.getStartTimestamp(), actual.getStartTimestamp()); - Assert.assertEquals("timestamp", expected.getTimestamp(), actual.getTimestamp()); - Assert.assertEquals("deadlockedThreadCount", expected.getDeadlockedThreadCount(), actual.getDeadlockedThreadCount()); + Assertions.assertEquals(expected.getAgentId(), actual.getAgentId(), "agentId"); + Assertions.assertEquals(expected.getStartTimestamp(), actual.getStartTimestamp(), "startTimestamp"); + Assertions.assertEquals(expected.getTimestamp(), actual.getTimestamp(), "timestamp"); + Assertions.assertEquals(expected.getDeadlockedThreadCount(), actual.getDeadlockedThreadCount(), "deadlockedThreadCount"); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/DirectBufferCodecV2Test.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/DirectBufferCodecV2Test.java index fc4390dc8e7b..fd2df816d8af 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/DirectBufferCodecV2Test.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/DirectBufferCodecV2Test.java @@ -20,18 +20,18 @@ import com.navercorp.pinpoint.common.server.bo.codec.stat.AgentStatCodecTestBase; import com.navercorp.pinpoint.common.server.bo.codec.stat.TestAgentStatFactory; import com.navercorp.pinpoint.common.server.bo.stat.DirectBufferBo; -import org.junit.Assert; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.List; /** * @author Roy Kim */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration("classpath:applicationContext-test.xml") public class DirectBufferCodecV2Test extends AgentStatCodecTestBase { @@ -50,13 +50,13 @@ protected AgentStatCodec getCodec() { @Override protected void verify(DirectBufferBo expected, DirectBufferBo actual) { - Assert.assertEquals("agentId", expected.getAgentId(), actual.getAgentId()); - Assert.assertEquals("startTimestamp", expected.getStartTimestamp(), actual.getStartTimestamp()); - Assert.assertEquals("timestamp", expected.getTimestamp(), actual.getTimestamp()); - Assert.assertEquals("agentStatType", expected.getAgentStatType(), actual.getAgentStatType()); - Assert.assertEquals("directCount", expected.getDirectCount(), actual.getDirectCount()); - Assert.assertEquals("directMemoryUsed", expected.getDirectMemoryUsed(), actual.getDirectMemoryUsed()); - Assert.assertEquals("mappedCount", expected.getMappedCount(), actual.getMappedCount()); - Assert.assertEquals("mappedMemoryUsed", expected.getMappedMemoryUsed(), actual.getMappedMemoryUsed()); + Assertions.assertEquals(expected.getAgentId(), actual.getAgentId(), "agentId"); + Assertions.assertEquals(expected.getStartTimestamp(), actual.getStartTimestamp(), "startTimestamp"); + Assertions.assertEquals(expected.getTimestamp(), actual.getTimestamp(), "timestamp"); + Assertions.assertEquals(expected.getAgentStatType(), actual.getAgentStatType(), "agentStatType"); + Assertions.assertEquals(expected.getDirectCount(), actual.getDirectCount(), "directCount"); + Assertions.assertEquals(expected.getDirectMemoryUsed(), actual.getDirectMemoryUsed(), "directMemoryUsed"); + Assertions.assertEquals(expected.getMappedCount(), actual.getMappedCount(), "mappedCount"); + Assertions.assertEquals(expected.getMappedMemoryUsed(), actual.getMappedMemoryUsed(), "mappedMemoryUsed"); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/FileDescriptorCodecV2Test.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/FileDescriptorCodecV2Test.java index 70a992aea2fa..d4805e9bda78 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/FileDescriptorCodecV2Test.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/FileDescriptorCodecV2Test.java @@ -20,18 +20,18 @@ import com.navercorp.pinpoint.common.server.bo.codec.stat.AgentStatCodecTestBase; import com.navercorp.pinpoint.common.server.bo.codec.stat.TestAgentStatFactory; import com.navercorp.pinpoint.common.server.bo.stat.FileDescriptorBo; -import org.junit.Assert; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.List; /** * @author Roy Kim */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration("classpath:applicationContext-test.xml") public class FileDescriptorCodecV2Test extends AgentStatCodecTestBase { @@ -50,10 +50,10 @@ protected AgentStatCodec getCodec() { @Override protected void verify(FileDescriptorBo expected, FileDescriptorBo actual) { - Assert.assertEquals("agentId", expected.getAgentId(), actual.getAgentId()); - Assert.assertEquals("startTimestamp", expected.getStartTimestamp(), actual.getStartTimestamp()); - Assert.assertEquals("timestamp", expected.getTimestamp(), actual.getTimestamp()); - Assert.assertEquals("agentStatType", expected.getAgentStatType(), actual.getAgentStatType()); - Assert.assertEquals("openFileDescriptor", expected.getOpenFileDescriptorCount(), actual.getOpenFileDescriptorCount()); + Assertions.assertEquals(expected.getAgentId(), actual.getAgentId(), "agentId"); + Assertions.assertEquals(expected.getStartTimestamp(), actual.getStartTimestamp(), "startTimestamp"); + Assertions.assertEquals(expected.getTimestamp(), actual.getTimestamp(), "timestamp"); + Assertions.assertEquals(expected.getAgentStatType(), actual.getAgentStatType(), "agentStatType"); + Assertions.assertEquals(expected.getOpenFileDescriptorCount(), actual.getOpenFileDescriptorCount(), "openFileDescriptor"); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/JvmGcCodecV2Test.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/JvmGcCodecV2Test.java index 5fc05ad10875..b72b34ed1916 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/JvmGcCodecV2Test.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/JvmGcCodecV2Test.java @@ -20,19 +20,19 @@ import com.navercorp.pinpoint.common.server.bo.codec.stat.AgentStatCodecTestBase; import com.navercorp.pinpoint.common.server.bo.codec.stat.TestAgentStatFactory; import com.navercorp.pinpoint.common.server.bo.stat.JvmGcBo; -import org.junit.Assert; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.List; /** * @author HyunGil Jeong */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration("classpath:applicationContext-test.xml") public class JvmGcCodecV2Test extends AgentStatCodecTestBase { @@ -52,15 +52,15 @@ protected AgentStatCodec getCodec() { @Override protected void verify(JvmGcBo expected, JvmGcBo actual) { - Assert.assertEquals("agentId", expected.getAgentId(), actual.getAgentId()); - Assert.assertEquals("startTimestamp", expected.getStartTimestamp(), actual.getStartTimestamp()); - Assert.assertEquals("timestamp", expected.getTimestamp(), actual.getTimestamp()); - Assert.assertEquals("gcType", expected.getGcType(), actual.getGcType()); - Assert.assertEquals("heapUsed", expected.getHeapUsed(), actual.getHeapUsed()); - Assert.assertEquals("heapMax", expected.getHeapMax(), actual.getHeapMax()); - Assert.assertEquals("nonHeapUsed", expected.getNonHeapUsed(), actual.getNonHeapUsed()); - Assert.assertEquals("nonHeapMax", expected.getNonHeapMax(), actual.getNonHeapMax()); - Assert.assertEquals("gcOldCount", expected.getGcOldCount(), actual.getGcOldCount()); - Assert.assertEquals("gcOldTime", expected.getGcOldTime(), actual.getGcOldTime()); + Assertions.assertEquals(expected.getAgentId(), actual.getAgentId(), "agentId"); + Assertions.assertEquals(expected.getStartTimestamp(), actual.getStartTimestamp(), "startTimestamp"); + Assertions.assertEquals(expected.getTimestamp(), actual.getTimestamp(), "timestamp"); + Assertions.assertEquals(expected.getGcType(), actual.getGcType(), "gcType"); + Assertions.assertEquals(expected.getHeapUsed(), actual.getHeapUsed(), "heapUsed"); + Assertions.assertEquals(expected.getHeapMax(), actual.getHeapMax(), "heapMax"); + Assertions.assertEquals(expected.getNonHeapUsed(), actual.getNonHeapUsed(), "nonHeapUsed"); + Assertions.assertEquals(expected.getNonHeapMax(), actual.getNonHeapMax(), "nonHeapMax"); + Assertions.assertEquals(expected.getGcOldCount(), actual.getGcOldCount(), "gcOldCount"); + Assertions.assertEquals(expected.getGcOldTime(), actual.getGcOldTime(), "gcOldTime"); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/JvmGcDetailedCodecV2Test.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/JvmGcDetailedCodecV2Test.java index deff51903081..ba785fdffc13 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/JvmGcDetailedCodecV2Test.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/JvmGcDetailedCodecV2Test.java @@ -21,18 +21,18 @@ import com.navercorp.pinpoint.common.server.bo.codec.stat.TestAgentStatFactory; import com.navercorp.pinpoint.common.server.bo.serializer.stat.AgentStatUtils; import com.navercorp.pinpoint.common.server.bo.stat.JvmGcDetailedBo; -import org.junit.Assert; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.List; /** * @author HyunGil Jeong */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration("classpath:applicationContext-test.xml") public class JvmGcDetailedCodecV2Test extends AgentStatCodecTestBase { @@ -53,18 +53,18 @@ protected AgentStatCodec getCodec() { @Override protected void verify(JvmGcDetailedBo expected, JvmGcDetailedBo actual) { - Assert.assertEquals("agentId", expected.getAgentId(), actual.getAgentId()); - Assert.assertEquals("startTimestamp", expected.getStartTimestamp(), actual.getStartTimestamp()); - Assert.assertEquals("timestamp", expected.getTimestamp(), actual.getTimestamp()); - Assert.assertEquals("agentStatType", expected.getAgentStatType(), actual.getAgentStatType()); - Assert.assertEquals("gcNewCount", expected.getGcNewCount(), actual.getGcNewCount()); - Assert.assertEquals("gcNewTime", expected.getGcNewTime(), actual.getGcNewTime()); - Assert.assertEquals("codeCacheUsed", expected.getCodeCacheUsed(), actual.getCodeCacheUsed(), DOUBLE_COMPARISON_DELTA); - Assert.assertEquals("codeCacheUsed", expected.getCodeCacheUsed(), actual.getCodeCacheUsed(), DOUBLE_COMPARISON_DELTA); - Assert.assertEquals("newGenUsed", expected.getNewGenUsed(), actual.getNewGenUsed(), DOUBLE_COMPARISON_DELTA); - Assert.assertEquals("oldGenUsed", expected.getOldGenUsed(), actual.getOldGenUsed(), DOUBLE_COMPARISON_DELTA); - Assert.assertEquals("survivorSpaceUsed", expected.getSurvivorSpaceUsed(), actual.getSurvivorSpaceUsed(), DOUBLE_COMPARISON_DELTA); - Assert.assertEquals("permGenUsed", expected.getPermGenUsed(), actual.getPermGenUsed(), DOUBLE_COMPARISON_DELTA); - Assert.assertEquals("metaspaceUsed", expected.getMetaspaceUsed(), actual.getMetaspaceUsed(), DOUBLE_COMPARISON_DELTA); + Assertions.assertEquals(expected.getAgentId(), actual.getAgentId(), "agentId"); + Assertions.assertEquals(expected.getStartTimestamp(), actual.getStartTimestamp(), "startTimestamp"); + Assertions.assertEquals(expected.getTimestamp(), actual.getTimestamp(), "timestamp"); + Assertions.assertEquals(expected.getAgentStatType(), actual.getAgentStatType(), "agentStatType"); + Assertions.assertEquals(expected.getGcNewCount(), actual.getGcNewCount(), "gcNewCount"); + Assertions.assertEquals(expected.getGcNewTime(), actual.getGcNewTime(), "gcNewTime"); + Assertions.assertEquals(expected.getCodeCacheUsed(), actual.getCodeCacheUsed(), DOUBLE_COMPARISON_DELTA, "codeCacheUsed"); + Assertions.assertEquals(expected.getCodeCacheUsed(), actual.getCodeCacheUsed(), DOUBLE_COMPARISON_DELTA, "codeCacheUsed"); + Assertions.assertEquals(expected.getNewGenUsed(), actual.getNewGenUsed(), DOUBLE_COMPARISON_DELTA, "newGenUsed"); + Assertions.assertEquals(expected.getOldGenUsed(), actual.getOldGenUsed(), DOUBLE_COMPARISON_DELTA, "oldGenUsed"); + Assertions.assertEquals(expected.getSurvivorSpaceUsed(), actual.getSurvivorSpaceUsed(), DOUBLE_COMPARISON_DELTA, "survivorSpaceUsed"); + Assertions.assertEquals(expected.getPermGenUsed(), actual.getPermGenUsed(), DOUBLE_COMPARISON_DELTA, "permGenUsed"); + Assertions.assertEquals(expected.getMetaspaceUsed(), actual.getMetaspaceUsed(), DOUBLE_COMPARISON_DELTA, "metaspaceUsed"); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/LoadedClassCodecV2Test.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/LoadedClassCodecV2Test.java index 9d10fae2def0..830a44f2b8e8 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/LoadedClassCodecV2Test.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/LoadedClassCodecV2Test.java @@ -20,15 +20,15 @@ import com.navercorp.pinpoint.common.server.bo.codec.stat.AgentStatCodecTestBase; import com.navercorp.pinpoint.common.server.bo.codec.stat.TestAgentStatFactory; import com.navercorp.pinpoint.common.server.bo.stat.LoadedClassBo; -import org.junit.Assert; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.List; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration("classpath:applicationContext-test.xml") public class LoadedClassCodecV2Test extends AgentStatCodecTestBase { @@ -47,10 +47,10 @@ protected AgentStatCodec getCodec() { @Override protected void verify(LoadedClassBo expected, LoadedClassBo actual) { - Assert.assertEquals("agentId", expected.getAgentId(), actual.getAgentId()); - Assert.assertEquals("startTimestamp", expected.getStartTimestamp(), actual.getStartTimestamp()); - Assert.assertEquals("timestamp", expected.getTimestamp(), actual.getTimestamp()); - Assert.assertEquals("loadedClassCount", expected.getLoadedClassCount(), actual.getLoadedClassCount()); - Assert.assertEquals("unloadedClassCount", expected.getUnloadedClassCount(), actual.getUnloadedClassCount()); + Assertions.assertEquals(expected.getAgentId(), actual.getAgentId(), "agentId"); + Assertions.assertEquals(expected.getStartTimestamp(), actual.getStartTimestamp(), "startTimestamp"); + Assertions.assertEquals(expected.getTimestamp(), actual.getTimestamp(), "timestamp"); + Assertions.assertEquals(expected.getLoadedClassCount(), actual.getLoadedClassCount(), "loadedClassCount"); + Assertions.assertEquals(expected.getUnloadedClassCount(), actual.getUnloadedClassCount(), "unloadedClassCount"); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/ResponseTimeCodecV2Test.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/ResponseTimeCodecV2Test.java index bb669ceadb30..c0a660edd8f8 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/ResponseTimeCodecV2Test.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/ResponseTimeCodecV2Test.java @@ -20,18 +20,18 @@ import com.navercorp.pinpoint.common.server.bo.codec.stat.AgentStatCodecTestBase; import com.navercorp.pinpoint.common.server.bo.codec.stat.TestAgentStatFactory; import com.navercorp.pinpoint.common.server.bo.stat.ResponseTimeBo; -import org.junit.Assert; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.List; /** * @author Taejin Koo */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration("classpath:applicationContext-test.xml") public class ResponseTimeCodecV2Test extends AgentStatCodecTestBase { @@ -50,10 +50,10 @@ protected AgentStatCodec getCodec() { @Override protected void verify(ResponseTimeBo expected, ResponseTimeBo actual) { - Assert.assertEquals("agentId", expected.getAgentId(), actual.getAgentId()); - Assert.assertEquals("startTimestamp", expected.getStartTimestamp(), actual.getStartTimestamp()); - Assert.assertEquals("timestamp", expected.getTimestamp(), actual.getTimestamp()); - Assert.assertEquals("avg", expected.getAvg(), actual.getAvg()); + Assertions.assertEquals(expected.getAgentId(), actual.getAgentId(), "agentId"); + Assertions.assertEquals(expected.getStartTimestamp(), actual.getStartTimestamp(), "startTimestamp"); + Assertions.assertEquals(expected.getTimestamp(), actual.getTimestamp(), "timestamp"); + Assertions.assertEquals(expected.getAvg(), actual.getAvg(), "avg"); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/TotalThreadCountCodecV2Test.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/TotalThreadCountCodecV2Test.java index 4fded78917a5..cdd9e010bf99 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/TotalThreadCountCodecV2Test.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/TotalThreadCountCodecV2Test.java @@ -20,15 +20,15 @@ import com.navercorp.pinpoint.common.server.bo.codec.stat.AgentStatCodecTestBase; import com.navercorp.pinpoint.common.server.bo.codec.stat.TestAgentStatFactory; import com.navercorp.pinpoint.common.server.bo.stat.TotalThreadCountBo; -import org.junit.Assert; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.List; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration("classpath:applicationContext-test.xml") public class TotalThreadCountCodecV2Test extends AgentStatCodecTestBase { @@ -47,9 +47,9 @@ protected AgentStatCodec getCodec() { @Override protected void verify(TotalThreadCountBo expected, TotalThreadCountBo actual) { - Assert.assertEquals("agentId", expected.getAgentId(), actual.getAgentId()); - Assert.assertEquals("startTimestamp", expected.getStartTimestamp(), actual.getStartTimestamp()); - Assert.assertEquals("timestamp", expected.getTimestamp(), actual.getTimestamp()); - Assert.assertEquals("totalThreadCount", expected.getTotalThreadCount(), actual.getTotalThreadCount()); + Assertions.assertEquals(expected.getAgentId(), actual.getAgentId(), "agentId"); + Assertions.assertEquals(expected.getStartTimestamp(), actual.getStartTimestamp(), "startTimestamp"); + Assertions.assertEquals(expected.getTimestamp(), actual.getTimestamp(), "timestamp"); + Assertions.assertEquals(expected.getTotalThreadCount(), actual.getTotalThreadCount(), "totalThreadCount"); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/TransactionCodecV2Test.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/TransactionCodecV2Test.java index 36d8ee5cab93..38b794fd2ff4 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/TransactionCodecV2Test.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/stat/v2/TransactionCodecV2Test.java @@ -20,18 +20,18 @@ import com.navercorp.pinpoint.common.server.bo.codec.stat.AgentStatCodecTestBase; import com.navercorp.pinpoint.common.server.bo.codec.stat.TestAgentStatFactory; import com.navercorp.pinpoint.common.server.bo.stat.TransactionBo; -import org.junit.Assert; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.List; /** * @author HyunGil Jeong */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration("classpath:applicationContext-test.xml") public class TransactionCodecV2Test extends AgentStatCodecTestBase { @@ -50,13 +50,13 @@ protected AgentStatCodec getCodec() { @Override protected void verify(TransactionBo expected, TransactionBo actual) { - Assert.assertEquals("agentId", expected.getAgentId(), actual.getAgentId()); - Assert.assertEquals("startTimestamp", expected.getStartTimestamp(), actual.getStartTimestamp()); - Assert.assertEquals("timestamp", expected.getTimestamp(), actual.getTimestamp()); - Assert.assertEquals("collectInterval", expected.getCollectInterval(), actual.getCollectInterval()); - Assert.assertEquals("sampledNewCount", expected.getSampledNewCount(), actual.getSampledNewCount()); - Assert.assertEquals("sampledContinuationCount", expected.getSampledContinuationCount(), actual.getSampledContinuationCount()); - Assert.assertEquals("unsampledNewCount", expected.getUnsampledNewCount(), actual.getUnsampledNewCount()); - Assert.assertEquals("unsampledContinuationCount", expected.getUnsampledContinuationCount(), actual.getUnsampledContinuationCount()); + Assertions.assertEquals(expected.getAgentId(), actual.getAgentId(), "agentId"); + Assertions.assertEquals(expected.getStartTimestamp(), actual.getStartTimestamp(), "startTimestamp"); + Assertions.assertEquals(expected.getTimestamp(), actual.getTimestamp(), "timestamp"); + Assertions.assertEquals(expected.getCollectInterval(), actual.getCollectInterval(), "collectInterval"); + Assertions.assertEquals(expected.getSampledNewCount(), actual.getSampledNewCount(), "sampledNewCount"); + Assertions.assertEquals(expected.getSampledContinuationCount(), actual.getSampledContinuationCount(), "sampledContinuationCount"); + Assertions.assertEquals(expected.getUnsampledNewCount(), actual.getUnsampledNewCount(), "unsampledNewCount"); + Assertions.assertEquals(expected.getUnsampledContinuationCount(), actual.getUnsampledContinuationCount(), "unsampledContinuationCount"); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/EncodingStrategyTestBase.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/EncodingStrategyTestBase.java index 1bcf78bad1bf..76a44dc5dc60 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/EncodingStrategyTestBase.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/EncodingStrategyTestBase.java @@ -19,7 +19,7 @@ import com.navercorp.pinpoint.common.buffer.AutomaticBuffer; import com.navercorp.pinpoint.common.buffer.Buffer; import com.navercorp.pinpoint.common.buffer.FixedBuffer; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import java.util.ArrayList; import java.util.List; @@ -39,7 +39,7 @@ public void testStrategy(List expectedValues, EncodingStrategy strateg strategy.encodeValues(encodeBuffer, expectedValues); Buffer decodeBuffer = new FixedBuffer(encodeBuffer.getBuffer()); List actualValues = strategy.decodeValues(decodeBuffer, expectedValues.size()); - Assert.assertEquals(expectedValues, actualValues); + Assertions.assertEquals(expectedValues, actualValues); } public List createRandomShorts(int numTestValues, boolean unsigned) { diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/impl/DeltaEncodingStrategyTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/impl/DeltaEncodingStrategyTest.java index 0fe2a58eb865..d3041a66f98c 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/impl/DeltaEncodingStrategyTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/impl/DeltaEncodingStrategyTest.java @@ -19,7 +19,7 @@ import com.navercorp.pinpoint.common.server.bo.codec.ArithmeticOperation; import com.navercorp.pinpoint.common.server.bo.codec.TypedBufferHandler; import com.navercorp.pinpoint.common.server.bo.codec.strategy.EncodingStrategyTestBase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.List; diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/impl/DeltaOfDeltaEncodingStrategyTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/impl/DeltaOfDeltaEncodingStrategyTest.java index 210e97474dec..fc53c82e8898 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/impl/DeltaOfDeltaEncodingStrategyTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/impl/DeltaOfDeltaEncodingStrategyTest.java @@ -19,7 +19,7 @@ import com.navercorp.pinpoint.common.server.bo.codec.ArithmeticOperation; import com.navercorp.pinpoint.common.server.bo.codec.TypedBufferHandler; import com.navercorp.pinpoint.common.server.bo.codec.strategy.EncodingStrategyTestBase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.List; diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/impl/RepeatCountEncodingStrategyTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/impl/RepeatCountEncodingStrategyTest.java index 517360842c3a..04d4201d51c0 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/impl/RepeatCountEncodingStrategyTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/impl/RepeatCountEncodingStrategyTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.codec.TypedBufferHandler; import com.navercorp.pinpoint.common.server.bo.codec.strategy.EncodingStrategyTestBase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.List; diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/impl/ValueEncodingStrategyTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/impl/ValueEncodingStrategyTest.java index 8b3d72969397..29c22b48bca4 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/impl/ValueEncodingStrategyTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/codec/strategy/impl/ValueEncodingStrategyTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.common.server.bo.codec.TypedBufferHandler; import com.navercorp.pinpoint.common.server.bo.codec.strategy.EncodingStrategyTestBase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.List; diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/filter/SequenceSpanEventFilterTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/filter/SequenceSpanEventFilterTest.java index d58b3cdb48e9..1f3bc1d57ce0 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/filter/SequenceSpanEventFilterTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/filter/SequenceSpanEventFilterTest.java @@ -17,8 +17,8 @@ package com.navercorp.pinpoint.common.server.bo.filter; import com.navercorp.pinpoint.common.server.bo.SpanEventBo; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -30,9 +30,9 @@ public void testFilter_accept() { SpanEventFilter filter = new SequenceSpanEventFilter(100); final SpanEventBo spanEventBo = new SpanEventBo(); - spanEventBo.setSequence((short)11); + spanEventBo.setSequence((short) 11); - Assert.assertEquals(filter.filter(spanEventBo), SpanEventFilter.ACCEPT); + Assertions.assertEquals(filter.filter(spanEventBo), SpanEventFilter.ACCEPT); } @@ -42,9 +42,9 @@ public void testFilter_reject() { SpanEventFilter filter = new SequenceSpanEventFilter(10); final SpanEventBo spanEventBo = new SpanEventBo(); - spanEventBo.setSequence((short)11); + spanEventBo.setSequence((short) 11); - Assert.assertEquals(filter.filter(spanEventBo), SpanEventFilter.REJECT); + Assertions.assertEquals(filter.filter(spanEventBo), SpanEventFilter.REJECT); } @@ -54,7 +54,7 @@ public void testFilter_max() { try { new SequenceSpanEventFilter(Short.MAX_VALUE + 1); - Assert.fail(); + Assertions.fail(); } catch (Exception e) { } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/grpc/CollectorGrpcSpanFactoryTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/grpc/CollectorGrpcSpanFactoryTest.java index b69767aaddc8..1350d83d5b11 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/grpc/CollectorGrpcSpanFactoryTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/grpc/CollectorGrpcSpanFactoryTest.java @@ -27,8 +27,8 @@ import com.navercorp.pinpoint.grpc.trace.PSpanEvent; import com.navercorp.pinpoint.grpc.trace.PTransactionId; import com.navercorp.pinpoint.io.SpanVersion; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; @@ -38,7 +38,7 @@ */ public class CollectorGrpcSpanFactoryTest { private static final int MAX_SEQUENCE = 10; - + private final GrpcSpanBinder binder = new GrpcSpanBinder(); private final SpanEventFilter filter = new SequenceSpanEventFilter(MAX_SEQUENCE); private final AcceptedTimeService acceptedTimeService = new EmptyAcceptedTimeService(System.currentTimeMillis()); @@ -52,7 +52,7 @@ public void buildSpanChunkBo_sequence_overflow_NPE() { SpanChunkBo spanChunkBo = factory.buildSpanChunkBo(chunk, header); List spanEventBoList = spanChunkBo.getSpanEventBoList(); - Assert.assertTrue(spanEventBoList.isEmpty()); + Assertions.assertTrue(spanEventBoList.isEmpty()); } @Test @@ -66,8 +66,8 @@ public void buildSpanChunkBo_compact_depth() { SpanEventBo spanEventBo0 = spanEventBoList.get(0); SpanEventBo spanEventBo1 = spanEventBoList.get(1); - Assert.assertEquals(1, spanEventBo0.getDepth()); - Assert.assertEquals(1, spanEventBo1.getDepth()); + Assertions.assertEquals(1, spanEventBo0.getDepth()); + Assertions.assertEquals(1, spanEventBo1.getDepth()); } @Test @@ -79,7 +79,7 @@ public void buildSpanChunkBo_compact_depth_NPE() { List spanEventBoList = spanChunkBo.getSpanEventBoList(); SpanEventBo spanEventBo0 = spanEventBoList.get(0); - Assert.assertEquals(1, spanEventBo0.getDepth()); + Assertions.assertEquals(1, spanEventBo0.getDepth()); } @Test @@ -92,8 +92,8 @@ public void buildSpanChunkBo_first_depth_zero() { List spanEventBoList = spanChunkBo.getSpanEventBoList(); SpanEventBo spanEventBo0 = spanEventBoList.get(0); SpanEventBo spanEventBo1 = spanEventBoList.get(1); - Assert.assertEquals(0, spanEventBo0.getDepth()); - Assert.assertEquals(1, spanEventBo1.getDepth()); + Assertions.assertEquals(0, spanEventBo0.getDepth()); + Assertions.assertEquals(1, spanEventBo1.getDepth()); } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/grpc/GrpcAnnotationHandlerTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/grpc/GrpcAnnotationHandlerTest.java index b47f977d7865..15149c98dbc2 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/grpc/GrpcAnnotationHandlerTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/grpc/GrpcAnnotationHandlerTest.java @@ -18,9 +18,8 @@ import com.navercorp.pinpoint.common.server.bo.AnnotationFactory; import com.navercorp.pinpoint.grpc.trace.PAnnotation; -import org.junit.Assert; -import org.junit.Test; - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -36,7 +35,7 @@ public void getValue() { Object value = handler.getValue(pAnnotation); - Assert.assertEquals("testStringField", value); + Assertions.assertEquals("testStringField", value); } } \ No newline at end of file diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/agent/ApplicationNameRowKeyEncoderTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/agent/ApplicationNameRowKeyEncoderTest.java index 7000c83a66f4..efe7ad8e47c3 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/agent/ApplicationNameRowKeyEncoderTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/agent/ApplicationNameRowKeyEncoderTest.java @@ -3,13 +3,12 @@ import com.navercorp.pinpoint.common.PinpointConstants; import com.navercorp.pinpoint.common.util.BytesUtils; import com.navercorp.pinpoint.common.util.TimeUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; import java.util.Arrays; - public class ApplicationNameRowKeyEncoderTest { @Test @@ -53,7 +52,7 @@ public void testGetTraceIndexRowKey3() { long time = System.currentTimeMillis(); try { check(applicationName, time); - Assert.fail("error"); + Assertions.fail("error"); } catch (IndexOutOfBoundsException ignored) { } } @@ -63,11 +62,11 @@ private void check(String applicationName, long l1) { byte[] traceIndexRowKey = encoder.encodeRowKey(applicationName, l1); String agentId = BytesUtils.toString(traceIndexRowKey, 0, PinpointConstants.APPLICATION_NAME_MAX_LEN).trim(); - Assert.assertEquals(applicationName, agentId); + Assertions.assertEquals(applicationName, agentId); long time = toByteArray(Arrays.copyOfRange(traceIndexRowKey, PinpointConstants.APPLICATION_NAME_MAX_LEN, PinpointConstants.APPLICATION_NAME_MAX_LEN + 8)); time = TimeUtils.recoveryTimeMillis(time); - Assert.assertEquals(time, l1); + Assertions.assertEquals(time, l1); } private long toByteArray(byte[] bytes) { diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/metadata/MetadataEncoderTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/metadata/MetadataEncoderTest.java index 5995c53d8ca5..bd1c93c281a4 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/metadata/MetadataEncoderTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/metadata/MetadataEncoderTest.java @@ -1,8 +1,7 @@ package com.navercorp.pinpoint.common.server.bo.serializer.metadata; -import org.junit.Assert; -import org.junit.Test; - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class MetadataEncoderTest { private final MetadataDecoder decoder = new MetadataDecoder(); @@ -15,8 +14,8 @@ public void encodeRowKey() { byte[] rowKey = encoder.encodeRowKey(metaData); MetaDataRowKey decodeRowKey = decoder.decodeRowKey(rowKey); - Assert.assertEquals("agent", decodeRowKey.getAgentId()); - Assert.assertEquals(startTime, decodeRowKey.getAgentStartTime()); - Assert.assertEquals(1, decodeRowKey.getId()); + Assertions.assertEquals("agent", decodeRowKey.getAgentId()); + Assertions.assertEquals(startTime, decodeRowKey.getAgentStartTime()); + Assertions.assertEquals(1, decodeRowKey.getId()); } } \ No newline at end of file diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/stat/AgentStatHbaseOperationFactoryTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/stat/AgentStatHbaseOperationFactoryTest.java index 8282259ef7c2..abe74a962c2e 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/stat/AgentStatHbaseOperationFactoryTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/stat/AgentStatHbaseOperationFactoryTest.java @@ -19,16 +19,15 @@ import com.navercorp.pinpoint.common.server.bo.serializer.HbaseSerializer; import com.navercorp.pinpoint.common.server.bo.stat.AgentStatDataPoint; import com.navercorp.pinpoint.common.server.bo.stat.AgentStatType; - import org.apache.hadoop.hbase.client.Put; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.ArrayList; import java.util.Collections; @@ -37,12 +36,12 @@ import java.util.TreeSet; import static com.navercorp.pinpoint.common.hbase.HbaseColumnFamily.AGENT_STAT_STATISTICS; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author HyunGil Jeong */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration("classpath:applicationContext-test.xml") public class AgentStatHbaseOperationFactoryTest { @@ -56,7 +55,7 @@ public class AgentStatHbaseOperationFactoryTest { @Autowired private AgentStatHbaseOperationFactory agentStatHbaseOperationFactory; - @Before + @BeforeEach public void setUp() { MockitoAnnotations.initMocks(this); } @@ -218,6 +217,7 @@ public void setStartTimestamp(long startTimestamp) { public long getTimestamp() { return this.timestamp; } + @Override public void setTimestamp(long timestamp) { this.timestamp = timestamp; diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/stat/AgentStatUtilsTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/stat/AgentStatUtilsTest.java index a521a31803cd..54dd68a80b37 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/stat/AgentStatUtilsTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/stat/AgentStatUtilsTest.java @@ -17,9 +17,8 @@ package com.navercorp.pinpoint.common.server.bo.serializer.stat; import com.navercorp.pinpoint.common.hbase.HbaseColumnFamily; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Random; @@ -36,15 +35,15 @@ public class AgentStatUtilsTest { public void testConversion() { double originalValue = Math.random(); double convertedValue = AgentStatUtils.convertLongToDouble(AgentStatUtils.convertDoubleToLong(originalValue)); - Assert.assertEquals(originalValue, convertedValue, DECIMAL_COMPARISON_DELTA); + Assertions.assertEquals(originalValue, convertedValue, DECIMAL_COMPARISON_DELTA); originalValue = 0; convertedValue = AgentStatUtils.convertLongToDouble(AgentStatUtils.convertDoubleToLong(originalValue)); - Assert.assertEquals(originalValue, convertedValue, DECIMAL_COMPARISON_DELTA); + Assertions.assertEquals(originalValue, convertedValue, DECIMAL_COMPARISON_DELTA); originalValue = -1 * Math.random(); convertedValue = AgentStatUtils.convertLongToDouble(AgentStatUtils.convertDoubleToLong(originalValue)); - Assert.assertEquals(originalValue, convertedValue, DECIMAL_COMPARISON_DELTA); + Assertions.assertEquals(originalValue, convertedValue, DECIMAL_COMPARISON_DELTA); } @Test @@ -56,11 +55,11 @@ public void calculateRate_should_return_defaultRate_if_time_is_not_greater_than_ long timeMs = 0; double rate = AgentStatUtils.calculateRate(count, timeMs, numDecimals, defaultRate); - Assert.assertEquals(defaultRate, rate, validDelta); + Assertions.assertEquals(defaultRate, rate, validDelta); timeMs = -1; rate = AgentStatUtils.calculateRate(count, timeMs, numDecimals, defaultRate); - Assert.assertEquals(defaultRate, rate, validDelta); + Assertions.assertEquals(defaultRate, rate, validDelta); } @Test @@ -72,13 +71,13 @@ public void calculateRate_should_return_correct_rate_to_numDecimal_places() { double expectedRate = 1000; double rate = AgentStatUtils.calculateRate(count, timeMs, numDecimals, defaultRate); - Assert.assertEquals(Double.doubleToLongBits(expectedRate), Double.doubleToLongBits(rate)); + Assertions.assertEquals(Double.doubleToLongBits(expectedRate), Double.doubleToLongBits(rate)); } @Test public void getBaseTimestamp_should_return_a_multiple_of_AGENT_STAT_TIMESPAN_MS() { long timestamp = RANDOM.nextLong(); long baseTimestamp = AgentStatUtils.getBaseTimestamp(timestamp); - Assert.assertEquals(0, (baseTimestamp % HbaseColumnFamily.AGENT_STAT_STATISTICS.TIMESPAN_MS)); + Assertions.assertEquals(0, (baseTimestamp % HbaseColumnFamily.AGENT_STAT_STATISTICS.TIMESPAN_MS)); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/SpanEncoderTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/SpanEncoderTest.java index 4acf8f0f472e..6758b25d1566 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/SpanEncoderTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/SpanEncoderTest.java @@ -12,10 +12,10 @@ import com.navercorp.pinpoint.thrift.dto.TSpanEvent; import org.apache.commons.lang3.RandomUtils; import org.apache.commons.lang3.builder.EqualsBuilder; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -174,14 +174,14 @@ private void assertSpan(SpanBo spanBo) { List notSerializedField = newArrayList("parentApplicationId", "parentApplicationServiceType"); List excludeField = newArrayList("annotationBoList", "spanEventBoList"); notSerializedField.addAll(excludeField); - Assert.assertTrue(EqualsBuilder.reflectionEquals(decode, spanBo, notSerializedField)); + Assertions.assertTrue(EqualsBuilder.reflectionEquals(decode, spanBo, notSerializedField)); logger.debug("{} {}", spanBo.getAnnotationBoList(), decode.getAnnotationBoList()); - Assert.assertTrue("annotation", EqualsBuilder.reflectionEquals(spanBo.getAnnotationBoList(), decode.getAnnotationBoList())); + Assertions.assertTrue(EqualsBuilder.reflectionEquals(spanBo.getAnnotationBoList(), decode.getAnnotationBoList()), "annotation"); List spanEventBoList = spanBo.getSpanEventBoList(); List decodedSpanEventBoList = decode.getSpanEventBoList(); - Assert.assertTrue(EqualsBuilder.reflectionEquals(spanEventBoList, decodedSpanEventBoList)); + Assertions.assertTrue(EqualsBuilder.reflectionEquals(spanEventBoList, decodedSpanEventBoList)); } private void assertSpanChunk(SpanChunkBo spanChunkBo) { @@ -202,12 +202,12 @@ private void assertSpanChunk(SpanChunkBo spanChunkBo) { List notSerializedField = newArrayList("endPoint", "serviceType", "applicationServiceType"); List excludeField = newArrayList("spanEventBoList", "localAsyncId"); notSerializedField.addAll(excludeField); - Assert.assertTrue(EqualsBuilder.reflectionEquals(decode, spanChunkBo, notSerializedField)); + Assertions.assertTrue(EqualsBuilder.reflectionEquals(decode, spanChunkBo, notSerializedField)); List spanEventBoList = spanChunkBo.getSpanEventBoList(); List decodedSpanEventBoList = decode.getSpanEventBoList(); - Assert.assertTrue(EqualsBuilder.reflectionEquals(spanEventBoList, decodedSpanEventBoList)); + Assertions.assertTrue(EqualsBuilder.reflectionEquals(spanEventBoList, decodedSpanEventBoList)); } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/TraceRowKeyEncoderV2Test.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/TraceRowKeyEncoderV2Test.java index f11efd49ca16..77e74590115c 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/TraceRowKeyEncoderV2Test.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/TraceRowKeyEncoderV2Test.java @@ -17,13 +17,13 @@ package com.navercorp.pinpoint.common.server.bo.serializer.trace.v2; import com.navercorp.pinpoint.common.hbase.distributor.RangeOneByteSimpleHash; +import com.navercorp.pinpoint.common.profiler.util.TransactionId; import com.navercorp.pinpoint.common.server.bo.serializer.RowKeyDecoder; import com.navercorp.pinpoint.common.server.bo.serializer.RowKeyEncoder; -import com.navercorp.pinpoint.common.profiler.util.TransactionId; import com.sematext.hbase.wd.RowKeyDistributorByHashPrefix; import org.apache.commons.lang3.RandomUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -55,7 +55,7 @@ public void encodeRowKey() { byte[] rowKey = traceRowKeyEncoder.encodeRowKey(spanTransactionId); TransactionId transactionId = traceRowKeyDecoder.decodeRowKey(rowKey); - Assert.assertEquals(transactionId, spanTransactionId); + Assertions.assertEquals(transactionId, spanTransactionId); } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/bitfield/SpanBitFiledTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/bitfield/SpanBitFiledTest.java index 0820c7a2b667..af10c4aec638 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/bitfield/SpanBitFiledTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/bitfield/SpanBitFiledTest.java @@ -2,10 +2,10 @@ import com.navercorp.pinpoint.common.server.bo.SpanBo; import com.navercorp.pinpoint.common.trace.LoggingInfo; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -19,10 +19,10 @@ public void testRoot_1() throws Exception { spanBo.setParentSpanId(-1); SpanBitFiled spanBitFiled = SpanBitFiled.build(spanBo); - Assert.assertTrue(spanBitFiled.isRoot()); + Assertions.assertTrue(spanBitFiled.isRoot()); spanBitFiled.setRoot(false); - Assert.assertFalse(spanBitFiled.isRoot()); + Assertions.assertFalse(spanBitFiled.isRoot()); } @@ -32,11 +32,11 @@ public void testRoot_2() throws Exception { spanBo.setParentSpanId(0); SpanBitFiled spanBitFiled = SpanBitFiled.build(spanBo); - Assert.assertFalse(spanBitFiled.isRoot()); + Assertions.assertFalse(spanBitFiled.isRoot()); spanBitFiled.maskAll(); spanBitFiled.setRoot(false); - Assert.assertFalse(spanBitFiled.isRoot()); + Assertions.assertFalse(spanBitFiled.isRoot()); } @Test @@ -45,10 +45,10 @@ public void testErrorCode_1() { spanBo.setErrCode(1); SpanBitFiled spanBitFiled = SpanBitFiled.build(spanBo); - Assert.assertTrue(spanBitFiled.isSetErrorCode()); + Assertions.assertTrue(spanBitFiled.isSetErrorCode()); spanBitFiled.setErrorCode(false); - Assert.assertFalse(spanBitFiled.isSetErrorCode()); + Assertions.assertFalse(spanBitFiled.isSetErrorCode()); } @Test @@ -57,11 +57,11 @@ public void testErrorCode_2() { spanBo.setErrCode(0); SpanBitFiled spanBitFiled = SpanBitFiled.build(spanBo); - Assert.assertFalse(spanBitFiled.isSetErrorCode()); + Assertions.assertFalse(spanBitFiled.isSetErrorCode()); spanBitFiled.maskAll(); spanBitFiled.setErrorCode(false); - Assert.assertFalse(spanBitFiled.isSetErrorCode()); + Assertions.assertFalse(spanBitFiled.isSetErrorCode()); } @Test @@ -72,7 +72,7 @@ public void testApplicationServiceTypeEncodingStrategy_PREV_TYPE_EQUALS() { SpanBitFiled spanBitFiled = SpanBitFiled.build(spanBo); - Assert.assertEquals(spanBitFiled.getApplicationServiceTypeEncodingStrategy(), ServiceTypeEncodingStrategy.PREV_EQUALS); + Assertions.assertEquals(spanBitFiled.getApplicationServiceTypeEncodingStrategy(), ServiceTypeEncodingStrategy.PREV_EQUALS); } @Test @@ -83,12 +83,12 @@ public void testApplicationServiceTypeEncodingStrategy_RAW() { SpanBitFiled spanBitFiled = SpanBitFiled.build(spanBo); - Assert.assertEquals(spanBitFiled.getApplicationServiceTypeEncodingStrategy(), ServiceTypeEncodingStrategy.RAW); + Assertions.assertEquals(spanBitFiled.getApplicationServiceTypeEncodingStrategy(), ServiceTypeEncodingStrategy.RAW); spanBitFiled.maskAll(); - Assert.assertEquals(spanBitFiled.getApplicationServiceTypeEncodingStrategy(), ServiceTypeEncodingStrategy.RAW); + Assertions.assertEquals(spanBitFiled.getApplicationServiceTypeEncodingStrategy(), ServiceTypeEncodingStrategy.RAW); spanBitFiled.setApplicationServiceTypeEncodingStrategy(ServiceTypeEncodingStrategy.PREV_EQUALS); - Assert.assertEquals(spanBitFiled.getApplicationServiceTypeEncodingStrategy(), ServiceTypeEncodingStrategy.PREV_EQUALS); + Assertions.assertEquals(spanBitFiled.getApplicationServiceTypeEncodingStrategy(), ServiceTypeEncodingStrategy.PREV_EQUALS); } @@ -99,10 +99,10 @@ public void testHasException_1() { SpanBitFiled spanBitFiled = SpanBitFiled.build(spanBo); - Assert.assertTrue(spanBitFiled.isSetHasException()); + Assertions.assertTrue(spanBitFiled.isSetHasException()); spanBitFiled.setHasException(false); - Assert.assertFalse(spanBitFiled.isSetHasException()); + Assertions.assertFalse(spanBitFiled.isSetHasException()); } @Test @@ -111,15 +111,14 @@ public void testHasException_2() { SpanBitFiled spanBitFiled = SpanBitFiled.build(spanBo); - Assert.assertFalse(spanBitFiled.isSetHasException()); + Assertions.assertFalse(spanBitFiled.isSetHasException()); spanBitFiled.maskAll(); spanBitFiled.setHasException(false); - Assert.assertFalse(spanBitFiled.isSetHasException()); + Assertions.assertFalse(spanBitFiled.isSetHasException()); } - @Test public void testLoggingTransactionInfo_1() { SpanBo spanBo = new SpanBo(); @@ -127,10 +126,10 @@ public void testLoggingTransactionInfo_1() { SpanBitFiled spanBitFiled = SpanBitFiled.build(spanBo); - Assert.assertTrue(spanBitFiled.isSetLoggingTransactionInfo()); + Assertions.assertTrue(spanBitFiled.isSetLoggingTransactionInfo()); spanBitFiled.setLoggingTransactionInfo(false); - Assert.assertFalse(spanBitFiled.isSetLoggingTransactionInfo()); + Assertions.assertFalse(spanBitFiled.isSetLoggingTransactionInfo()); } @Test @@ -139,11 +138,11 @@ public void testLoggingTransactionInfo_2() { SpanBitFiled spanBitFiled = SpanBitFiled.build(spanBo); - Assert.assertFalse(spanBitFiled.isSetLoggingTransactionInfo()); + Assertions.assertFalse(spanBitFiled.isSetLoggingTransactionInfo()); spanBitFiled.maskAll(); spanBitFiled.setLoggingTransactionInfo(false); - Assert.assertFalse(spanBitFiled.isSetLoggingTransactionInfo()); + Assertions.assertFalse(spanBitFiled.isSetLoggingTransactionInfo()); } } \ No newline at end of file diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/bitfield/SpanEventBitFieldTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/bitfield/SpanEventBitFieldTest.java index 3bb1fe75e092..5be39af6cc39 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/bitfield/SpanEventBitFieldTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/serializer/trace/v2/bitfield/SpanEventBitFieldTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.common.server.bo.AnnotationBo; import com.navercorp.pinpoint.common.server.bo.SpanEventBo; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Collections; @@ -40,7 +40,7 @@ public void setHasException_shortToByteCasting() throws Exception { byte byteField = (byte) field.getBitField(); SpanEventBitField byteCastField = new SpanEventBitField(byteField); - Assert.assertTrue(byteCastField.isSetHasException()); + Assertions.assertTrue(byteCastField.isSetHasException()); } @@ -52,7 +52,7 @@ public void testRpc_first() throws Exception { spanEventBo.setRpc("Rpc"); SpanEventBitField bitField = SpanEventBitField.buildFirst(spanEventBo); - Assert.assertFalse(bitField.isSetRpc()); + Assertions.assertFalse(bitField.isSetRpc()); } @@ -63,10 +63,10 @@ public void testEndPoint_first() throws Exception { spanEventBo.setEndPoint("EndPoint"); SpanEventBitField bitField = SpanEventBitField.buildFirst(spanEventBo); - Assert.assertTrue(bitField.isSetEndPoint()); + Assertions.assertTrue(bitField.isSetEndPoint()); bitField.setEndPoint(false); - Assert.assertFalse(bitField.isSetEndPoint()); + Assertions.assertFalse(bitField.isSetEndPoint()); } @@ -77,10 +77,10 @@ public void testDestinationId_first() throws Exception { spanEventBo.setDestinationId("DestinationId"); SpanEventBitField bitField = SpanEventBitField.buildFirst(spanEventBo); - Assert.assertTrue(bitField.isSetDestinationId()); + Assertions.assertTrue(bitField.isSetDestinationId()); bitField.setDestinationId(false); - Assert.assertFalse(bitField.isSetDestinationId()); + Assertions.assertFalse(bitField.isSetDestinationId()); } @@ -92,10 +92,10 @@ public void testNextSpanId_first() throws Exception { spanEventBo.setNextSpanId(1234); SpanEventBitField bitField = SpanEventBitField.buildFirst(spanEventBo); - Assert.assertTrue(bitField.isSetNextSpanId()); + Assertions.assertTrue(bitField.isSetNextSpanId()); bitField.setNextSpanId(false); - Assert.assertFalse(bitField.isSetNextSpanId()); + Assertions.assertFalse(bitField.isSetNextSpanId()); } @@ -106,10 +106,10 @@ public void testHasException_first() throws Exception { spanEventBo.setExceptionInfo(100, "excetpion"); SpanEventBitField bitField = SpanEventBitField.buildFirst(spanEventBo); - Assert.assertTrue(bitField.isSetHasException()); + Assertions.assertTrue(bitField.isSetHasException()); bitField.setHasException(false); - Assert.assertFalse(bitField.isSetHasException()); + Assertions.assertFalse(bitField.isSetHasException()); } @@ -121,10 +121,10 @@ public void testAnnotation_first() throws Exception { spanEventBo.setAnnotationBoList(Collections.singletonList(new AnnotationBo(1, "test"))); SpanEventBitField bitField = SpanEventBitField.buildFirst(spanEventBo); - Assert.assertTrue(bitField.isSetAnnotation()); + Assertions.assertTrue(bitField.isSetAnnotation()); bitField.setAnnotation(false); - Assert.assertFalse(bitField.isSetAnnotation()); + Assertions.assertFalse(bitField.isSetAnnotation()); } @@ -136,10 +136,10 @@ public void testNextAsyncId_first() throws Exception { spanEventBo.setNextAsyncId(1234); SpanEventBitField bitField = SpanEventBitField.buildFirst(spanEventBo); - Assert.assertTrue(bitField.isSetNextAsyncId()); + Assertions.assertTrue(bitField.isSetNextAsyncId()); bitField.setNextAsyncId(false); - Assert.assertFalse(bitField.isSetNextAsyncId()); + Assertions.assertFalse(bitField.isSetNextAsyncId()); } @@ -151,10 +151,10 @@ public void testAsyncId_first() throws Exception { spanEventBo.setAsyncSequence((short) 1234); SpanEventBitField bitField = SpanEventBitField.buildFirst(spanEventBo); - Assert.assertTrue(bitField.isSetAsyncId()); + Assertions.assertTrue(bitField.isSetAsyncId()); bitField.setAsyncId(false); - Assert.assertFalse(bitField.isSetAsyncId()); + Assertions.assertFalse(bitField.isSetAsyncId()); } @@ -167,7 +167,7 @@ public void testStartElapsed_equals_next() throws Exception { current.setStartElapsed(1234); SpanEventBitField bitField = SpanEventBitField.build(current, prev); - Assert.assertEquals(bitField.getStartElapsedEncodingStrategy(), StartElapsedTimeEncodingStrategy.PREV_EQUALS); + Assertions.assertEquals(bitField.getStartElapsedEncodingStrategy(), StartElapsedTimeEncodingStrategy.PREV_EQUALS); } @@ -180,7 +180,7 @@ public void testStartElapsed_delta_next() throws Exception { current.setStartElapsed(1235); SpanEventBitField bitField = SpanEventBitField.build(current, prev); - Assert.assertEquals(bitField.getStartElapsedEncodingStrategy(), StartElapsedTimeEncodingStrategy.PREV_DELTA); + Assertions.assertEquals(bitField.getStartElapsedEncodingStrategy(), StartElapsedTimeEncodingStrategy.PREV_DELTA); } @@ -193,7 +193,7 @@ public void testSequence_add1_next() throws Exception { current.setSequence((short) 11); SpanEventBitField bitField = SpanEventBitField.build(current, prev); - Assert.assertEquals(bitField.getSequenceEncodingStrategy(), SequenceEncodingStrategy.PREV_ADD1); + Assertions.assertEquals(bitField.getSequenceEncodingStrategy(), SequenceEncodingStrategy.PREV_ADD1); } @@ -206,7 +206,7 @@ public void testSequence_delta_next() throws Exception { current.setSequence((short) 12); SpanEventBitField bitField = SpanEventBitField.build(current, prev); - Assert.assertEquals(bitField.getSequenceEncodingStrategy(), SequenceEncodingStrategy.PREV_DELTA); + Assertions.assertEquals(bitField.getSequenceEncodingStrategy(), SequenceEncodingStrategy.PREV_DELTA); } @@ -219,7 +219,7 @@ public void testDepth_equals_next() throws Exception { current.setDepth(3); SpanEventBitField bitField = SpanEventBitField.build(current, prev); - Assert.assertEquals(bitField.getDepthEncodingStrategy(), DepthEncodingStrategy.PREV_EQUALS); + Assertions.assertEquals(bitField.getDepthEncodingStrategy(), DepthEncodingStrategy.PREV_EQUALS); } @@ -232,7 +232,7 @@ public void testDepth_raw_next() throws Exception { current.setDepth(4); SpanEventBitField bitField = SpanEventBitField.build(current, prev); - Assert.assertEquals(bitField.getDepthEncodingStrategy(), DepthEncodingStrategy.RAW); + Assertions.assertEquals(bitField.getDepthEncodingStrategy(), DepthEncodingStrategy.RAW); } @@ -245,7 +245,7 @@ public void testServiceType_equals_next() throws Exception { current.setServiceType((short) 2000); SpanEventBitField bitField = SpanEventBitField.build(current, prev); - Assert.assertEquals(bitField.getServiceTypeEncodingStrategy(), ServiceTypeEncodingStrategy.PREV_EQUALS); + Assertions.assertEquals(bitField.getServiceTypeEncodingStrategy(), ServiceTypeEncodingStrategy.PREV_EQUALS); } @@ -258,7 +258,7 @@ public void testServiceType_raw_next() throws Exception { current.setServiceType((short) 2001); SpanEventBitField bitField = SpanEventBitField.build(current, prev); - Assert.assertEquals(bitField.getServiceTypeEncodingStrategy(), ServiceTypeEncodingStrategy.RAW); + Assertions.assertEquals(bitField.getServiceTypeEncodingStrategy(), ServiceTypeEncodingStrategy.RAW); } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinActiveTraceBoTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinActiveTraceBoTest.java index 05cb33cdee59..3d6fa9a6d229 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinActiveTraceBoTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinActiveTraceBoTest.java @@ -16,12 +16,12 @@ package com.navercorp.pinpoint.common.server.bo.stat.join; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung @@ -31,11 +31,11 @@ public class JoinActiveTraceBoTest { @Test public void joinActiveTraceBoTest() { List joinActiveTraceBoList = new ArrayList<>(); - JoinActiveTraceBo joinActiveTraceBo1 = new JoinActiveTraceBo("agent1", 1, (short)2, 40, 10, "agent1", 70, "agent1", 1496988667231L); - JoinActiveTraceBo joinActiveTraceBo2 = new JoinActiveTraceBo("agent2", 1, (short)2, 10, 9, "agent2", 71, "agent2", 1496988667231L); - JoinActiveTraceBo joinActiveTraceBo3 = new JoinActiveTraceBo("agent3", 1, (short)2, 20, 14, "agent3", 88, "agent3", 1496988667231L); - JoinActiveTraceBo joinActiveTraceBo4 = new JoinActiveTraceBo("agent4", 1, (short)2, 30, 22, "agent4", 10, "agent4", 1496988667231L); - JoinActiveTraceBo joinActiveTraceBo5 = new JoinActiveTraceBo("agent5", 1, (short)2, 50, 17, "agent5", 99, "agent5", 1496988667231L); + JoinActiveTraceBo joinActiveTraceBo1 = new JoinActiveTraceBo("agent1", 1, (short) 2, 40, 10, "agent1", 70, "agent1", 1496988667231L); + JoinActiveTraceBo joinActiveTraceBo2 = new JoinActiveTraceBo("agent2", 1, (short) 2, 10, 9, "agent2", 71, "agent2", 1496988667231L); + JoinActiveTraceBo joinActiveTraceBo3 = new JoinActiveTraceBo("agent3", 1, (short) 2, 20, 14, "agent3", 88, "agent3", 1496988667231L); + JoinActiveTraceBo joinActiveTraceBo4 = new JoinActiveTraceBo("agent4", 1, (short) 2, 30, 22, "agent4", 10, "agent4", 1496988667231L); + JoinActiveTraceBo joinActiveTraceBo5 = new JoinActiveTraceBo("agent5", 1, (short) 2, 50, 17, "agent5", 99, "agent5", 1496988667231L); joinActiveTraceBoList.add(joinActiveTraceBo1); joinActiveTraceBoList.add(joinActiveTraceBo2); joinActiveTraceBoList.add(joinActiveTraceBo3); diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinApplicationStatBoTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinApplicationStatBoTest.java index bc116912a22f..070e38b5b4f4 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinApplicationStatBoTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinApplicationStatBoTest.java @@ -15,14 +15,14 @@ */ package com.navercorp.pinpoint.common.server.bo.stat.join; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; /** * @author minwoo.jung @@ -165,7 +165,7 @@ private List createJoinMemoryBoList(final String id, final long cu JoinMemoryBo joinMemoryBo2 = new JoinMemoryBo(id, currentTime + 5000, 4000 + plus, 1000 + plus, 7000 + plus, id + "_1", id + "_2", 400 + plus, 150 + plus, 600 + plus, id + "_3", id + "_4"); JoinMemoryBo joinMemoryBo3 = new JoinMemoryBo(id, currentTime + 10000, 5000 + plus, 3000 + plus, 8000 + plus, id + "_1", id + "_2", 200 + plus, 100 + plus, 200 + plus, id + "_3", id + "_4"); JoinMemoryBo joinMemoryBo4 = new JoinMemoryBo(id, currentTime + 15000, 1000 + plus, 100 + plus, 3000 + plus, id + "_1", id + "_2", 100 + plus, 900 + plus, 1000 + plus, id + "_3", id + "_4"); - JoinMemoryBo joinMemoryBo5 = new JoinMemoryBo(id, currentTime + + 20000, 2000 + plus, 1000 + plus, 6000 + plus, id + "_1", id + "_2", 300 + plus, 100 + plus, 2900 + plus, id + "_3", id + "_4"); + JoinMemoryBo joinMemoryBo5 = new JoinMemoryBo(id, currentTime + +20000, 2000 + plus, 1000 + plus, 6000 + plus, id + "_1", id + "_2", 300 + plus, 100 + plus, 2900 + plus, id + "_3", id + "_4"); joinMemoryBoList.add(joinMemoryBo1); joinMemoryBoList.add(joinMemoryBo2); @@ -217,11 +217,11 @@ public void joinApplicationStatBoByTimeSlice3Test() { joinCpuLoadBoList.sort(Comparator.comparingLong(JoinCpuLoadBo::getTimestamp)); assertEquals(joinCpuLoadBoList.size(), 5); - assertEquals(joinCpuLoadBoList.get(0).getJvmCpuLoadJoinValue().getAvg(), 33,0); - assertEquals(joinCpuLoadBoList.get(1).getJvmCpuLoadJoinValue().getAvg(), 22,0); - assertEquals(joinCpuLoadBoList.get(2).getJvmCpuLoadJoinValue().getAvg(), 33,0); - assertEquals(joinCpuLoadBoList.get(3).getJvmCpuLoadJoinValue().getAvg(), 77,0); - assertEquals(joinCpuLoadBoList.get(4).getJvmCpuLoadJoinValue().getAvg(), 88,0); + assertEquals(joinCpuLoadBoList.get(0).getJvmCpuLoadJoinValue().getAvg(), 33, 0); + assertEquals(joinCpuLoadBoList.get(1).getJvmCpuLoadJoinValue().getAvg(), 22, 0); + assertEquals(joinCpuLoadBoList.get(2).getJvmCpuLoadJoinValue().getAvg(), 33, 0); + assertEquals(joinCpuLoadBoList.get(3).getJvmCpuLoadJoinValue().getAvg(), 77, 0); + assertEquals(joinCpuLoadBoList.get(4).getJvmCpuLoadJoinValue().getAvg(), 88, 0); } @Test @@ -407,19 +407,19 @@ public void joinApplicationStatBoByTimeSlice7Test() { public void joinApplicationStatBoByTimeSlice8Test() { List joinApplicationStatBoList = new ArrayList<>(); - JoinActiveTraceBo joinActiveTraceBo1_1 = new JoinActiveTraceBo("agent1", 1, (short)2, 100, 60, "agent1", 200, "agent1", 1498462545000L); - JoinActiveTraceBo joinActiveTraceBo1_2 = new JoinActiveTraceBo("agent2", 1, (short)2, 100, 60, "agent1", 200, "agent1", 1498462550000L); - JoinActiveTraceBo joinActiveTraceBo1_3 = new JoinActiveTraceBo("agent3", 1, (short)2, 100, 60, "agent1", 200, "agent1", 1498462555000L); + JoinActiveTraceBo joinActiveTraceBo1_1 = new JoinActiveTraceBo("agent1", 1, (short) 2, 100, 60, "agent1", 200, "agent1", 1498462545000L); + JoinActiveTraceBo joinActiveTraceBo1_2 = new JoinActiveTraceBo("agent2", 1, (short) 2, 100, 60, "agent1", 200, "agent1", 1498462550000L); + JoinActiveTraceBo joinActiveTraceBo1_3 = new JoinActiveTraceBo("agent3", 1, (short) 2, 100, 60, "agent1", 200, "agent1", 1498462555000L); JoinApplicationStatBo.Builder joinApplicationStatBo1 = JoinApplicationStatBo.newBuilder("test_app", 1498462545000L); joinApplicationStatBo1.addActiveTrace(joinActiveTraceBo1_1); joinApplicationStatBo1.addActiveTrace(joinActiveTraceBo1_2); joinApplicationStatBo1.addActiveTrace(joinActiveTraceBo1_3); joinApplicationStatBoList.add(joinApplicationStatBo1.build()); - JoinActiveTraceBo joinActiveTraceBo2_1 = new JoinActiveTraceBo("agent1", 1, (short)2, 50, 20, "agent1", 230, "agent1", 1498462545000L); - JoinActiveTraceBo joinActiveTraceBo2_2 = new JoinActiveTraceBo("agent2", 1, (short)2, 200, 60, "agent2", 400, "agent2", 1498462550000L); - JoinActiveTraceBo joinActiveTraceBo2_3 = new JoinActiveTraceBo("agent3", 1, (short)2, 500, 10, "agent3", 100, "agent3", 1498462555000L); - JoinActiveTraceBo joinActiveTraceBo2_4 = new JoinActiveTraceBo("agent3", 1, (short)2, 400, 60, "agent3", 500, "agent3", 1498462560000L); + JoinActiveTraceBo joinActiveTraceBo2_1 = new JoinActiveTraceBo("agent1", 1, (short) 2, 50, 20, "agent1", 230, "agent1", 1498462545000L); + JoinActiveTraceBo joinActiveTraceBo2_2 = new JoinActiveTraceBo("agent2", 1, (short) 2, 200, 60, "agent2", 400, "agent2", 1498462550000L); + JoinActiveTraceBo joinActiveTraceBo2_3 = new JoinActiveTraceBo("agent3", 1, (short) 2, 500, 10, "agent3", 100, "agent3", 1498462555000L); + JoinActiveTraceBo joinActiveTraceBo2_4 = new JoinActiveTraceBo("agent3", 1, (short) 2, 400, 60, "agent3", 500, "agent3", 1498462560000L); JoinApplicationStatBo.Builder joinApplicationStatBo2 = JoinApplicationStatBo.newBuilder("test_app", 1498462545000L); joinApplicationStatBo2.addActiveTrace(joinActiveTraceBo2_1); joinApplicationStatBo2.addActiveTrace(joinActiveTraceBo2_2); @@ -427,9 +427,9 @@ public void joinApplicationStatBoByTimeSlice8Test() { joinApplicationStatBo2.addActiveTrace(joinActiveTraceBo2_4); joinApplicationStatBoList.add(joinApplicationStatBo2.build()); - JoinActiveTraceBo joinActiveTraceBo3_1 = new JoinActiveTraceBo("agent1", 1, (short)2, 150, 20, "agent1", 230, "agent1", 1498462545000L); - JoinActiveTraceBo joinActiveTraceBo3_2 = new JoinActiveTraceBo("agent2", 1, (short)2, 300, 10, "agent2", 400, "agent2", 1498462550000L); - JoinActiveTraceBo joinActiveTraceBo3_3 = new JoinActiveTraceBo("agent3", 1, (short)2, 30, 5, "agent3", 100, "agent3", 1498462565000L); + JoinActiveTraceBo joinActiveTraceBo3_1 = new JoinActiveTraceBo("agent1", 1, (short) 2, 150, 20, "agent1", 230, "agent1", 1498462545000L); + JoinActiveTraceBo joinActiveTraceBo3_2 = new JoinActiveTraceBo("agent2", 1, (short) 2, 300, 10, "agent2", 400, "agent2", 1498462550000L); + JoinActiveTraceBo joinActiveTraceBo3_3 = new JoinActiveTraceBo("agent3", 1, (short) 2, 30, 5, "agent3", 100, "agent3", 1498462565000L); JoinApplicationStatBo.Builder joinApplicationStatBo3 = JoinApplicationStatBo.newBuilder("test_app", 1498462545000L); joinApplicationStatBo3.addActiveTrace(joinActiveTraceBo3_1); joinApplicationStatBo3.addActiveTrace(joinActiveTraceBo3_2); @@ -459,11 +459,11 @@ private JoinApplicationStatBo createJoinApplicationStatBo4(final String id, fina private List createJoinActiveTraceBoList(final String id, final long currentTime, int plus) { final List joinActiveTraceBoList = new ArrayList<>(); - JoinActiveTraceBo joinActiveTraceBo1 = new JoinActiveTraceBo(id, 1, (short)2, 100 + plus, 60 + plus, id + "_1", 200 + plus, id + "_2", currentTime); - JoinActiveTraceBo joinActiveTraceBo2 = new JoinActiveTraceBo(id, 1, (short)2, 300 + plus, 150 + plus, id + "_1", 400 + plus, id + "_2", currentTime + 5000); - JoinActiveTraceBo joinActiveTraceBo3 = new JoinActiveTraceBo(id, 1, (short)2, 200 + plus, 130 + plus, id + "_1", 300 + plus, id + "_2", currentTime + 10000); - JoinActiveTraceBo joinActiveTraceBo4 = new JoinActiveTraceBo(id, 1, (short)2, 400 + plus, 200 + plus, id + "_1", 450 + plus, id + "_2", currentTime + 15000); - JoinActiveTraceBo joinActiveTraceBo5 = new JoinActiveTraceBo(id, 1, (short)2, 350 + plus, 170 + plus, id + "_1", 600 + plus, id + "_2", currentTime + 20000); + JoinActiveTraceBo joinActiveTraceBo1 = new JoinActiveTraceBo(id, 1, (short) 2, 100 + plus, 60 + plus, id + "_1", 200 + plus, id + "_2", currentTime); + JoinActiveTraceBo joinActiveTraceBo2 = new JoinActiveTraceBo(id, 1, (short) 2, 300 + plus, 150 + plus, id + "_1", 400 + plus, id + "_2", currentTime + 5000); + JoinActiveTraceBo joinActiveTraceBo3 = new JoinActiveTraceBo(id, 1, (short) 2, 200 + plus, 130 + plus, id + "_1", 300 + plus, id + "_2", currentTime + 10000); + JoinActiveTraceBo joinActiveTraceBo4 = new JoinActiveTraceBo(id, 1, (short) 2, 400 + plus, 200 + plus, id + "_1", 450 + plus, id + "_2", currentTime + 15000); + JoinActiveTraceBo joinActiveTraceBo5 = new JoinActiveTraceBo(id, 1, (short) 2, 350 + plus, 170 + plus, id + "_1", 600 + plus, id + "_2", currentTime + 20000); joinActiveTraceBoList.add(joinActiveTraceBo1); joinActiveTraceBoList.add(joinActiveTraceBo2); @@ -611,7 +611,6 @@ private void assertJoinResponseTimeBoList(List joinResponseT } - private JoinApplicationStatBo createJoinApplicationStatBo5(final String id, final long timestamp, final int plus) { final JoinApplicationStatBo.Builder joinApplicationStatBo = JoinApplicationStatBo.newBuilder(id, timestamp); createJoinResponseTimeList(id, timestamp, plus).forEach(joinApplicationStatBo::addResponseTime); @@ -657,7 +656,7 @@ public void joinApplicationStatBoByTimeSlice12Test() { List joinDataSourceBoList1 = new ArrayList<>(); - joinDataSourceBoList1.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 100, 60, "agent1", 200, "agent1")); + joinDataSourceBoList1.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 100, 60, "agent1", 200, "agent1")); JoinDataSourceListBo joinDataSourceListBo1_1 = new JoinDataSourceListBo("agent1", joinDataSourceBoList1, 1498462545000L); JoinDataSourceListBo joinDataSourceListBo1_2 = new JoinDataSourceListBo("agent1", joinDataSourceBoList1, 1498462550000L); JoinDataSourceListBo joinDataSourceListBo1_3 = new JoinDataSourceListBo("agent1", joinDataSourceBoList1, 1498462555000L); @@ -669,16 +668,16 @@ public void joinApplicationStatBoByTimeSlice12Test() { joinApplicationStatBoList.add(joinApplicationStatBo1.build()); List joinDataSourceBoList2_1 = new ArrayList<>(); - joinDataSourceBoList2_1.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 50, 20, "agent1", 230, "agent1")); + joinDataSourceBoList2_1.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 50, 20, "agent1", 230, "agent1")); JoinDataSourceListBo joinResponseTimeBo2_1 = new JoinDataSourceListBo("agent1", joinDataSourceBoList2_1, 1498462545000L); List joinDataSourceBoList2_2 = new ArrayList<>(); - joinDataSourceBoList2_2.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 200, 60, "agent2", 400, "agent2")); + joinDataSourceBoList2_2.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 200, 60, "agent2", 400, "agent2")); JoinDataSourceListBo joinResponseTimeBo2_2 = new JoinDataSourceListBo("agent2", joinDataSourceBoList2_2, 1498462550000L); List joinDataSourceBoList2_3 = new ArrayList<>(); - joinDataSourceBoList2_3.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 500, 10, "agent3", 100, "agent3")); + joinDataSourceBoList2_3.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 500, 10, "agent3", 100, "agent3")); JoinDataSourceListBo joinResponseTimeBo2_3 = new JoinDataSourceListBo("agent3", joinDataSourceBoList2_3, 1498462555000L); List joinDataSourceBoList2_4 = new ArrayList<>(); - joinDataSourceBoList2_4.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 400, 60, "agent3", 500, "agent3")); + joinDataSourceBoList2_4.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 400, 60, "agent3", 500, "agent3")); JoinDataSourceListBo joinResponseTimeBo2_4 = new JoinDataSourceListBo("agent3", joinDataSourceBoList2_4, 1498462560000L); JoinApplicationStatBo.Builder joinApplicationStatBo2 = JoinApplicationStatBo.newBuilder("test_app", 1498462545000L); joinApplicationStatBo2.addDataSourceList(joinResponseTimeBo2_1); @@ -688,13 +687,13 @@ public void joinApplicationStatBoByTimeSlice12Test() { joinApplicationStatBoList.add(joinApplicationStatBo2.build()); List joinDataSourceBoList3_1 = new ArrayList<>(); - joinDataSourceBoList3_1.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 150, 20, "agent1", 230, "agent1")); + joinDataSourceBoList3_1.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 150, 20, "agent1", 230, "agent1")); JoinDataSourceListBo joinResponseTimeBo3_1 = new JoinDataSourceListBo("agent1", joinDataSourceBoList3_1, 1498462545000L); List joinDataSourceBoList3_2 = new ArrayList<>(); - joinDataSourceBoList3_2.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 300, 10, "agent2", 400, "agent2")); + joinDataSourceBoList3_2.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 300, 10, "agent2", 400, "agent2")); JoinDataSourceListBo joinResponseTimeBo3_2 = new JoinDataSourceListBo("agent2", joinDataSourceBoList3_2, 1498462550000L); List joinDataSourceBoList3_3 = new ArrayList<>(); - joinDataSourceBoList3_3.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 30, 5, "agent2", 100, "agent2")); + joinDataSourceBoList3_3.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 30, 5, "agent2", 100, "agent2")); JoinDataSourceListBo joinResponseTimeBo3_3 = new JoinDataSourceListBo("agent3", joinDataSourceBoList3_3, 1498462565000L); JoinApplicationStatBo.Builder joinApplicationStatBo3 = JoinApplicationStatBo.newBuilder("test_app", 1498462545000L); joinApplicationStatBo3.addDataSourceList(joinResponseTimeBo3_1); @@ -811,28 +810,28 @@ private List createJoinDataSourceListBoList(String id, lon final List joinDataSourceListBoList = new ArrayList<>(); List joinDataSourceBoList1 = new ArrayList<>(); - joinDataSourceBoList1.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 300 + plus, 250 + plus, "agent_id_1_" + plus, 600 + plus, "agent_id_6_" + plus)); - joinDataSourceBoList1.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 400 + plus, 350 + plus, "agent_id_1_" + plus, 700 + plus, "agent_id_6_" + plus)); + joinDataSourceBoList1.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 300 + plus, 250 + plus, "agent_id_1_" + plus, 600 + plus, "agent_id_6_" + plus)); + joinDataSourceBoList1.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 400 + plus, 350 + plus, "agent_id_1_" + plus, 700 + plus, "agent_id_6_" + plus)); JoinDataSourceListBo joinDataSourceListBo1 = new JoinDataSourceListBo(id, joinDataSourceBoList1, currentTime); List joinDataSourceBoList2 = new ArrayList<>(); - joinDataSourceBoList2.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 200 + plus, 50 + plus, "agent_id_2_" + plus, 700 + plus, "agent_id_7_" + plus)); - joinDataSourceBoList2.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 300 + plus, 150 + plus, "agent_id_2_" + plus, 800 + plus, "agent_id_7_" + plus)); + joinDataSourceBoList2.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 200 + plus, 50 + plus, "agent_id_2_" + plus, 700 + plus, "agent_id_7_" + plus)); + joinDataSourceBoList2.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 300 + plus, 150 + plus, "agent_id_2_" + plus, 800 + plus, "agent_id_7_" + plus)); JoinDataSourceListBo joinDataSourceListBo2 = new JoinDataSourceListBo(id, joinDataSourceBoList2, currentTime + 5000); List joinDataSourceBoList3 = new ArrayList<>(); - joinDataSourceBoList3.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 500 + plus, 150 + plus, "agent_id_3_" + plus, 900 + plus, "agent_id_8_" + plus)); - joinDataSourceBoList3.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 600 + plus, 250 + plus, "agent_id_3_" + plus, 1000 + plus, "agent_id_8_" + plus)); + joinDataSourceBoList3.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 500 + plus, 150 + plus, "agent_id_3_" + plus, 900 + plus, "agent_id_8_" + plus)); + joinDataSourceBoList3.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 600 + plus, 250 + plus, "agent_id_3_" + plus, 1000 + plus, "agent_id_8_" + plus)); JoinDataSourceListBo joinDataSourceListBo3 = new JoinDataSourceListBo(id, joinDataSourceBoList3, currentTime + 10000); List joinDataSourceBoList4 = new ArrayList<>(); - joinDataSourceBoList4.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 400 + plus, 550 + plus, "agent_id_4_" + plus, 600 + plus, "agent_id_9_" + plus)); - joinDataSourceBoList4.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 500 + plus, 650 + plus, "agent_id_4_" + plus, 700 + plus, "agent_id_9_" + plus)); + joinDataSourceBoList4.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 400 + plus, 550 + plus, "agent_id_4_" + plus, 600 + plus, "agent_id_9_" + plus)); + joinDataSourceBoList4.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 500 + plus, 650 + plus, "agent_id_4_" + plus, 700 + plus, "agent_id_9_" + plus)); JoinDataSourceListBo joinDataSourceListBo4 = new JoinDataSourceListBo(id, joinDataSourceBoList4, currentTime + 15000); List joinDataSourceBoList5 = new ArrayList<>(); - joinDataSourceBoList5.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 100 + plus, 750 + plus, "agent_id_5_" + plus, 800 + plus, "agent_id_10_" + plus)); - joinDataSourceBoList5.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 200 + plus, 850 + plus, "agent_id_5_" + plus, 900 + plus, "agent_id_10_" + plus)); + joinDataSourceBoList5.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 100 + plus, 750 + plus, "agent_id_5_" + plus, 800 + plus, "agent_id_10_" + plus)); + joinDataSourceBoList5.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 200 + plus, 850 + plus, "agent_id_5_" + plus, 900 + plus, "agent_id_10_" + plus)); JoinDataSourceListBo joinDataSourceListBo5 = new JoinDataSourceListBo(id, joinDataSourceBoList5, currentTime + 20000); joinDataSourceListBoList.add(joinDataSourceListBo1); @@ -859,6 +858,7 @@ public void joinApplicationStatBoByTimeSlice13Test() { joinFileDescriptorBoList.sort(Comparator.comparingLong(JoinFileDescriptorBo::getTimestamp)); assertJoinFileDescriptorBoList(joinFileDescriptorBoList); } + @Test public void joinApplicationStatBoByTimeSlice14Test() { List joinApplicationStatBoList = new ArrayList<>(); @@ -900,11 +900,11 @@ public void joinApplicationStatBoByTimeSlice14Test() { joinFileDescriptorBoList.sort(Comparator.comparingLong(JoinFileDescriptorBo::getTimestamp)); assertEquals(joinFileDescriptorBoList.size(), 5); - assertEquals(joinFileDescriptorBoList.get(0).getOpenFdCountJoinValue().getAvg(), 330,0); - assertEquals(joinFileDescriptorBoList.get(1).getOpenFdCountJoinValue().getAvg(), 220,0); - assertEquals(joinFileDescriptorBoList.get(2).getOpenFdCountJoinValue().getAvg(), 330,0); - assertEquals(joinFileDescriptorBoList.get(3).getOpenFdCountJoinValue().getAvg(), 770,0); - assertEquals(joinFileDescriptorBoList.get(4).getOpenFdCountJoinValue().getAvg(), 880,0); + assertEquals(joinFileDescriptorBoList.get(0).getOpenFdCountJoinValue().getAvg(), 330, 0); + assertEquals(joinFileDescriptorBoList.get(1).getOpenFdCountJoinValue().getAvg(), 220, 0); + assertEquals(joinFileDescriptorBoList.get(2).getOpenFdCountJoinValue().getAvg(), 330, 0); + assertEquals(joinFileDescriptorBoList.get(3).getOpenFdCountJoinValue().getAvg(), 770, 0); + assertEquals(joinFileDescriptorBoList.get(4).getOpenFdCountJoinValue().getAvg(), 880, 0); } @@ -974,6 +974,7 @@ public void joinApplicationStatBoByTimeSlice15Test() { joinDirectBufferBoList.sort(Comparator.comparingLong(JoinDirectBufferBo::getTimestamp)); assertJoinDirectBufferBoList(joinDirectBufferBoList); } + @Test public void joinApplicationStatBoByTimeSlice16Test() { List joinApplicationStatBoList = new ArrayList<>(); @@ -1016,30 +1017,30 @@ public void joinApplicationStatBoByTimeSlice16Test() { joinDirectBufferBoList.sort(Comparator.comparingLong(JoinDirectBufferBo::getTimestamp)); assertEquals(joinDirectBufferBoList.size(), 5); - assertEquals(joinDirectBufferBoList.get(0).getDirectCountJoinValue().getAvg(), 330,0); - assertEquals(joinDirectBufferBoList.get(0).getDirectMemoryUsedJoinValue().getAvg(), 330,0); - assertEquals(joinDirectBufferBoList.get(0).getMappedCountJoinValue().getAvg(), 330,0); - assertEquals(joinDirectBufferBoList.get(0).getMappedMemoryUsedJoinValue().getAvg(), 330,0); - - assertEquals(joinDirectBufferBoList.get(1).getDirectCountJoinValue().getAvg(), 220,0); - assertEquals(joinDirectBufferBoList.get(1).getDirectMemoryUsedJoinValue().getAvg(), 220,0); - assertEquals(joinDirectBufferBoList.get(1).getMappedCountJoinValue().getAvg(), 220,0); - assertEquals(joinDirectBufferBoList.get(1).getMappedMemoryUsedJoinValue().getAvg(), 220,0); - - assertEquals(joinDirectBufferBoList.get(2).getDirectCountJoinValue().getAvg(), 330,0); - assertEquals(joinDirectBufferBoList.get(2).getDirectMemoryUsedJoinValue().getAvg(), 330,0); - assertEquals(joinDirectBufferBoList.get(2).getMappedCountJoinValue().getAvg(), 330,0); - assertEquals(joinDirectBufferBoList.get(2).getMappedMemoryUsedJoinValue().getAvg(), 330,0); - - assertEquals(joinDirectBufferBoList.get(3).getDirectCountJoinValue().getAvg(), 770,0); - assertEquals(joinDirectBufferBoList.get(3).getDirectMemoryUsedJoinValue().getAvg(), 770,0); - assertEquals(joinDirectBufferBoList.get(3).getMappedCountJoinValue().getAvg(), 770,0); - assertEquals(joinDirectBufferBoList.get(3).getMappedMemoryUsedJoinValue().getAvg(), 770,0); - - assertEquals(joinDirectBufferBoList.get(4).getDirectCountJoinValue().getAvg(), 880,0); - assertEquals(joinDirectBufferBoList.get(4).getDirectMemoryUsedJoinValue().getAvg(), 880,0); - assertEquals(joinDirectBufferBoList.get(4).getMappedCountJoinValue().getAvg(), 880,0); - assertEquals(joinDirectBufferBoList.get(4).getMappedMemoryUsedJoinValue().getAvg(), 880,0); + assertEquals(joinDirectBufferBoList.get(0).getDirectCountJoinValue().getAvg(), 330, 0); + assertEquals(joinDirectBufferBoList.get(0).getDirectMemoryUsedJoinValue().getAvg(), 330, 0); + assertEquals(joinDirectBufferBoList.get(0).getMappedCountJoinValue().getAvg(), 330, 0); + assertEquals(joinDirectBufferBoList.get(0).getMappedMemoryUsedJoinValue().getAvg(), 330, 0); + + assertEquals(joinDirectBufferBoList.get(1).getDirectCountJoinValue().getAvg(), 220, 0); + assertEquals(joinDirectBufferBoList.get(1).getDirectMemoryUsedJoinValue().getAvg(), 220, 0); + assertEquals(joinDirectBufferBoList.get(1).getMappedCountJoinValue().getAvg(), 220, 0); + assertEquals(joinDirectBufferBoList.get(1).getMappedMemoryUsedJoinValue().getAvg(), 220, 0); + + assertEquals(joinDirectBufferBoList.get(2).getDirectCountJoinValue().getAvg(), 330, 0); + assertEquals(joinDirectBufferBoList.get(2).getDirectMemoryUsedJoinValue().getAvg(), 330, 0); + assertEquals(joinDirectBufferBoList.get(2).getMappedCountJoinValue().getAvg(), 330, 0); + assertEquals(joinDirectBufferBoList.get(2).getMappedMemoryUsedJoinValue().getAvg(), 330, 0); + + assertEquals(joinDirectBufferBoList.get(3).getDirectCountJoinValue().getAvg(), 770, 0); + assertEquals(joinDirectBufferBoList.get(3).getDirectMemoryUsedJoinValue().getAvg(), 770, 0); + assertEquals(joinDirectBufferBoList.get(3).getMappedCountJoinValue().getAvg(), 770, 0); + assertEquals(joinDirectBufferBoList.get(3).getMappedMemoryUsedJoinValue().getAvg(), 770, 0); + + assertEquals(joinDirectBufferBoList.get(4).getDirectCountJoinValue().getAvg(), 880, 0); + assertEquals(joinDirectBufferBoList.get(4).getDirectMemoryUsedJoinValue().getAvg(), 880, 0); + assertEquals(joinDirectBufferBoList.get(4).getMappedCountJoinValue().getAvg(), 880, 0); + assertEquals(joinDirectBufferBoList.get(4).getMappedMemoryUsedJoinValue().getAvg(), 880, 0); } @@ -1118,7 +1119,7 @@ private List createJoinDirectBufferBoList(final String id, f @Test public void createJoinApplicationStatBoTest() { - JoinAgentStatBo.Builder builder = JoinAgentStatBo.newBuilder("Agent", Long.MIN_VALUE, 1498462565000L);; + JoinAgentStatBo.Builder builder = JoinAgentStatBo.newBuilder("Agent", Long.MIN_VALUE, 1498462565000L); JoinCpuLoadBo joinCpuLoadBo1 = new JoinCpuLoadBo("agent1", 44, 70, "agent1", 30, "agent1", 50, 60, "agent1", 33, "agent1", 1498462565000L); JoinCpuLoadBo joinCpuLoadBo2 = new JoinCpuLoadBo("agent1", 33, 40, "agent1", 10, "agent1", 20, 78, "agent1", 12, "agent1", 1498462570000L); @@ -1153,11 +1154,11 @@ public void createJoinApplicationStatBoTest() { builder.addTransaction(joinTransactionBo4); builder.addTransaction(joinTransactionBo5); - JoinActiveTraceBo joinActiveTraceBo1 = new JoinActiveTraceBo("agent1", 1, (short)2, 30, 15, "app_1_1", 40, "app_1_2", 1498462565000L); - JoinActiveTraceBo joinActiveTraceBo2 = new JoinActiveTraceBo("agent1", 1, (short)2, 30, 15, "app_1_1", 40, "app_1_2", 1498462570000L); - JoinActiveTraceBo joinActiveTraceBo3 = new JoinActiveTraceBo("agent1", 1, (short)2, 30, 15, "app_1_1", 40, "app_1_2", 1498462575000L); - JoinActiveTraceBo joinActiveTraceBo4 = new JoinActiveTraceBo("agent1", 1, (short)2, 30, 15, "app_1_1", 40, "app_1_2", 1498462580000L); - JoinActiveTraceBo joinActiveTraceBo5 = new JoinActiveTraceBo("agent1", 1, (short)2, 30, 15, "app_1_1", 40, "app_1_2", 1498462585000L); + JoinActiveTraceBo joinActiveTraceBo1 = new JoinActiveTraceBo("agent1", 1, (short) 2, 30, 15, "app_1_1", 40, "app_1_2", 1498462565000L); + JoinActiveTraceBo joinActiveTraceBo2 = new JoinActiveTraceBo("agent1", 1, (short) 2, 30, 15, "app_1_1", 40, "app_1_2", 1498462570000L); + JoinActiveTraceBo joinActiveTraceBo3 = new JoinActiveTraceBo("agent1", 1, (short) 2, 30, 15, "app_1_1", 40, "app_1_2", 1498462575000L); + JoinActiveTraceBo joinActiveTraceBo4 = new JoinActiveTraceBo("agent1", 1, (short) 2, 30, 15, "app_1_1", 40, "app_1_2", 1498462580000L); + JoinActiveTraceBo joinActiveTraceBo5 = new JoinActiveTraceBo("agent1", 1, (short) 2, 30, 15, "app_1_1", 40, "app_1_2", 1498462585000L); builder.addActiveTrace(joinActiveTraceBo1); builder.addActiveTrace(joinActiveTraceBo2); builder.addActiveTrace(joinActiveTraceBo3); @@ -1176,28 +1177,28 @@ public void createJoinApplicationStatBoTest() { builder.addResponseTime(joinResponseTimeBo5); List joinDataSourceBoList1 = new ArrayList<>(); - joinDataSourceBoList1.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 300, 250, "agent_id_1", 600, "agent_id_6")); - joinDataSourceBoList1.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 400, 350, "agent_id_1", 700, "agent_id_6")); + joinDataSourceBoList1.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 300, 250, "agent_id_1", 600, "agent_id_6")); + joinDataSourceBoList1.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 400, 350, "agent_id_1", 700, "agent_id_6")); JoinDataSourceListBo joinDataSourceListBo1 = new JoinDataSourceListBo("agent1", joinDataSourceBoList1, 1498462565000L); List joinDataSourceBoList2 = new ArrayList<>(); - joinDataSourceBoList2.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 200, 50, "agent_id_2", 700, "agent_id_7")); - joinDataSourceBoList2.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 300, 150, "agent_id_2", 800, "agent_id_7")); + joinDataSourceBoList2.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 200, 50, "agent_id_2", 700, "agent_id_7")); + joinDataSourceBoList2.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 300, 150, "agent_id_2", 800, "agent_id_7")); JoinDataSourceListBo joinDataSourceListBo2 = new JoinDataSourceListBo("agent1", joinDataSourceBoList2, 1498462570000L); List joinDataSourceBoList3 = new ArrayList<>(); - joinDataSourceBoList3.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 500, 150, "agent_id_3", 900, "agent_id_8")); - joinDataSourceBoList3.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 600, 250, "agent_id_3", 1000, "agent_id_8")); + joinDataSourceBoList3.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 500, 150, "agent_id_3", 900, "agent_id_8")); + joinDataSourceBoList3.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 600, 250, "agent_id_3", 1000, "agent_id_8")); JoinDataSourceListBo joinDataSourceListBo3 = new JoinDataSourceListBo("agent1", joinDataSourceBoList3, 1498462575000L); List joinDataSourceBoList4 = new ArrayList<>(); - joinDataSourceBoList4.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 400, 550, "agent_id_4", 600, "agent_id_9")); - joinDataSourceBoList4.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 500, 650, "agent_id_4", 700, "agent_id_9")); + joinDataSourceBoList4.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 400, 550, "agent_id_4", 600, "agent_id_9")); + joinDataSourceBoList4.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 500, 650, "agent_id_4", 700, "agent_id_9")); JoinDataSourceListBo joinDataSourceListBo4 = new JoinDataSourceListBo("agent1", joinDataSourceBoList4, 1498462580000L); List joinDataSourceBoList5 = new ArrayList<>(); - joinDataSourceBoList5.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 100, 750, "agent_id_5", 800, "agent_id_10")); - joinDataSourceBoList5.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 200, 850, "agent_id_5", 900, "agent_id_10")); + joinDataSourceBoList5.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 100, 750, "agent_id_5", 800, "agent_id_10")); + joinDataSourceBoList5.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 200, 850, "agent_id_5", 900, "agent_id_10")); JoinDataSourceListBo joinDataSourceListBo5 = new JoinDataSourceListBo("agent1", joinDataSourceBoList5, 1498462585000L); builder.addDataSourceListBo(joinDataSourceListBo1); @@ -1264,7 +1265,7 @@ public void createJoinApplicationStatBoTest() { @Test public void createJoinApplicationStatBo2Test() { - JoinAgentStatBo.Builder builder = JoinAgentStatBo.newBuilder("Agent", Long.MIN_VALUE, 1498462545000L); + JoinAgentStatBo.Builder builder = JoinAgentStatBo.newBuilder("Agent", Long.MIN_VALUE, 1498462545000L); JoinCpuLoadBo joinCpuLoadBo1 = new JoinCpuLoadBo("agent1", 44, 70, "agent1", 30, "agent1", 50, 60, "agent1", 33, "agent1", 1498462545000L); JoinCpuLoadBo joinCpuLoadBo2 = new JoinCpuLoadBo("agent1", 33, 40, "agent1", 10, "agent1", 20, 78, "agent1", 12, "agent1", 1498462550000L); @@ -1299,11 +1300,11 @@ public void createJoinApplicationStatBo2Test() { builder.addTransaction(joinTransactionBo4); builder.addTransaction(joinTransactionBo5); - JoinActiveTraceBo joinActiveTraceBo1 = new JoinActiveTraceBo("agent1", 1, (short)2, 30, 15, "app_1_1", 40, "app_1_2", 1498462545000L); - JoinActiveTraceBo joinActiveTraceBo2 = new JoinActiveTraceBo("agent1", 1, (short)2, 30, 15, "app_1_1", 40, "app_1_2", 1498462550000L); - JoinActiveTraceBo joinActiveTraceBo3 = new JoinActiveTraceBo("agent1", 1, (short)2, 30, 15, "app_1_1", 40, "app_1_2", 1498462555000L); - JoinActiveTraceBo joinActiveTraceBo4 = new JoinActiveTraceBo("agent1", 1, (short)2, 30, 15, "app_1_1", 40, "app_1_2", 1498462560000L); - JoinActiveTraceBo joinActiveTraceBo5 = new JoinActiveTraceBo("agent1", 1, (short)2, 30, 15, "app_1_1", 40, "app_1_2", 1498462565000L); + JoinActiveTraceBo joinActiveTraceBo1 = new JoinActiveTraceBo("agent1", 1, (short) 2, 30, 15, "app_1_1", 40, "app_1_2", 1498462545000L); + JoinActiveTraceBo joinActiveTraceBo2 = new JoinActiveTraceBo("agent1", 1, (short) 2, 30, 15, "app_1_1", 40, "app_1_2", 1498462550000L); + JoinActiveTraceBo joinActiveTraceBo3 = new JoinActiveTraceBo("agent1", 1, (short) 2, 30, 15, "app_1_1", 40, "app_1_2", 1498462555000L); + JoinActiveTraceBo joinActiveTraceBo4 = new JoinActiveTraceBo("agent1", 1, (short) 2, 30, 15, "app_1_1", 40, "app_1_2", 1498462560000L); + JoinActiveTraceBo joinActiveTraceBo5 = new JoinActiveTraceBo("agent1", 1, (short) 2, 30, 15, "app_1_1", 40, "app_1_2", 1498462565000L); builder.addActiveTrace(joinActiveTraceBo1); builder.addActiveTrace(joinActiveTraceBo2); builder.addActiveTrace(joinActiveTraceBo3); @@ -1323,28 +1324,28 @@ public void createJoinApplicationStatBo2Test() { builder.addResponseTime(joinResponseTimeBo5); List joinDataSourceBoList1 = new ArrayList<>(); - joinDataSourceBoList1.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 300, 250, "agent_id_1", 600, "agent_id_6")); - joinDataSourceBoList1.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 400, 350, "agent_id_1", 700, "agent_id_6")); + joinDataSourceBoList1.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 300, 250, "agent_id_1", 600, "agent_id_6")); + joinDataSourceBoList1.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 400, 350, "agent_id_1", 700, "agent_id_6")); JoinDataSourceListBo joinDataSourceListBo1 = new JoinDataSourceListBo("agent1", joinDataSourceBoList1, 1498462545000L); List joinDataSourceBoList2 = new ArrayList<>(); - joinDataSourceBoList2.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 200, 50, "agent_id_2", 700, "agent_id_7")); - joinDataSourceBoList2.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 300, 150, "agent_id_2", 800, "agent_id_7")); + joinDataSourceBoList2.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 200, 50, "agent_id_2", 700, "agent_id_7")); + joinDataSourceBoList2.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 300, 150, "agent_id_2", 800, "agent_id_7")); JoinDataSourceListBo joinDataSourceListBo2 = new JoinDataSourceListBo("agent1", joinDataSourceBoList2, 1498462550000L); List joinDataSourceBoList3 = new ArrayList<>(); - joinDataSourceBoList3.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 500, 150, "agent_id_3", 900, "agent_id_8")); - joinDataSourceBoList3.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 600, 250, "agent_id_3", 1000, "agent_id_8")); + joinDataSourceBoList3.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 500, 150, "agent_id_3", 900, "agent_id_8")); + joinDataSourceBoList3.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 600, 250, "agent_id_3", 1000, "agent_id_8")); JoinDataSourceListBo joinDataSourceListBo3 = new JoinDataSourceListBo("agent1", joinDataSourceBoList3, 1498462555000L); List joinDataSourceBoList4 = new ArrayList<>(); - joinDataSourceBoList4.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 400, 550, "agent_id_4", 600, "agent_id_9")); - joinDataSourceBoList4.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 500, 650, "agent_id_4", 700, "agent_id_9")); + joinDataSourceBoList4.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 400, 550, "agent_id_4", 600, "agent_id_9")); + joinDataSourceBoList4.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 500, 650, "agent_id_4", 700, "agent_id_9")); JoinDataSourceListBo joinDataSourceListBo4 = new JoinDataSourceListBo("agent1", joinDataSourceBoList4, 1498462560000L); List joinDataSourceBoList5 = new ArrayList<>(); - joinDataSourceBoList5.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 100, 750, "agent_id_5", 800, "agent_id_10")); - joinDataSourceBoList5.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 200, 850, "agent_id_5", 900, "agent_id_10")); + joinDataSourceBoList5.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 100, 750, "agent_id_5", 800, "agent_id_10")); + joinDataSourceBoList5.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 200, 850, "agent_id_5", 900, "agent_id_10")); JoinDataSourceListBo joinDataSourceListBo5 = new JoinDataSourceListBo("agent1", joinDataSourceBoList5, 1498462565000L); builder.addDataSourceListBo(joinDataSourceListBo1); @@ -1426,7 +1427,7 @@ public void createJoinApplicationStatBo2Test() { @Test public void createJoinApplicationStatBo3Test() { - JoinAgentStatBo.Builder builder = JoinAgentStatBo.newBuilder("Agent", Long.MIN_VALUE, 1498462545000L); + JoinAgentStatBo.Builder builder = JoinAgentStatBo.newBuilder("Agent", Long.MIN_VALUE, 1498462545000L); JoinCpuLoadBo joinCpuLoadBo1 = new JoinCpuLoadBo("agent1", 44, 70, "agent1", 30, "agent1", 50, 60, "agent1", 33, "agent1", 1498462545000L); JoinCpuLoadBo joinCpuLoadBo2 = new JoinCpuLoadBo("agent1", 33, 40, "agent1", 10, "agent1", 20, 78, "agent1", 12, "agent1", 1498462550000L); @@ -1461,11 +1462,11 @@ public void createJoinApplicationStatBo3Test() { builder.addTransaction(joinTransactionBo4); builder.addTransaction(joinTransactionBo5); - JoinActiveTraceBo joinActiveTraceBo1 = new JoinActiveTraceBo("agent1", 1, (short)2, 30, 15, "app_1_1", 40, "app_1_2", 1498462545000L); - JoinActiveTraceBo joinActiveTraceBo2 = new JoinActiveTraceBo("agent1", 1, (short)2, 30, 15, "app_1_1", 40, "app_1_2", 1498462550000L); - JoinActiveTraceBo joinActiveTraceBo3 = new JoinActiveTraceBo("agent1", 1, (short)2, 30, 15, "app_1_1", 40, "app_1_2", 1498462555000L); - JoinActiveTraceBo joinActiveTraceBo4 = new JoinActiveTraceBo("agent1", 1, (short)2, 30, 15, "app_1_1", 40, "app_1_2", 1498462560000L); - JoinActiveTraceBo joinActiveTraceBo5 = new JoinActiveTraceBo("agent1", 1, (short)2, 30, 15, "app_1_1", 40, "app_1_2", 1498462565000L); + JoinActiveTraceBo joinActiveTraceBo1 = new JoinActiveTraceBo("agent1", 1, (short) 2, 30, 15, "app_1_1", 40, "app_1_2", 1498462545000L); + JoinActiveTraceBo joinActiveTraceBo2 = new JoinActiveTraceBo("agent1", 1, (short) 2, 30, 15, "app_1_1", 40, "app_1_2", 1498462550000L); + JoinActiveTraceBo joinActiveTraceBo3 = new JoinActiveTraceBo("agent1", 1, (short) 2, 30, 15, "app_1_1", 40, "app_1_2", 1498462555000L); + JoinActiveTraceBo joinActiveTraceBo4 = new JoinActiveTraceBo("agent1", 1, (short) 2, 30, 15, "app_1_1", 40, "app_1_2", 1498462560000L); + JoinActiveTraceBo joinActiveTraceBo5 = new JoinActiveTraceBo("agent1", 1, (short) 2, 30, 15, "app_1_1", 40, "app_1_2", 1498462565000L); builder.addActiveTrace(joinActiveTraceBo1); builder.addActiveTrace(joinActiveTraceBo2); builder.addActiveTrace(joinActiveTraceBo3); @@ -1484,28 +1485,28 @@ public void createJoinApplicationStatBo3Test() { builder.addResponseTime(joinResponseTimeBo5); List joinDataSourceBoList1 = new ArrayList<>(); - joinDataSourceBoList1.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 300, 250, "agent_id_1", 600, "agent_id_6")); - joinDataSourceBoList1.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 400, 350, "agent_id_1", 700, "agent_id_6")); + joinDataSourceBoList1.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 300, 250, "agent_id_1", 600, "agent_id_6")); + joinDataSourceBoList1.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 400, 350, "agent_id_1", 700, "agent_id_6")); JoinDataSourceListBo joinDataSourceListBo1 = new JoinDataSourceListBo("agent1", joinDataSourceBoList1, 1498462545000L); List joinDataSourceBoList2 = new ArrayList<>(); - joinDataSourceBoList2.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 200, 50, "agent_id_2", 700, "agent_id_7")); - joinDataSourceBoList2.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 300, 150, "agent_id_2", 800, "agent_id_7")); + joinDataSourceBoList2.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 200, 50, "agent_id_2", 700, "agent_id_7")); + joinDataSourceBoList2.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 300, 150, "agent_id_2", 800, "agent_id_7")); JoinDataSourceListBo joinDataSourceListBo2 = new JoinDataSourceListBo("agent1", joinDataSourceBoList2, 1498462550000L); List joinDataSourceBoList3 = new ArrayList<>(); - joinDataSourceBoList3.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 500, 150, "agent_id_3", 900, "agent_id_8")); - joinDataSourceBoList3.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 600, 250, "agent_id_3", 1000, "agent_id_8")); + joinDataSourceBoList3.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 500, 150, "agent_id_3", 900, "agent_id_8")); + joinDataSourceBoList3.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 600, 250, "agent_id_3", 1000, "agent_id_8")); JoinDataSourceListBo joinDataSourceListBo3 = new JoinDataSourceListBo("agent1", joinDataSourceBoList3, 1498462555000L); List joinDataSourceBoList4 = new ArrayList<>(); - joinDataSourceBoList4.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 400, 550, "agent_id_4", 600, "agent_id_9")); - joinDataSourceBoList4.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 500, 650, "agent_id_4", 700, "agent_id_9")); + joinDataSourceBoList4.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 400, 550, "agent_id_4", 600, "agent_id_9")); + joinDataSourceBoList4.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 500, 650, "agent_id_4", 700, "agent_id_9")); JoinDataSourceListBo joinDataSourceListBo4 = new JoinDataSourceListBo("agent1", joinDataSourceBoList4, 1498462560000L); List joinDataSourceBoList5 = new ArrayList<>(); - joinDataSourceBoList5.add(new JoinDataSourceBo((short)1000, "jdbc:mysql", 100, 750, "agent_id_5", 800, "agent_id_10")); - joinDataSourceBoList5.add(new JoinDataSourceBo((short)2000, "jdbc:mssql", 200, 850, "agent_id_5", 900, "agent_id_10")); + joinDataSourceBoList5.add(new JoinDataSourceBo((short) 1000, "jdbc:mysql", 100, 750, "agent_id_5", 800, "agent_id_10")); + joinDataSourceBoList5.add(new JoinDataSourceBo((short) 2000, "jdbc:mssql", 200, 850, "agent_id_5", 900, "agent_id_10")); JoinDataSourceListBo joinDataSourceListBo5 = new JoinDataSourceListBo("agent1", joinDataSourceBoList5, 1498462565000L); builder.addDataSourceListBo(joinDataSourceListBo1); diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinCpuLoadBoTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinCpuLoadBoTest.java index 2b68ad8c0467..a3d90e0f0dd6 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinCpuLoadBoTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinCpuLoadBoTest.java @@ -16,12 +16,12 @@ package com.navercorp.pinpoint.common.server.bo.stat.join; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung @@ -49,7 +49,7 @@ public void joinCpuLoadBoList() throws Exception { } @Test - public void joinCpuLoadBo2List() { + public void joinCpuLoadBo2List() { List joinCpuLoadBoList = new ArrayList<>(); JoinCpuLoadBo joinCpuLoadBo = JoinCpuLoadBo.joinCpuLoadBoList(joinCpuLoadBoList, 1496988667231L); assertEquals(joinCpuLoadBo, JoinCpuLoadBo.EMPTY_JOIN_CPU_LOAD_BO); diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinDataSourceBoTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinDataSourceBoTest.java index b6902a32b5af..19ab639186f6 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinDataSourceBoTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinDataSourceBoTest.java @@ -16,12 +16,12 @@ package com.navercorp.pinpoint.common.server.bo.stat.join; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinDataSourceListBoTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinDataSourceListBoTest.java index 0cd8914b3fe5..82e5e0fdb3cf 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinDataSourceListBoTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinDataSourceListBoTest.java @@ -16,13 +16,13 @@ package com.navercorp.pinpoint.common.server.bo.stat.join; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung @@ -101,11 +101,11 @@ private List createJoinDataSourceListBoList(String id, lon private List createJoinDataSourceBoList(int plus) { List joinDataSourceBoList = new ArrayList<>(); - JoinDataSourceBo joinDataSourceBo1 = new JoinDataSourceBo((short)1000, "jdbc:mysql", 30 + plus, 25 + plus, "agent_id_1_" + plus, 60 + plus, "agent_id_6_" + plus); - JoinDataSourceBo joinDataSourceBo2 = new JoinDataSourceBo((short)2000, "jdbc:mssql", 20 + plus, 5 + plus, "agent_id_2_" + plus, 30 + plus, "agent_id_7_" + plus); - JoinDataSourceBo joinDataSourceBo3 = new JoinDataSourceBo((short)3000, "jdbc:postgre", 10 + plus, 25 + plus, "agent_id_3_" + plus, 50 + plus, "agent_id_8_" + plus); - JoinDataSourceBo joinDataSourceBo4 = new JoinDataSourceBo((short)4000, "jdbc:oracle", 40 + plus, 10 + plus, "agent_id_4_" + plus, 70 + plus, "agent_id_9_" + plus); - JoinDataSourceBo joinDataSourceBo5 = new JoinDataSourceBo((short)5000, "jdbc:cubrid", 50 + plus, 25 + plus, "agent_id_5_" + plus, 80 + plus, "agent_id_10_" + plus); + JoinDataSourceBo joinDataSourceBo1 = new JoinDataSourceBo((short) 1000, "jdbc:mysql", 30 + plus, 25 + plus, "agent_id_1_" + plus, 60 + plus, "agent_id_6_" + plus); + JoinDataSourceBo joinDataSourceBo2 = new JoinDataSourceBo((short) 2000, "jdbc:mssql", 20 + plus, 5 + plus, "agent_id_2_" + plus, 30 + plus, "agent_id_7_" + plus); + JoinDataSourceBo joinDataSourceBo3 = new JoinDataSourceBo((short) 3000, "jdbc:postgre", 10 + plus, 25 + plus, "agent_id_3_" + plus, 50 + plus, "agent_id_8_" + plus); + JoinDataSourceBo joinDataSourceBo4 = new JoinDataSourceBo((short) 4000, "jdbc:oracle", 40 + plus, 10 + plus, "agent_id_4_" + plus, 70 + plus, "agent_id_9_" + plus); + JoinDataSourceBo joinDataSourceBo5 = new JoinDataSourceBo((short) 5000, "jdbc:cubrid", 50 + plus, 25 + plus, "agent_id_5_" + plus, 80 + plus, "agent_id_10_" + plus); joinDataSourceBoList.add(joinDataSourceBo1); joinDataSourceBoList.add(joinDataSourceBo2); diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinDirectBufferBoTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinDirectBufferBoTest.java index 42a136eb33ef..83757ed47ca9 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinDirectBufferBoTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinDirectBufferBoTest.java @@ -16,12 +16,13 @@ package com.navercorp.pinpoint.common.server.bo.stat.join; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * @author minwoo.jung @@ -69,10 +70,10 @@ public void joinDirectBufferBoList() throws Exception { assertEquals(joinDirectBufferBo.getDirectMemoryUsedJoinValue(), new JoinLongFieldBo(30L, 7L, "agent3", 80L, "agent4")); assertEquals(joinDirectBufferBo.getMappedCountJoinValue(), new JoinLongFieldBo(30L, 7L, "agent3", 80L, "agent4")); assertEquals(joinDirectBufferBo.getMappedMemoryUsedJoinValue(), new JoinLongFieldBo(30L, 7L, "agent3", 80L, "agent4")); - } + } @Test - public void joinDirectBufferBo2List() { + public void joinDirectBufferBo2List() { List joinDirectBufferBoList = new ArrayList<>(); JoinDirectBufferBo joinDirectBufferBo = JoinDirectBufferBo.joinDirectBufferBoList(joinDirectBufferBoList, 1496988667231L); assertEquals(joinDirectBufferBo, JoinDirectBufferBo.EMPTY_JOIN_DIRECT_BUFFER_BO); diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinFileDescriptorBoTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinFileDescriptorBoTest.java index e54b04547061..15ec9f5e63ad 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinFileDescriptorBoTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinFileDescriptorBoTest.java @@ -16,12 +16,12 @@ package com.navercorp.pinpoint.common.server.bo.stat.join; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung @@ -48,7 +48,7 @@ public void joinFileDescriptorBoList() throws Exception { } @Test - public void joinFileDescriptorBo2List() { + public void joinFileDescriptorBo2List() { List joinFileDescriptorBoList = new ArrayList<>(); JoinFileDescriptorBo joinFileDescriptorBo = JoinFileDescriptorBo.joinFileDescriptorBoList(joinFileDescriptorBoList, 1496988667231L); assertEquals(joinFileDescriptorBo, JoinFileDescriptorBo.EMPTY_JOIN_FILE_DESCRIPTOR_BO); diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinLoadedClassBoTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinLoadedClassBoTest.java index ed7ff5ba0d4c..6b86cf5b07b2 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinLoadedClassBoTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinLoadedClassBoTest.java @@ -16,22 +16,22 @@ package com.navercorp.pinpoint.common.server.bo.stat.join; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class JoinLoadedClassBoTest { @Test - public void joinLoadedClassBoListTest () { + public void joinLoadedClassBoListTest() { List joinLoadedClassBoList = new ArrayList<>(); JoinLoadedClassBo joinLoadedClassBo1 = new JoinLoadedClassBo("agent1", 35, 10, "agent1", 67, "agent1", 35, 10, "agent1", 67, "agent1", 1496988667231L); JoinLoadedClassBo joinLoadedClassBo2 = new JoinLoadedClassBo("agent2", 39, 2, "agent2", 164, "agent2", 39, 2, "agent2", 164, "agent2", 1496988667231L); - JoinLoadedClassBo joinLoadedClassBo3 = new JoinLoadedClassBo("agent3", 52, 1, "agent3", 236, "agent3",52, 1, "agent3", 236, "agent3", 1496988667231L); - JoinLoadedClassBo joinLoadedClassBo4 = new JoinLoadedClassBo("agent4", 1, 0, "agent4", 2, "agent4",1, 0, "agent4", 2, "agent4", 1496988667231L); - JoinLoadedClassBo joinLoadedClassBo5 = new JoinLoadedClassBo("agent5", 3, 4, "agent5", 5, "agent5", 3, 4, "agent5", 5, "agent5",1496988667231L); + JoinLoadedClassBo joinLoadedClassBo3 = new JoinLoadedClassBo("agent3", 52, 1, "agent3", 236, "agent3", 52, 1, "agent3", 236, "agent3", 1496988667231L); + JoinLoadedClassBo joinLoadedClassBo4 = new JoinLoadedClassBo("agent4", 1, 0, "agent4", 2, "agent4", 1, 0, "agent4", 2, "agent4", 1496988667231L); + JoinLoadedClassBo joinLoadedClassBo5 = new JoinLoadedClassBo("agent5", 3, 4, "agent5", 5, "agent5", 3, 4, "agent5", 5, "agent5", 1496988667231L); joinLoadedClassBoList.add(joinLoadedClassBo1); joinLoadedClassBoList.add(joinLoadedClassBo2); @@ -45,6 +45,7 @@ public void joinLoadedClassBoListTest () { assertEquals(new JoinLongFieldBo(26L, 2L, "agent4", 10L, "agent1"), joinLoadedClassBo.getLoadedClassJoinValue()); assertEquals(new JoinLongFieldBo(26L, 2L, "agent4", 10L, "agent1"), joinLoadedClassBo.getUnloadedClassJoinValue()); } + @Test public void joinLoadedClassBoList2Test() { List joinLoadedClassBoList = new ArrayList<>(); diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinMemoryBoTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinMemoryBoTest.java index 853a26770136..9dc63c710ba4 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinMemoryBoTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinMemoryBoTest.java @@ -16,12 +16,12 @@ package com.navercorp.pinpoint.common.server.bo.stat.join; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinResponseTimeBoTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinResponseTimeBoTest.java index a7af547ef49d..8d3403d7ec26 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinResponseTimeBoTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinResponseTimeBoTest.java @@ -16,12 +16,12 @@ package com.navercorp.pinpoint.common.server.bo.stat.join; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinTotalThreadCountBoTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinTotalThreadCountBoTest.java index b5ffc2f64a2c..737633e09687 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinTotalThreadCountBoTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinTotalThreadCountBoTest.java @@ -16,16 +16,16 @@ package com.navercorp.pinpoint.common.server.bo.stat.join; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class JoinTotalThreadCountBoTest { @Test - public void joinTotalThreadCountBoList () { + public void joinTotalThreadCountBoList() { List joinTotalThreadCountBoList = new ArrayList<>(); JoinTotalThreadCountBo joinTotalThreadCountBo1 = new JoinTotalThreadCountBo("agent1", 1496988667231L, 35, 10, "agent1", 67, "agent1"); JoinTotalThreadCountBo joinTotalThreadCountBo2 = new JoinTotalThreadCountBo("agent2", 1496988667231L, 39, 2, "agent2", 164, "agent2"); @@ -44,6 +44,7 @@ public void joinTotalThreadCountBoList () { assertEquals(1496988668231L, joinTotalThreadCountBo.getTimestamp()); assertEquals(new JoinLongFieldBo(26L, 0L, "agent4", 236L, "agent3"), joinTotalThreadCountBo.getTotalThreadCountJoinValue()); } + @Test public void joinTotalThreadCountBoList2Test() { List joinTotalThreadCountBoList = new ArrayList<>(); diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinTransactionBoTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinTransactionBoTest.java index 607175d5d457..8b4595a9a42f 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinTransactionBoTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/stat/join/JoinTransactionBoTest.java @@ -16,12 +16,12 @@ package com.navercorp.pinpoint.common.server.bo.stat.join; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/thrift/SpanFactoryTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/thrift/SpanFactoryTest.java index 2421e5d63b72..07776b4d2829 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/thrift/SpanFactoryTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/bo/thrift/SpanFactoryTest.java @@ -16,20 +16,20 @@ package com.navercorp.pinpoint.common.server.bo.thrift; +import com.navercorp.pinpoint.common.profiler.util.TransactionId; +import com.navercorp.pinpoint.common.profiler.util.TransactionIdUtils; import com.navercorp.pinpoint.common.server.bo.LocalAsyncIdBo; import com.navercorp.pinpoint.common.server.bo.RandomTSpan; import com.navercorp.pinpoint.common.server.bo.SpanBo; import com.navercorp.pinpoint.common.server.bo.SpanChunkBo; import com.navercorp.pinpoint.common.server.bo.SpanEventBo; import com.navercorp.pinpoint.common.server.bo.SpanFactoryAssert; -import com.navercorp.pinpoint.common.profiler.util.TransactionId; -import com.navercorp.pinpoint.common.profiler.util.TransactionIdUtils; import com.navercorp.pinpoint.thrift.dto.TSpan; import com.navercorp.pinpoint.thrift.dto.TSpanChunk; import com.navercorp.pinpoint.thrift.dto.TSpanEvent; import org.apache.commons.lang3.RandomUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; @@ -103,10 +103,10 @@ public void testNewSpanEventBo_N() { @Test public void testBuildSpanBo() { TSpan tSpan = random.randomTSpan(); - TSpanEvent tSpanEvent1 = random.randomTSpanEvent((short)0); - TSpanEvent tSpanEvent2 = random.randomTSpanEvent((short)1); - TSpanEvent tSpanEvent3 = random.randomTSpanEvent((short)5); - TSpanEvent tSpanEvent4 = random.randomTSpanEvent((short)2); + TSpanEvent tSpanEvent1 = random.randomTSpanEvent((short) 0); + TSpanEvent tSpanEvent2 = random.randomTSpanEvent((short) 1); + TSpanEvent tSpanEvent3 = random.randomTSpanEvent((short) 5); + TSpanEvent tSpanEvent4 = random.randomTSpanEvent((short) 2); tSpan.setSpanEventList(Arrays.asList(tSpanEvent1, tSpanEvent2, tSpanEvent3, tSpanEvent4)); SpanBo spanBo = spanFactory.buildSpanBo(tSpan); @@ -126,10 +126,10 @@ public void testBuildSpanBo_N() { @Test public void testBuildSpanChunkBo() { TSpanChunk tSpanChunk = random.randomTSpanChunk(); - TSpanEvent tSpanEvent1 = random.randomTSpanEvent((short)0); - TSpanEvent tSpanEvent2 = random.randomTSpanEvent((short)1); - TSpanEvent tSpanEvent3 = random.randomTSpanEvent((short)5); - TSpanEvent tSpanEvent4 = random.randomTSpanEvent((short)2); + TSpanEvent tSpanEvent1 = random.randomTSpanEvent((short) 0); + TSpanEvent tSpanEvent2 = random.randomTSpanEvent((short) 1); + TSpanEvent tSpanEvent3 = random.randomTSpanEvent((short) 5); + TSpanEvent tSpanEvent4 = random.randomTSpanEvent((short) 2); tSpanChunk.setSpanEventList(Arrays.asList(tSpanEvent1, tSpanEvent2, tSpanEvent3, tSpanEvent4)); SpanChunkBo spanChunkBo = spanFactory.buildSpanChunkBo(tSpanChunk); @@ -155,9 +155,9 @@ public void testTransactionId_skip_agentId() { SpanBo spanBo = spanFactory.newSpanBo(tSpan); TransactionId transactionId = spanBo.getTransactionId(); - Assert.assertEquals(transactionId.getAgentId(), "agentId"); - Assert.assertEquals(transactionId.getAgentStartTime(), 1); - Assert.assertEquals(transactionId.getTransactionSequence(), 2); + Assertions.assertEquals(transactionId.getAgentId(), "agentId"); + Assertions.assertEquals(transactionId.getAgentStartTime(), 1); + Assertions.assertEquals(transactionId.getTransactionSequence(), 2); } @Test @@ -170,9 +170,9 @@ public void testTransactionId_include_agentId() { SpanBo spanBo = spanFactory.newSpanBo(tSpan); TransactionId transactionId = spanBo.getTransactionId(); - Assert.assertEquals(transactionId.getAgentId(), "transactionAgentId"); - Assert.assertEquals(transactionId.getAgentStartTime(), 1); - Assert.assertEquals(transactionId.getTransactionSequence(), 2); + Assertions.assertEquals(transactionId.getAgentId(), "transactionAgentId"); + Assertions.assertEquals(transactionId.getAgentStartTime(), 1); + Assertions.assertEquals(transactionId.getTransactionSequence(), 2); } @@ -186,8 +186,8 @@ public void testFastLocalAsyncIdBo() { tSpanEvent.setAsyncSequence(asyncSequence); LocalAsyncIdBo localAsyncIdBo = spanFactory.fastLocalAsyncIdBo(Collections.singletonList(tSpanEvent)); - Assert.assertEquals(localAsyncIdBo.getAsyncId(), asyncId); - Assert.assertEquals(localAsyncIdBo.getSequence(), asyncSequence); + Assertions.assertEquals(localAsyncIdBo.getAsyncId(), asyncId); + Assertions.assertEquals(localAsyncIdBo.getSequence(), asyncSequence); } @Test @@ -196,7 +196,7 @@ public void testFastLocalAsyncIdBo_empty() { TSpanEvent tSpanEvent = new TSpanEvent(); LocalAsyncIdBo localAsyncIdBo = spanFactory.fastLocalAsyncIdBo(Collections.singletonList(tSpanEvent)); - Assert.assertNull(localAsyncIdBo); + Assertions.assertNull(localAsyncIdBo); } @Test @@ -212,8 +212,8 @@ public void testFullScanLocalAsyncIdBo() { LocalAsyncIdBo localAsyncIdBo = spanFactory.fullScanLocalAsyncIdBo(tSpanChunk); - Assert.assertEquals(localAsyncIdBo.getAsyncId(), asyncId); - Assert.assertEquals(localAsyncIdBo.getSequence(), asyncSequence); + Assertions.assertEquals(localAsyncIdBo.getAsyncId(), asyncId); + Assertions.assertEquals(localAsyncIdBo.getSequence(), asyncSequence); } @Test @@ -224,7 +224,7 @@ public void testFullScanLocalAsyncIdBo_empty() { tSpanChunk.setSpanEventList(Arrays.asList(tSpanEvent, tSpanEvent)); LocalAsyncIdBo localAsyncIdBo = spanFactory.fullScanLocalAsyncIdBo(tSpanChunk); - Assert.assertNull(localAsyncIdBo); + Assertions.assertNull(localAsyncIdBo); } } \ No newline at end of file diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/scatter/FuzzyRowFilterTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/scatter/FuzzyRowFilterTest.java index d32c4a182b08..b76ae6b15d91 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/scatter/FuzzyRowFilterTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/scatter/FuzzyRowFilterTest.java @@ -4,10 +4,10 @@ import org.apache.hadoop.hbase.filter.Filter; import org.apache.hadoop.hbase.filter.FuzzyRowFilter; import org.apache.hadoop.hbase.util.Pair; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -26,11 +26,11 @@ public void test() { KeyValue keyValue = new KeyValue(new byte[]{0, 1}, 1L); Filter.ReturnCode returnCode = filter.filterKeyValue(keyValue); - Assert.assertEquals(returnCode, Filter.ReturnCode.SEEK_NEXT_USING_HINT); + Assertions.assertEquals(returnCode, Filter.ReturnCode.SEEK_NEXT_USING_HINT); KeyValue keyValue2 = new KeyValue(new byte[]{0, 5}, 1L); Filter.ReturnCode returnCode2 = filter.filterKeyValue(keyValue2); - Assert.assertEquals(returnCode2, Filter.ReturnCode.INCLUDE); + Assertions.assertEquals(returnCode2, Filter.ReturnCode.INCLUDE); } @Test diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/scatter/FuzzyRowKeyBuilderTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/scatter/FuzzyRowKeyBuilderTest.java index 26d444937614..ca736430c338 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/scatter/FuzzyRowKeyBuilderTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/scatter/FuzzyRowKeyBuilderTest.java @@ -3,10 +3,10 @@ import com.navercorp.pinpoint.common.server.bo.serializer.agent.ApplicationNameRowKeyEncoder; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.filter.Filter; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; @@ -26,7 +26,7 @@ public void build_include() throws IOException { byte[] rowKey = newRowKeyV2(slotNumber); KeyValue keyValue = new KeyValue(rowKey, 1L); Filter.ReturnCode returnCode = filter.filterKeyValue(keyValue); - Assert.assertEquals(Filter.ReturnCode.INCLUDE, returnCode); + Assertions.assertEquals(Filter.ReturnCode.INCLUDE, returnCode); } @Test @@ -41,7 +41,7 @@ public void build_skip() throws IOException { byte[] rowKey = newRowKeyV2(slotNumber); KeyValue keyValue = new KeyValue(rowKey, 1L); Filter.ReturnCode returnCode = build.filterKeyValue(keyValue); - Assert.assertEquals(Filter.ReturnCode.SEEK_NEXT_USING_HINT, returnCode); + Assertions.assertEquals(Filter.ReturnCode.SEEK_NEXT_USING_HINT, returnCode); } @Test @@ -58,7 +58,7 @@ public void build_include_range() throws IOException { byte[] rowKey = newRowKeyV2(slotNumber); KeyValue keyValue = new KeyValue(rowKey, 1L); Filter.ReturnCode returnCode = filter.filterKeyValue(keyValue); - Assert.assertEquals(Filter.ReturnCode.INCLUDE, returnCode); + Assertions.assertEquals(Filter.ReturnCode.INCLUDE, returnCode); } @Test @@ -73,7 +73,7 @@ public void build_skip_high() throws IOException { byte[] rowKey = newRowKeyV2(slotNumber); KeyValue keyValue = new KeyValue(rowKey, 1L); Filter.ReturnCode returnCode = build.filterKeyValue(keyValue); - Assert.assertEquals(Filter.ReturnCode.SEEK_NEXT_USING_HINT, returnCode); + Assertions.assertEquals(Filter.ReturnCode.SEEK_NEXT_USING_HINT, returnCode); } @Test @@ -88,14 +88,14 @@ public void build_skip_low() throws IOException { byte[] rowKey = newRowKeyV2(slotNumber); KeyValue keyValue = new KeyValue(rowKey, 1L); Filter.ReturnCode returnCode = build.filterKeyValue(keyValue); - Assert.assertEquals(Filter.ReturnCode.SEEK_NEXT_USING_HINT, returnCode); + Assertions.assertEquals(Filter.ReturnCode.SEEK_NEXT_USING_HINT, returnCode); } @Test public void build_skip_low2() throws IOException { final long high = 400; final long low = 200; - Byte slotNumber = fuzzyRowKeyFactory.getKey(409600+1); + Byte slotNumber = fuzzyRowKeyFactory.getKey(409600 + 1); FuzzyRowKeyBuilder builder = new FuzzyRowKeyBuilder(); Filter build = builder.build(high, low); @@ -103,7 +103,7 @@ public void build_skip_low2() throws IOException { byte[] rowKey = newRowKeyV2(slotNumber); KeyValue keyValue = new KeyValue(rowKey, 1L); Filter.ReturnCode returnCode = build.filterKeyValue(keyValue); - Assert.assertEquals(Filter.ReturnCode.SEEK_NEXT_USING_HINT, returnCode); + Assertions.assertEquals(Filter.ReturnCode.SEEK_NEXT_USING_HINT, returnCode); } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/scatter/OneByteFuzzyRowKeyFactoryTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/scatter/OneByteFuzzyRowKeyFactoryTest.java index f5b27201efc6..468ee94d530d 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/scatter/OneByteFuzzyRowKeyFactoryTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/scatter/OneByteFuzzyRowKeyFactoryTest.java @@ -1,9 +1,9 @@ package com.navercorp.pinpoint.common.server.scatter; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; @@ -20,19 +20,19 @@ public void test() { @Test public void test_100() { OneByteFuzzyRowKeyFactory fuzzyKeyFactory = new OneByteFuzzyRowKeyFactory(); - Assert.assertEquals(0, fuzzyKeyFactory.getKey(100).byteValue()); + Assertions.assertEquals(0, fuzzyKeyFactory.getKey(100).byteValue()); } @Test public void test_200() { OneByteFuzzyRowKeyFactory fuzzyKeyFactory = new OneByteFuzzyRowKeyFactory(); - Assert.assertEquals(1, fuzzyKeyFactory.getKey(199).byteValue()); + Assertions.assertEquals(1, fuzzyKeyFactory.getKey(199).byteValue()); } @Test public void test_500() { OneByteFuzzyRowKeyFactory fuzzyKeyFactory = new OneByteFuzzyRowKeyFactory(); - Assert.assertEquals(3, fuzzyKeyFactory.getKey(500).byteValue()); + Assertions.assertEquals(3, fuzzyKeyFactory.getKey(500).byteValue()); } @Test @@ -40,7 +40,7 @@ public void test_max() { OneByteFuzzyRowKeyFactory fuzzyKeyFactory = new OneByteFuzzyRowKeyFactory(); long[] slot = fuzzyKeyFactory.slot; long max = slot[slot.length - 1] + 1; - Assert.assertEquals(slot.length, fuzzyKeyFactory.getKey(max).byteValue()); + Assertions.assertEquals(slot.length, fuzzyKeyFactory.getKey(max).byteValue()); } @Test @@ -50,8 +50,8 @@ public void test_range1() { OneByteFuzzyRowKeyFactory fuzzyKeyFactory = new OneByteFuzzyRowKeyFactory(); List rangeKey = fuzzyKeyFactory.getRangeKey(101, 500); - List expected = Arrays.asList((byte) 1, (byte)2, (byte)3); - Assert.assertEquals(expected, rangeKey); + List expected = Arrays.asList((byte) 1, (byte) 2, (byte) 3); + Assertions.assertEquals(expected, rangeKey); } @@ -62,7 +62,7 @@ public void test_range2() { OneByteFuzzyRowKeyFactory fuzzyKeyFactory = new OneByteFuzzyRowKeyFactory(); List rangeKey = fuzzyKeyFactory.getRangeKey(409601, 409602); List expected = Arrays.asList((byte) 13); - Assert.assertEquals(expected, rangeKey); + Assertions.assertEquals(expected, rangeKey); } @Test @@ -72,7 +72,7 @@ public void test_range3() { OneByteFuzzyRowKeyFactory fuzzyKeyFactory = new OneByteFuzzyRowKeyFactory(); List rangeKey = fuzzyKeyFactory.getRangeKey(1, 10); List expected = Arrays.asList((byte) 0); - Assert.assertEquals(expected, rangeKey); + Assertions.assertEquals(expected, rangeKey); } } \ No newline at end of file diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/trace/ApiDescriptionParserTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/trace/ApiDescriptionParserTest.java index 5f078dc39b13..a1dceb583227 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/trace/ApiDescriptionParserTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/trace/ApiDescriptionParserTest.java @@ -16,14 +16,11 @@ package com.navercorp.pinpoint.common.server.trace; - import com.navercorp.pinpoint.common.util.LineNumber; -import org.junit.Assert; -import org.junit.Test; - -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; - +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -43,15 +40,15 @@ public void parse() { String api = "a.StandardHostValve.invoke(b.Request request, b.Response response)"; ApiDescription result = apiParser.parse(api, LineNumber.NO_LINE_NUMBER); - Assert.assertEquals("a.StandardHostValve", result.getClassName()); - Assert.assertEquals("StandardHostValve", result.getSimpleClassName()); - Assert.assertEquals("a", result.getPackageName()); + Assertions.assertEquals("a.StandardHostValve", result.getClassName()); + Assertions.assertEquals("StandardHostValve", result.getSimpleClassName()); + Assertions.assertEquals("a", result.getPackageName()); - Assert.assertEquals("invoke", result.getMethodName()); + Assertions.assertEquals("invoke", result.getMethodName()); - Assert.assertEquals("invoke(Request request, Response response)", result.getMethodDescription()); + Assertions.assertEquals("invoke(Request request, Response response)", result.getMethodDescription()); - Assert.assertArrayEquals(new String[]{"Request request", "Response response"}, result.getSimpleParameter()); + Assertions.assertArrayEquals(new String[]{"Request request", "Response response"}, result.getSimpleParameter()); } @Test @@ -59,15 +56,15 @@ public void parseNoArgs() { String api = "a.StandardHostValve.invoke()"; ApiDescription result = apiParser.parse(api, LineNumber.NO_LINE_NUMBER); - Assert.assertEquals("a.StandardHostValve", result.getClassName()); - Assert.assertEquals("StandardHostValve", result.getSimpleClassName()); - Assert.assertEquals("a", result.getPackageName()); + Assertions.assertEquals("a.StandardHostValve", result.getClassName()); + Assertions.assertEquals("StandardHostValve", result.getSimpleClassName()); + Assertions.assertEquals("a", result.getPackageName()); - Assert.assertEquals("invoke", result.getMethodName()); + Assertions.assertEquals("invoke", result.getMethodName()); - Assert.assertEquals("invoke()", result.getMethodDescription()); + Assertions.assertEquals("invoke()", result.getMethodDescription()); - Assert.assertArrayEquals(new String[]{}, result.getSimpleParameter()); + Assertions.assertArrayEquals(new String[]{}, result.getSimpleParameter()); } @@ -77,15 +74,15 @@ public void parseNoPackage() { String api = "StandardHostValve.invoke(Request request, Response response)"; ApiDescription result = apiParser.parse(api, LineNumber.NO_LINE_NUMBER); - Assert.assertEquals("StandardHostValve", result.getClassName()); - Assert.assertEquals("StandardHostValve", result.getSimpleClassName()); - Assert.assertEquals("", result.getPackageName()); + Assertions.assertEquals("StandardHostValve", result.getClassName()); + Assertions.assertEquals("StandardHostValve", result.getSimpleClassName()); + Assertions.assertEquals("", result.getPackageName()); - Assert.assertEquals("invoke", result.getMethodName()); + Assertions.assertEquals("invoke", result.getMethodName()); - Assert.assertEquals("invoke(Request request, Response response)", result.getMethodDescription()); + Assertions.assertEquals("invoke(Request request, Response response)", result.getMethodDescription()); - Assert.assertArrayEquals(new String[]{"Request request", "Response response"}, result.getSimpleParameter()); + Assertions.assertArrayEquals(new String[]{"Request request", "Response response"}, result.getSimpleParameter()); } @@ -94,7 +91,7 @@ public void parseNoPackage() { public void parseTag() { final String apiDescriptionString = ".Tomcat Servlet Process()"; ApiDescription result = apiParser.parse(apiDescriptionString, -1); - + logger.debug(result.getMethodDescription()); logger.debug(result.getSimpleClassName()); } @@ -105,15 +102,15 @@ public void parseNoClass() { String api = "function()"; ApiDescription result = apiParser.parse(api, LineNumber.NO_LINE_NUMBER); - Assert.assertEquals("", result.getClassName()); - Assert.assertEquals("", result.getSimpleClassName()); - Assert.assertEquals("", result.getPackageName()); + Assertions.assertEquals("", result.getClassName()); + Assertions.assertEquals("", result.getSimpleClassName()); + Assertions.assertEquals("", result.getPackageName()); - Assert.assertEquals("function", result.getMethodName()); + Assertions.assertEquals("function", result.getMethodName()); - Assert.assertEquals("function()", result.getMethodDescription()); + Assertions.assertEquals("function()", result.getMethodDescription()); - Assert.assertArrayEquals(new String[]{}, result.getSimpleParameter()); + Assertions.assertArrayEquals(new String[]{}, result.getSimpleParameter()); } @Test @@ -121,15 +118,15 @@ public void parseNoClass_classskip_trick() { String api = ".function()"; ApiDescription result = apiParser.parse(api, LineNumber.NO_LINE_NUMBER); - Assert.assertEquals("", result.getClassName()); - Assert.assertEquals("", result.getSimpleClassName()); - Assert.assertEquals("", result.getPackageName()); + Assertions.assertEquals("", result.getClassName()); + Assertions.assertEquals("", result.getSimpleClassName()); + Assertions.assertEquals("", result.getPackageName()); - Assert.assertEquals("function", result.getMethodName()); + Assertions.assertEquals("function", result.getMethodName()); - Assert.assertEquals("function()", result.getMethodDescription()); + Assertions.assertEquals("function()", result.getMethodDescription()); - Assert.assertArrayEquals(new String[]{}, result.getSimpleParameter()); + Assertions.assertArrayEquals(new String[]{}, result.getSimpleParameter()); } @@ -138,16 +135,16 @@ public void parse_noParameterTYpe() { String api = "express.app.get(path, callback)"; ApiDescription result = apiParser.parse(api, LineNumber.NO_LINE_NUMBER); - Assert.assertEquals("express.app", result.getClassName()); - Assert.assertEquals("app", result.getSimpleClassName()); - Assert.assertEquals("express", result.getPackageName()); + Assertions.assertEquals("express.app", result.getClassName()); + Assertions.assertEquals("app", result.getSimpleClassName()); + Assertions.assertEquals("express", result.getPackageName()); - Assert.assertEquals("get", result.getMethodName()); + Assertions.assertEquals("get", result.getMethodName()); - Assert.assertEquals("get(path, callback)", result.getMethodDescription()); + Assertions.assertEquals("get(path, callback)", result.getMethodDescription()); - Assert.assertArrayEquals(new String[]{"path", "callback"}, result.getSimpleParameter()); + Assertions.assertArrayEquals(new String[]{"path", "callback"}, result.getSimpleParameter()); } @Test @@ -155,15 +152,15 @@ public void parse_tailingInfo1() { String api = "express.app.get(path, callback) at /src/file:123"; ApiDescription result = apiParser.parse(api, LineNumber.NO_LINE_NUMBER); - Assert.assertEquals("express.app", result.getClassName()); - Assert.assertEquals("app", result.getSimpleClassName()); - Assert.assertEquals("express", result.getPackageName()); + Assertions.assertEquals("express.app", result.getClassName()); + Assertions.assertEquals("app", result.getSimpleClassName()); + Assertions.assertEquals("express", result.getPackageName()); - Assert.assertEquals("get", result.getMethodName()); + Assertions.assertEquals("get", result.getMethodName()); - Assert.assertEquals("get(path, callback) at /src/file:123", result.getMethodDescription()); + Assertions.assertEquals("get(path, callback) at /src/file:123", result.getMethodDescription()); - Assert.assertArrayEquals(new String[]{"path", "callback"}, result.getSimpleParameter()); + Assertions.assertArrayEquals(new String[]{"path", "callback"}, result.getSimpleParameter()); } @@ -172,15 +169,15 @@ public void parse_tailingInfo2() { String api = "express.app.get(path, callback) at /src/file:123"; ApiDescription result = apiParser.parse(api, LineNumber.NO_LINE_NUMBER); - Assert.assertEquals("express.app", result.getClassName()); - Assert.assertEquals("app", result.getSimpleClassName()); - Assert.assertEquals("express", result.getPackageName()); + Assertions.assertEquals("express.app", result.getClassName()); + Assertions.assertEquals("app", result.getSimpleClassName()); + Assertions.assertEquals("express", result.getPackageName()); - Assert.assertEquals("get", result.getMethodName()); + Assertions.assertEquals("get", result.getMethodName()); - Assert.assertEquals("get(path, callback) at /src/file:123", result.getMethodDescription()); + Assertions.assertEquals("get(path, callback) at /src/file:123", result.getMethodDescription()); - Assert.assertArrayEquals(new String[]{"path", "callback"}, result.getSimpleParameter()); + Assertions.assertArrayEquals(new String[]{"path", "callback"}, result.getSimpleParameter()); } @Test @@ -188,14 +185,14 @@ public void parse_tailingInfo4() { String api = "express.app.get(path, callback) at (test.value)"; ApiDescription result = apiParser.parse(api, LineNumber.NO_LINE_NUMBER); - Assert.assertEquals("express.app", result.getClassName()); - Assert.assertEquals("app", result.getSimpleClassName()); - Assert.assertEquals("express", result.getPackageName()); + Assertions.assertEquals("express.app", result.getClassName()); + Assertions.assertEquals("app", result.getSimpleClassName()); + Assertions.assertEquals("express", result.getPackageName()); - Assert.assertEquals("get", result.getMethodName()); + Assertions.assertEquals("get", result.getMethodName()); - Assert.assertEquals("get(path, callback) at (test.value)", result.getMethodDescription()); + Assertions.assertEquals("get(path, callback) at (test.value)", result.getMethodDescription()); - Assert.assertArrayEquals(new String[]{"path", "callback"}, result.getSimpleParameter()); + Assertions.assertArrayEquals(new String[]{"path", "callback"}, result.getSimpleParameter()); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentEventMessageSerDesTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentEventMessageSerDesTest.java index b33b19055550..c14d1f91aa03 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentEventMessageSerDesTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentEventMessageSerDesTest.java @@ -32,7 +32,7 @@ import org.apache.thrift.TBase; import org.apache.thrift.protocol.TCompactProtocol; import org.apache.thrift.protocol.TProtocolFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.UnsupportedEncodingException; import java.lang.management.LockInfo; @@ -40,7 +40,7 @@ import java.lang.management.ThreadInfo; import java.util.Collections; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author HyunGil Jeong diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentEventMessageSerializerV1Test.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentEventMessageSerializerV1Test.java index 4af1da2149dc..865cca493642 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentEventMessageSerializerV1Test.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentEventMessageSerializerV1Test.java @@ -20,13 +20,14 @@ import com.navercorp.pinpoint.common.server.bo.event.MonitorInfoBo; import com.navercorp.pinpoint.common.server.bo.event.ThreadDumpBo; import com.navercorp.pinpoint.common.server.bo.event.ThreadState; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; /** * @author jaehong.kim diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentEventTypeTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentEventTypeTest.java index bf9a09a9a15a..f6c1d0f796d4 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentEventTypeTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentEventTypeTest.java @@ -16,15 +16,16 @@ package com.navercorp.pinpoint.common.server.util; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) */ public class AgentEventTypeTest { private final Logger logger = LogManager.getLogger(this.getClass()); + @Test public void test() { logger.debug("{}", AgentEventType.AGENT_CLOSED_BY_SERVER); diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentLibraryPluginFilterTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentLibraryPluginFilterTest.java index 28f906ea2baa..aa31fae86d82 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentLibraryPluginFilterTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AgentLibraryPluginFilterTest.java @@ -18,28 +18,26 @@ import com.navercorp.pinpoint.common.util.CodeSourceUtils; import com.navercorp.pinpoint.common.util.Filter; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.URL; -import static org.junit.Assert.*; - /** * @author Woonduk Kang(emeroad) */ public class AgentLibraryPluginFilterTest { private final Logger logger = LogManager.getLogger(this.getClass()); - + @Test public void filtered() { String jvmClassName = getJvmClass(logger.getClass()); Filter filter = new AgentLibraryPluginFilter(jvmClassName); URL loggerFactory = CodeSourceUtils.getCodeLocation(logger.getClass()); - Assert.assertTrue(filter.filter(loggerFactory)); + Assertions.assertTrue(filter.filter(loggerFactory)); } @@ -50,12 +48,11 @@ public void test_not_filtered() { Filter filter = new AgentLibraryPluginFilter(jvmClassName); URL testCase = CodeSourceUtils.getCodeLocation(this.getClass()); - Assert.assertFalse(filter.filter(testCase)); + Assertions.assertFalse(filter.filter(testCase)); } - private String getJvmClass(Class clazz) { return clazz.getName().replace('.', '/') + ".class"; } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AnnotationUtilsTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AnnotationUtilsTest.java index 3c3be593f877..1a060b42814c 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AnnotationUtilsTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/AnnotationUtilsTest.java @@ -2,8 +2,8 @@ import com.navercorp.pinpoint.common.server.bo.AnnotationBo; import com.navercorp.pinpoint.common.trace.AnnotationKey; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Collections; @@ -13,13 +13,13 @@ public class AnnotationUtilsTest { public void findApiAnnotation() { AnnotationBo annotationBo = new AnnotationBo(AnnotationKey.API.getCode(), "a"); String value = AnnotationUtils.findApiAnnotation(Collections.singletonList(annotationBo)); - Assert.assertEquals("a", value); + Assertions.assertEquals("a", value); } @Test public void findApiAnnotation_invalidType() { AnnotationBo annotationBo = new AnnotationBo(AnnotationKey.API.getCode(), 1); String value = AnnotationUtils.findApiAnnotation(Collections.singletonList(annotationBo)); - Assert.assertNull(null, value); + Assertions.assertNull(null, value); } } \ No newline at end of file diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/ApplicationMapStatisticsUtilsTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/ApplicationMapStatisticsUtilsTest.java index 7f603d9a8cad..74cc91d8685c 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/ApplicationMapStatisticsUtilsTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/ApplicationMapStatisticsUtilsTest.java @@ -16,13 +16,12 @@ package com.navercorp.pinpoint.common.server.util; -import com.navercorp.pinpoint.common.util.BytesUtils; -import org.junit.Assert; -import org.junit.Test; - import com.navercorp.pinpoint.common.buffer.Buffer; import com.navercorp.pinpoint.common.buffer.FixedBuffer; import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.common.util.BytesUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class ApplicationMapStatisticsUtilsTest { @@ -34,18 +33,18 @@ public void makeRowKey() { byte[] bytes = ApplicationMapStatisticsUtils.makeRowKey(applicationName, serviceType, time); - Assert.assertEquals(applicationName, ApplicationMapStatisticsUtils.getApplicationNameFromRowKey(bytes)); - Assert.assertEquals(serviceType, ApplicationMapStatisticsUtils.getApplicationTypeFromRowKey(bytes)); + Assertions.assertEquals(applicationName, ApplicationMapStatisticsUtils.getApplicationNameFromRowKey(bytes)); + Assertions.assertEquals(serviceType, ApplicationMapStatisticsUtils.getApplicationTypeFromRowKey(bytes)); } @Test public void testMakeColumnName() throws Exception { final byte[] columnNameBytes = ApplicationMapStatisticsUtils.makeColumnName("test", (short) 10); - short slotNumber = BytesUtils.bytesToShort(columnNameBytes,0); - Assert.assertEquals(slotNumber, 10); + short slotNumber = BytesUtils.bytesToShort(columnNameBytes, 0); + Assertions.assertEquals(slotNumber, 10); String columnName = BytesUtils.toString(columnNameBytes, BytesUtils.SHORT_BYTE_LENGTH, columnNameBytes.length - BytesUtils.SHORT_BYTE_LENGTH); - Assert.assertEquals(columnName, "test"); + Assertions.assertEquals(columnName, "test"); } @@ -55,13 +54,13 @@ public void testMakeColumnName2() { final short slotNumber = 10; final byte[] columnNameBytes = ApplicationMapStatisticsUtils.makeColumnName(ServiceType.STAND_ALONE.getCode(), "applicationName", "dest", slotNumber); Buffer buffer = new FixedBuffer(columnNameBytes); - Assert.assertEquals(ServiceType.STAND_ALONE.getCode(), buffer.readShort()); - Assert.assertEquals(10, buffer.readShort()); - Assert.assertEquals("applicationName", buffer.read2PrefixedString()); + Assertions.assertEquals(ServiceType.STAND_ALONE.getCode(), buffer.readShort()); + Assertions.assertEquals(10, buffer.readShort()); + Assertions.assertEquals("applicationName", buffer.read2PrefixedString()); int offset = buffer.getOffset(); byte[] interBuffer = buffer.getInternalBuffer(); - Assert.assertEquals(BytesUtils.toString(interBuffer, offset, interBuffer.length - offset), "dest"); + Assertions.assertEquals(BytesUtils.toString(interBuffer, offset, interBuffer.length - offset), "dest"); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/DateTimeFormatUtilsTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/DateTimeFormatUtilsTest.java index 28d5551121e8..20539b95c622 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/DateTimeFormatUtilsTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/DateTimeFormatUtilsTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.common.server.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.sql.Timestamp; import java.text.DateFormat; @@ -36,14 +36,14 @@ public class DateTimeFormatUtilsTest { @Test public void format() { long time = System.currentTimeMillis(); - Assert.assertEquals(defaultDateFormatfinal.format(time), DateTimeFormatUtils.format(time)); + Assertions.assertEquals(defaultDateFormatfinal.format(time), DateTimeFormatUtils.format(time)); } @Test public void formatSimple() { long time = System.currentTimeMillis(); String actual = DateTimeFormatUtils.formatSimple(time); - Assert.assertEquals(simpleDateFormatfinal.format(time), actual); + Assertions.assertEquals(simpleDateFormatfinal.format(time), actual); } @Test @@ -51,19 +51,21 @@ public void parseSimple() throws ParseException { String simpleDate = DateTimeFormatUtils.formatSimple(System.currentTimeMillis()); SimpleDateFormat format = new SimpleDateFormat(DateTimeFormatUtils.SIMPLE_DATE_FORMAT); long time = format.parse(simpleDate).getTime(); - - Assert.assertEquals(time, DateTimeFormatUtils.parseSimple(simpleDate)); + + Assertions.assertEquals(time, DateTimeFormatUtils.parseSimple(simpleDate)); } - @Test(expected = DateTimeParseException.class) + @Test public void parseSimple_sqltimestamp_error() throws ParseException { - Timestamp timestamp = new Timestamp(System.currentTimeMillis()); - // "2100-12-31 23:59:59.111" - String simpleDate = timestamp.toString(); - SimpleDateFormat format = new SimpleDateFormat(DateTimeFormatUtils.SIMPLE_DATE_FORMAT); + Assertions.assertThrows(DateTimeParseException.class, () -> { + Timestamp timestamp = new Timestamp(System.currentTimeMillis()); + // "2100-12-31 23:59:59.111" + String simpleDate = timestamp.toString(); + SimpleDateFormat format = new SimpleDateFormat(DateTimeFormatUtils.SIMPLE_DATE_FORMAT); - long time = format.parse(simpleDate).getTime(); - DateTimeFormatUtils.parseSimple(simpleDate); + long time = format.parse(simpleDate).getTime(); + DateTimeFormatUtils.parseSimple(simpleDate); + }); } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/IgnoreAddressFilterTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/IgnoreAddressFilterTest.java index 54241b5fc3fc..83b290265098 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/IgnoreAddressFilterTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/IgnoreAddressFilterTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.common.server.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.InetAddress; import java.util.ArrayList; @@ -58,14 +58,14 @@ public void acceptWithCidrAddressTest() { private void assertAddressFilter(List ignoreFilterAddressList, List ignoreAddresses, List successAddresses) { AddressFilter filter = new IgnoreAddressFilter(ignoreFilterAddressList); for (InetAddress ignoreAddress : ignoreAddresses) { - Assert.assertFalse(filter.accept(ignoreAddress)); + Assertions.assertFalse(filter.accept(ignoreAddress)); } for (InetAddress successAddress : successAddresses) { - Assert.assertTrue(filter.accept(successAddress)); + Assertions.assertTrue(filter.accept(successAddress)); } - Assert.assertTrue(filter.accept(null)); + Assertions.assertTrue(filter.accept(null)); } } \ No newline at end of file diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/ServerBootLoggerTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/ServerBootLoggerTest.java index 323b1005ed4c..e367500d0c6d 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/ServerBootLoggerTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/ServerBootLoggerTest.java @@ -1,7 +1,6 @@ package com.navercorp.pinpoint.common.server.util; -import org.junit.Test; - +import org.junit.jupiter.api.Test; public class ServerBootLoggerTest { diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/TimeSlotTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/TimeSlotTest.java index d01df2cf18eb..8a77dce6053a 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/TimeSlotTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/TimeSlotTest.java @@ -16,11 +16,10 @@ package com.navercorp.pinpoint.common.server.util; -import org.junit.Assert; - -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @@ -38,8 +37,8 @@ public void testGetTimeSlot() throws Exception { logger.debug("{} currentTime ", currentTime); logger.debug("{} timeSlot", timeSlot); - Assert.assertTrue(currentTime >= timeSlot); - } + Assertions.assertTrue(currentTime >= timeSlot); + } @Test public void testSlotTime1() throws Exception { @@ -48,7 +47,7 @@ public void testSlotTime1() throws Exception { logger.debug("{} slotTest ", slotTest); logger.debug("{} timeSlot", timeSlot); - Assert.assertEquals(slotTest, timeSlot); + Assertions.assertEquals(slotTest, timeSlot); } @Test @@ -59,6 +58,6 @@ public void testSlotTime2() throws Exception { logger.debug("{} slotTest ", slotTest); logger.debug("{} timeSlot", timeSlot); - Assert.assertEquals(sourceTest, timeSlot); + Assertions.assertEquals(sourceTest, timeSlot); } } diff --git a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/time/RangeTest.java b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/time/RangeTest.java index 38dfae38165b..fc11f5a7c123 100644 --- a/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/time/RangeTest.java +++ b/commons-server/src/test/java/com/navercorp/pinpoint/common/server/util/time/RangeTest.java @@ -18,8 +18,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.time.Instant; import java.time.temporal.ChronoUnit; @@ -37,30 +37,30 @@ public void testCreate() { try { Range range3 = Range.between(0, -1); - Assert.fail(); + Assertions.fail(); } catch (Exception ignored) { } } @Test public void testRange() { - Range range1 = Range.between(0, 0); - Assert.assertEquals(0, range1.durationMillis()); + Range range1 = Range.between(0, 0); + Assertions.assertEquals(0, range1.durationMillis()); - Range range2 = Range.between(0, 1); - Assert.assertEquals(1, range2.durationMillis()); + Range range2 = Range.between(0, 1); + Assertions.assertEquals(1, range2.durationMillis()); } @Test public void testRange_String() { - Range range1 = Range.between(0, 0); - Assert.assertTrue(range1.toString().contains(" = ")); + Range range1 = Range.between(0, 0); + Assertions.assertTrue(range1.toString().contains(" = ")); - Range range2 = Range.between(0, 1); - Assert.assertTrue(range2.toString().contains(" < ")); + Range range2 = Range.between(0, 1); + Assertions.assertTrue(range2.toString().contains(" < ")); - Range range3 = Range.newUncheckedRange(1, 0); - Assert.assertTrue(range3.toString().contains(" > ")); + Range range3 = Range.newUncheckedRange(1, 0); + Assertions.assertTrue(range3.toString().contains(" > ")); } @Test @@ -76,6 +76,6 @@ public void truncatedTo() { Instant truncated = now.truncatedTo(ChronoUnit.MILLIS); Instant millis = Instant.ofEpochMilli(now.toEpochMilli()); - Assert.assertEquals(millis, truncated); + Assertions.assertEquals(millis, truncated); } } diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/plugin/util/HostAndPortTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/plugin/util/HostAndPortTest.java index cc908fb9e326..b3052ffe0151 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/plugin/util/HostAndPortTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/plugin/util/HostAndPortTest.java @@ -16,10 +16,10 @@ package com.navercorp.pinpoint.common.plugin.util; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -31,41 +31,41 @@ public class HostAndPortTest { @Test public void testToHostAndPortString() { String hostAndPortString = HostAndPort.toHostAndPortString("127.0.1.1", 80); - Assert.assertEquals("127.0.1.1:80", hostAndPortString); + Assertions.assertEquals("127.0.1.1:80", hostAndPortString); } @Test public void testToHostAndPortString_defaultPort() { String hostAndPortString = HostAndPort.toHostAndPortString("127.0.1.1", HostAndPort.NO_PORT); - Assert.assertEquals("127.0.1.1", hostAndPortString); + Assertions.assertEquals("127.0.1.1", hostAndPortString); } @Test public void testIsValidPort() { - Assert.assertTrue(HostAndPort.isValidPort(0)); - Assert.assertTrue(HostAndPort.isValidPort(8080)); - Assert.assertTrue(HostAndPort.isValidPort(65535)); + Assertions.assertTrue(HostAndPort.isValidPort(0)); + Assertions.assertTrue(HostAndPort.isValidPort(8080)); + Assertions.assertTrue(HostAndPort.isValidPort(65535)); - Assert.assertFalse(HostAndPort.isValidPort(-1)); + Assertions.assertFalse(HostAndPort.isValidPort(-1)); } @Test public void testGetPortOrNoPort() { - Assert.assertEquals(HostAndPort.getPortOrNoPort(1), 1); + Assertions.assertEquals(HostAndPort.getPortOrNoPort(1), 1); - Assert.assertEquals(HostAndPort.getPortOrNoPort(-65535), -1); - Assert.assertEquals(HostAndPort.getPortOrNoPort(-1), -1); + Assertions.assertEquals(HostAndPort.getPortOrNoPort(-65535), -1); + Assertions.assertEquals(HostAndPort.getPortOrNoPort(-1), -1); } @Test public void testGetValidPortOrNoPort() { - Assert.assertEquals(HostAndPort.getValidPortOrNoPort(70000), -1); + Assertions.assertEquals(HostAndPort.getValidPortOrNoPort(70000), -1); - Assert.assertEquals(HostAndPort.getValidPortOrNoPort(-65535), -1); - Assert.assertEquals(HostAndPort.getValidPortOrNoPort(-1), -1); + Assertions.assertEquals(HostAndPort.getValidPortOrNoPort(-65535), -1); + Assertions.assertEquals(HostAndPort.getValidPortOrNoPort(-1), -1); } } \ No newline at end of file diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/trace/AnnotationKeyUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/trace/AnnotationKeyUtilsTest.java index 0ea3210000c4..4c3721888125 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/trace/AnnotationKeyUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/trace/AnnotationKeyUtilsTest.java @@ -17,10 +17,10 @@ package com.navercorp.pinpoint.common.trace; import com.navercorp.pinpoint.common.util.AnnotationKeyUtils; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -28,7 +28,7 @@ public class AnnotationKeyUtilsTest { private final Logger logger = LogManager.getLogger(this.getClass()); -// @Test + // @Test public void intSize() { // 2147483647 logger.debug("{}", Integer.MAX_VALUE); @@ -38,20 +38,20 @@ public void intSize() { @Test public void isArgsKey() { - Assert.assertTrue(AnnotationKeyUtils.isArgsKey(AnnotationKey.ARGS0.getCode())); - Assert.assertTrue(AnnotationKeyUtils.isArgsKey(AnnotationKey.ARGSN.getCode())); - Assert.assertTrue(AnnotationKeyUtils.isArgsKey(AnnotationKey.ARGS5.getCode())); + Assertions.assertTrue(AnnotationKeyUtils.isArgsKey(AnnotationKey.ARGS0.getCode())); + Assertions.assertTrue(AnnotationKeyUtils.isArgsKey(AnnotationKey.ARGSN.getCode())); + Assertions.assertTrue(AnnotationKeyUtils.isArgsKey(AnnotationKey.ARGS5.getCode())); - Assert.assertFalse(AnnotationKeyUtils.isArgsKey(AnnotationKey.ARGS0.getCode() +1)); - Assert.assertFalse(AnnotationKeyUtils.isArgsKey(AnnotationKey.ARGSN.getCode() -1)); - Assert.assertFalse(AnnotationKeyUtils.isArgsKey(Integer.MAX_VALUE)); - Assert.assertFalse(AnnotationKeyUtils.isArgsKey(Integer.MIN_VALUE)); + Assertions.assertFalse(AnnotationKeyUtils.isArgsKey(AnnotationKey.ARGS0.getCode() + 1)); + Assertions.assertFalse(AnnotationKeyUtils.isArgsKey(AnnotationKey.ARGSN.getCode() - 1)); + Assertions.assertFalse(AnnotationKeyUtils.isArgsKey(Integer.MAX_VALUE)); + Assertions.assertFalse(AnnotationKeyUtils.isArgsKey(Integer.MIN_VALUE)); } @Test public void isCachedArgsToArgs() { int i = AnnotationKeyUtils.cachedArgsToArgs(AnnotationKey.CACHE_ARGS0.getCode()); - Assert.assertEquals(i, AnnotationKey.ARGS0.getCode()); + Assertions.assertEquals(i, AnnotationKey.ARGS0.getCode()); } } diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/trace/HistogramSchemaTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/trace/HistogramSchemaTest.java index 83961f627070..86e6720c4752 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/trace/HistogramSchemaTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/trace/HistogramSchemaTest.java @@ -16,11 +16,8 @@ package com.navercorp.pinpoint.common.trace; -import org.junit.Assert; -import org.junit.Test; - -import com.navercorp.pinpoint.common.trace.HistogramSchema; -import com.navercorp.pinpoint.common.trace.ServiceType; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -44,13 +41,12 @@ public void testCreateNode() throws Exception { @Test public void testFindHistogramSlot() throws Exception { HistogramSchema histogramSchema = ServiceType.STAND_ALONE.getHistogramSchema(); - Assert.assertEquals(histogramSchema.findHistogramSlot(999, false).getSlotTime(), 1000); - Assert.assertEquals(histogramSchema.findHistogramSlot(1000, false).getSlotTime(), 1000); - Assert.assertEquals(histogramSchema.findHistogramSlot(1111, false).getSlotTime(), 3000); + Assertions.assertEquals(histogramSchema.findHistogramSlot(999, false).getSlotTime(), 1000); + Assertions.assertEquals(histogramSchema.findHistogramSlot(1000, false).getSlotTime(), 1000); + Assertions.assertEquals(histogramSchema.findHistogramSlot(1111, false).getSlotTime(), 3000); } - @Test public void testGetHistogramSlotIndex() throws Exception { diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/trace/UriStatHistogramBucketTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/trace/UriStatHistogramBucketTest.java index 5c05cf6d627e..85d7a4278957 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/trace/UriStatHistogramBucketTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/trace/UriStatHistogramBucketTest.java @@ -1,19 +1,17 @@ package com.navercorp.pinpoint.common.trace; -import org.junit.Assert; -import org.junit.Test; - -import static org.junit.Assert.*; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class UriStatHistogramBucketTest { @Test public void getBucketSize() { - Assert.assertEquals(UriStatHistogramBucket.values().length, UriStatHistogramBucket.getBucketSize()); + Assertions.assertEquals(UriStatHistogramBucket.values().length, UriStatHistogramBucket.getBucketSize()); } @Test public void getValue() { - Assert.assertEquals(UriStatHistogramBucket.UNDER_100, UriStatHistogramBucket.getValue(1)); + Assertions.assertEquals(UriStatHistogramBucket.UNDER_100, UriStatHistogramBucket.getValue(1)); } } \ No newline at end of file diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/trace/UriStatHistogramTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/trace/UriStatHistogramTest.java index 3d05bad2bff8..4bf9faa3fc2e 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/trace/UriStatHistogramTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/trace/UriStatHistogramTest.java @@ -16,10 +16,8 @@ package com.navercorp.pinpoint.common.trace; -import com.navercorp.pinpoint.common.trace.UriStatHistogramBucket; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Random; @@ -52,8 +50,8 @@ void assertScheme(Random random, UriStatHistogramBucket prev, UriStatHistogramBu UriStatHistogramBucket result = UriStatHistogramBucket.getValue(value); - Assert.assertEquals(current, result); - Assert.assertEquals(expectedIndex, result.getIndex()); + Assertions.assertEquals(current, result); + Assertions.assertEquals(expectedIndex, result.getIndex()); } } diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/AgentUuidUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/AgentUuidUtilsTest.java index 108a3b9a6f3d..78a32a703167 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/AgentUuidUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/AgentUuidUtilsTest.java @@ -17,8 +17,8 @@ package com.navercorp.pinpoint.common.util; import com.navercorp.pinpoint.common.PinpointConstants; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.UUID; @@ -32,42 +32,54 @@ public void testEncodingAndDecoding() { for (int i = 0; i < 1; ++i) { UUID expected = UUID.randomUUID(); String encoded = AgentUuidUtils.encode(expected); - Assert.assertTrue(IdValidateUtils.validateId(encoded, PinpointConstants.AGENT_ID_MAX_LEN)); + Assertions.assertTrue(IdValidateUtils.validateId(encoded, PinpointConstants.AGENT_ID_MAX_LEN)); UUID actual = AgentUuidUtils.decode(encoded); - Assert.assertEquals(expected, actual); + Assertions.assertEquals(expected, actual); } } - @Test(expected = IllegalArgumentException.class) + @Test public void decodeShouldFailWhenSrcIsNot22CharactersLong() { - String invalid = "012345678901234567890"; - AgentUuidUtils.decode(invalid); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + String invalid = "012345678901234567890"; + AgentUuidUtils.decode(invalid); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void decodeShouldFailWhenSrcContainsInvalidCharacter() { - String invalid = "012345678901.345678901"; - AgentUuidUtils.decode(invalid); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + String invalid = "012345678901.345678901"; + AgentUuidUtils.decode(invalid); + }); } - @Test(expected = NullPointerException.class) + @Test public void encodeStringShouldThrowNpeForNullArgument() { - AgentUuidUtils.encode((String) null); + Assertions.assertThrows(NullPointerException.class, () -> { + AgentUuidUtils.encode((String) null); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void encodeStringShouldThrowIllegalArgumentExceptionForInvalidUuidString() { - String invalidUuidString = "abcdefg"; - AgentUuidUtils.encode(invalidUuidString); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + String invalidUuidString = "abcdefg"; + AgentUuidUtils.encode(invalidUuidString); + }); } - @Test(expected = NullPointerException.class) + @Test public void encodeUuidShouldThrowNpeForNullArgument() { - AgentUuidUtils.encode((UUID) null); + Assertions.assertThrows(NullPointerException.class, () -> { + AgentUuidUtils.encode((UUID) null); + }); } - @Test(expected = NullPointerException.class) + @Test public void decodeShouldThrowNpeForNullArgument() { - AgentUuidUtils.decode(null); + Assertions.assertThrows(NullPointerException.class, () -> { + AgentUuidUtils.decode(null); + }); } } diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/ArrayArgumentUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/ArrayArgumentUtilsTest.java index b996fddd54d1..2c309cccf3ea 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/ArrayArgumentUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/ArrayArgumentUtilsTest.java @@ -1,8 +1,10 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; public class ArrayArgumentUtilsTest { @@ -17,10 +19,10 @@ public void getTest() { @Test public void getTest_array() { - Object[] args = {new Object[] {"0-0"}, new Object[] {"1-0"} }; + Object[] args = {new Object[]{"0-0"}, new Object[]{"1-0"}}; Object[] arg0 = ArrayArgumentUtils.getArgument(args, 0, Object[].class); - assertArrayEquals(new Object[] {"0-0"}, arg0); + assertArrayEquals(new Object[]{"0-0"}, arg0); } @Test diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/ArrayUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/ArrayUtilsTest.java index c3f83d6fe4e1..b329985833df 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/ArrayUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/ArrayUtilsTest.java @@ -17,10 +17,10 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.StringJoiner; @@ -37,7 +37,7 @@ public void abbreviateSmall() { byte[] bytes = new byte[]{1, 2, 3, 4}; String small = ArrayUtils.abbreviate(bytes, 3); - Assert.assertEquals("[1,2,3,...(4)]", small); + Assertions.assertEquals("[1,2,3,...(4)]", small); } @Test @@ -45,7 +45,7 @@ public void abbreviateEqual() { byte[] bytes = new byte[]{1, 2, 3, 4}; String equals = ArrayUtils.abbreviate(bytes, 4); - Assert.assertEquals("[1,2,3,4]", equals); + Assertions.assertEquals("[1,2,3,4]", equals); } @@ -54,7 +54,7 @@ public void abbreviateLarge() { byte[] bytes = new byte[]{1, 2, 3, 4}; String large = ArrayUtils.abbreviate(bytes, 11); - Assert.assertEquals("[1,2,3,4]", large); + Assertions.assertEquals("[1,2,3,4]", large); } @@ -63,10 +63,10 @@ public void abbreviateOneAndZero() { byte[] bytes = new byte[]{1, 2, 3, 4}; String one = ArrayUtils.abbreviate(bytes, 1); - Assert.assertEquals("[1,...(4)]", one); + Assertions.assertEquals("[1,...(4)]", one); String zero = ArrayUtils.abbreviate(bytes, 0); - Assert.assertEquals("[...(4)]", zero); + Assertions.assertEquals("[...(4)]", zero); } @@ -76,7 +76,7 @@ public void abbreviateSingle() { String small = ArrayUtils.abbreviate(bytes, 1); logger.debug(small); - Assert.assertEquals("[1]", small); + Assertions.assertEquals("[1]", small); } @Test @@ -85,7 +85,7 @@ public void abbreviateNegative() { try { ArrayUtils.abbreviate(bytes, -1); - Assert.fail(); + Assertions.fail(); } catch (Exception ignored) { } } @@ -93,11 +93,11 @@ public void abbreviateNegative() { @Test public void abbreviate_null_empty() { //null test - Assert.assertEquals("null", ArrayUtils.abbreviate(null)); + Assertions.assertEquals("null", ArrayUtils.abbreviate(null)); //zero-sized array test byte[] empty = new byte[0]; - Assert.assertEquals("[]", ArrayUtils.abbreviate(empty)); - Assert.assertEquals("[]", ArrayUtils.abbreviate(empty, 0)); + Assertions.assertEquals("[]", ArrayUtils.abbreviate(empty)); + Assertions.assertEquals("[]", ArrayUtils.abbreviate(empty, 0)); } @Test @@ -106,7 +106,7 @@ public void abbreviate_simple2() { //small buffer with default limit byte[] bytes_short = new byte[4]; Arrays.fill(bytes_short, 0, 4, A); - Assert.assertEquals("[65,65,65,65]", ArrayUtils.abbreviate(bytes_short)); + Assertions.assertEquals("[65,65,65,65]", ArrayUtils.abbreviate(bytes_short)); } @Test @@ -121,17 +121,17 @@ public void abbreviate() { String smallStr = fill(",", A, 4, B, 16 - 4); String smallAnswer = "[" + smallStr + ",...(256)]"; - Assert.assertEquals(smallAnswer, ArrayUtils.abbreviate(bytes, 16)); + Assertions.assertEquals(smallAnswer, ArrayUtils.abbreviate(bytes, 16)); // big buffer with big limit String bigStr = fill(",", A, 4, B, 256 - 4); String bigAnswer = "[" + bigStr + "]"; - Assert.assertEquals(bigAnswer, ArrayUtils.abbreviate(bytes, 256)); + Assertions.assertEquals(bigAnswer, ArrayUtils.abbreviate(bytes, 256)); // big buffer with default limit String bitStrLimit = fill(",", A, 4, B, 32 - 4); String bigAnswerLimit = "[" + bitStrLimit + ",...(256)]"; - Assert.assertEquals(bigAnswerLimit, ArrayUtils.abbreviate(bytes)); + Assertions.assertEquals(bigAnswerLimit, ArrayUtils.abbreviate(bytes)); } private String fill(String delimiter, byte byte1, int repeat1, byte byte2, int repeat2) { @@ -154,28 +154,28 @@ private void fill(StringJoiner stringJoiner, String str, int repeat) { public void abbreviateBufferSize_simple1() { byte[] bytes = new byte[2]; int expected = "[1,1]".length(); - Assert.assertEquals(expected, ArrayUtils.abbreviateBufferSize(bytes, 2)); + Assertions.assertEquals(expected, ArrayUtils.abbreviateBufferSize(bytes, 2)); } @Test public void abbreviateBufferSize_simple2() { byte[] bytes = new byte[]{0, 1, 64, 127}; int expected = "[0,1,64,127]".length(); - Assert.assertEquals(expected, ArrayUtils.abbreviateBufferSize(bytes, 5)); + Assertions.assertEquals(expected, ArrayUtils.abbreviateBufferSize(bytes, 5)); } @Test public void abbreviateBufferSize_abbreviate1() { byte[] bytes = new byte[128]; int expected = "[1,2,3,...(128)]".length(); - Assert.assertEquals(expected, ArrayUtils.abbreviateBufferSize(bytes, 3)); + Assertions.assertEquals(expected, ArrayUtils.abbreviateBufferSize(bytes, 3)); } @Test public void abbreviateBufferSize_abbreviate2() { byte[] bytes = new byte[2]; int expected = "[...(2)]".length(); - Assert.assertEquals(expected, ArrayUtils.abbreviateBufferSize(bytes, 0)); + Assertions.assertEquals(expected, ArrayUtils.abbreviateBufferSize(bytes, 0)); } } \ No newline at end of file diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/ByteSizeUnitTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/ByteSizeUnitTest.java index d2d694f33a94..30ea7ab8fcd9 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/ByteSizeUnitTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/ByteSizeUnitTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Random; @@ -28,10 +28,10 @@ public class ByteSizeUnitTest { @Test public void sizeTest() { - Assert.assertTrue(ByteSizeUnit.KILO_BYTES.getUnitSize() > ByteSizeUnit.BYTES.getUnitSize()); - Assert.assertTrue(ByteSizeUnit.MEGA_BYTES.getUnitSize() > ByteSizeUnit.KILO_BYTES.getUnitSize()); - Assert.assertTrue(ByteSizeUnit.GIGA_BYTES.getUnitSize() > ByteSizeUnit.MEGA_BYTES.getUnitSize()); - Assert.assertTrue(ByteSizeUnit.TERA_BYTES.getUnitSize() > ByteSizeUnit.GIGA_BYTES.getUnitSize()); + Assertions.assertTrue(ByteSizeUnit.KILO_BYTES.getUnitSize() > ByteSizeUnit.BYTES.getUnitSize()); + Assertions.assertTrue(ByteSizeUnit.MEGA_BYTES.getUnitSize() > ByteSizeUnit.KILO_BYTES.getUnitSize()); + Assertions.assertTrue(ByteSizeUnit.GIGA_BYTES.getUnitSize() > ByteSizeUnit.MEGA_BYTES.getUnitSize()); + Assertions.assertTrue(ByteSizeUnit.TERA_BYTES.getUnitSize() > ByteSizeUnit.GIGA_BYTES.getUnitSize()); } @Test @@ -82,12 +82,12 @@ public void unitTest(String value, ByteSizeUnit byteSizeUnit) { long result6 = ByteSizeUnit.getByteSize(value6); long result7 = byteSizeUnit.toBytesSize(Long.parseLong(value, 10)); - Assert.assertEquals(result1, result2); - Assert.assertEquals(result1, result3); - Assert.assertEquals(result1, result4); - Assert.assertEquals(result1, result5); - Assert.assertEquals(result1, result6); - Assert.assertEquals(result1, result7); + Assertions.assertEquals(result1, result2); + Assertions.assertEquals(result1, result3); + Assertions.assertEquals(result1, result4); + Assertions.assertEquals(result1, result5); + Assertions.assertEquals(result1, result6); + Assertions.assertEquals(result1, result7); } @Test @@ -98,12 +98,14 @@ public void maxUnitTest() { byteSizeUnit.toBytesSize(maxSize); } - @Test(expected = IllegalArgumentException.class) + @Test public void maxUnitFailTest() { - ByteSizeUnit byteSizeUnit = getRandomByteSizeUnit(ByteSizeUnit.BYTES); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + ByteSizeUnit byteSizeUnit = getRandomByteSizeUnit(ByteSizeUnit.BYTES); - long maxSize = byteSizeUnit.getMaxSize(); - byteSizeUnit.toBytesSize(maxSize + 1); + long maxSize = byteSizeUnit.getMaxSize(); + byteSizeUnit.toBytesSize(maxSize + 1); + }); } private ByteSizeUnit getRandomByteSizeUnit(ByteSizeUnit exceptValue) { @@ -136,7 +138,7 @@ public void expectedThrowExceptionTest() { private void expectedThrowExceptionTest(String value) { try { ByteSizeUnit.getByteSize(value); - Assert.fail(value); + Assertions.fail(value); } catch (Exception e) { } } diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/ClassLoaderUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/ClassLoaderUtilsTest.java index baf91ed96e7a..1bb1c250dfbb 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/ClassLoaderUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/ClassLoaderUtilsTest.java @@ -16,14 +16,12 @@ package com.navercorp.pinpoint.common.util; -import org.junit.After; -import org.junit.Assert; - -import org.junit.Before; -import org.junit.Test; - -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.net.URL; import java.net.URLClassLoader; @@ -43,13 +41,13 @@ public ClassLoader getClassLoader() { private ClassLoader beforeSetupClassLoader; - @Before + @BeforeEach public void setUp() throws Exception { Thread currentThread = Thread.currentThread(); beforeSetupClassLoader = currentThread.getContextClassLoader(); } - @After + @AfterEach public void tearDown() throws Exception { Thread currentThread = Thread.currentThread(); currentThread.setContextClassLoader(beforeSetupClassLoader); @@ -62,7 +60,7 @@ public void testGetClassLoader1() throws Exception { ClassLoader classLoader = ClassLoaderUtils.getDefaultClassLoader(); - Assert.assertSame(contextClassLoader, classLoader); + Assertions.assertSame(contextClassLoader, classLoader); } @Test @@ -72,7 +70,7 @@ public void testGetClassLoader2() throws Exception { currentThread.setContextClassLoader(FAKE_CLASS_LOADER); ClassLoader classLoader = ClassLoaderUtils.getDefaultClassLoader(); - Assert.assertSame(classLoader, FAKE_CLASS_LOADER); + Assertions.assertSame(classLoader, FAKE_CLASS_LOADER); } @Test @@ -83,7 +81,7 @@ public void testGetClassLoader3() throws Exception { ClassLoader classLoader = ClassLoaderUtils.getDefaultClassLoader(FAKE_CLASS_LOADER_CALLABLE); - Assert.assertSame(classLoader, FAKE_CLASS_LOADER); + Assertions.assertSame(classLoader, FAKE_CLASS_LOADER); } @@ -101,11 +99,11 @@ public void dumpStandardClassLoader() { @Test public void test() { - Assert.assertTrue(ClassLoaderUtils.isJvmClassLoader(ClassLoader.getSystemClassLoader())); - Assert.assertTrue(ClassLoaderUtils.isJvmClassLoader(ClassLoader.getSystemClassLoader().getParent())); - Assert.assertTrue(ClassLoaderUtils.isJvmClassLoader(Object.class.getClassLoader())); + Assertions.assertTrue(ClassLoaderUtils.isJvmClassLoader(ClassLoader.getSystemClassLoader())); + Assertions.assertTrue(ClassLoaderUtils.isJvmClassLoader(ClassLoader.getSystemClassLoader().getParent())); + Assertions.assertTrue(ClassLoaderUtils.isJvmClassLoader(Object.class.getClassLoader())); - Assert.assertFalse(ClassLoaderUtils.isJvmClassLoader(new URLClassLoader(new URL[0]))); + Assertions.assertFalse(ClassLoaderUtils.isJvmClassLoader(new URLClassLoader(new URL[0]))); } } \ No newline at end of file diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/CodeSourceUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/CodeSourceUtilsTest.java index c6e53edb159c..2dda9bceb650 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/CodeSourceUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/CodeSourceUtilsTest.java @@ -16,9 +16,9 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; import java.net.URL; diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/CollectionUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/CollectionUtilsTest.java index 6cc28d45fbaf..773d021a8c0e 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/CollectionUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/CollectionUtilsTest.java @@ -17,12 +17,11 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Collections; - /** * @author Woonduk Kang(emeroad) */ @@ -30,27 +29,27 @@ public class CollectionUtilsTest { @Test public void nullSafeSize() { - Assert.assertEquals(1, CollectionUtils.nullSafeSize(Collections.singletonList(123))); + Assertions.assertEquals(1, CollectionUtils.nullSafeSize(Collections.singletonList(123))); - Assert.assertEquals(0, CollectionUtils.nullSafeSize(Collections.emptyList())); - Assert.assertEquals(0, CollectionUtils.nullSafeSize(null)); + Assertions.assertEquals(0, CollectionUtils.nullSafeSize(Collections.emptyList())); + Assertions.assertEquals(0, CollectionUtils.nullSafeSize(null)); } @Test public void nullSafeSize_nullValue() { - Assert.assertEquals(-1, CollectionUtils.nullSafeSize(null, -1)); + Assertions.assertEquals(-1, CollectionUtils.nullSafeSize(null, -1)); } @Test public void isEmpty() { - Assert.assertTrue(CollectionUtils.isEmpty(null)); - Assert.assertTrue(CollectionUtils.isEmpty(Collections.emptyList())); + Assertions.assertTrue(CollectionUtils.isEmpty(null)); + Assertions.assertTrue(CollectionUtils.isEmpty(Collections.emptyList())); } @Test public void isNotEmpty() { - Assert.assertFalse(CollectionUtils.hasLength(null)); - Assert.assertFalse(CollectionUtils.hasLength(Collections.emptyList())); + Assertions.assertFalse(CollectionUtils.hasLength(null)); + Assertions.assertFalse(CollectionUtils.hasLength(Collections.emptyList())); } } \ No newline at end of file diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/ContentLengthTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/ContentLengthTest.java index a579d4f30188..6bcfef4ffa9a 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/ContentLengthTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/ContentLengthTest.java @@ -1,12 +1,13 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; import java.io.InputStream; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; public class ContentLengthTest { @@ -23,25 +24,25 @@ public void length() throws IOException { String strContent = "abc"; int strLength = contentLength.getLength(strContent); - org.junit.Assert.assertEquals(strContent.length(), strLength); + Assertions.assertEquals(strContent.length(), strLength); byte[] byteArray = new byte[1]; int bytesLength = contentLength.getLength(byteArray); - org.junit.Assert.assertEquals(byteArray.length, bytesLength); + Assertions.assertEquals(byteArray.length, bytesLength); char[] charArray = new char[5]; int charsLength = contentLength.getLength(charArray); - org.junit.Assert.assertEquals(charArray.length, charsLength); + Assertions.assertEquals(charArray.length, charsLength); InputStream inputStream = mock(InputStream.class); when(inputStream.available()).thenReturn(20); int streamLength = contentLength.getLength(inputStream); - org.junit.Assert.assertEquals(inputStream.available(), streamLength); + Assertions.assertEquals(inputStream.available(), streamLength); File file = mock(File.class); when(file.length()).thenReturn(30L); int fileLength = contentLength.getLength(file); - org.junit.Assert.assertEquals(file.length(), fileLength); + Assertions.assertEquals(file.length(), fileLength); } @Test @@ -60,7 +61,7 @@ public long getLength(Object context) { ContentLength contentLength = builder.build(); int length = contentLength.getLength(new long[10]); - org.junit.Assert.assertEquals(10, length); + Assertions.assertEquals(10, length); } @Test @@ -69,10 +70,10 @@ public void length_unknownType() { ContentLength contentLength = builder.build(); int length = contentLength.getLength("abc"); - org.junit.Assert.assertEquals(ContentLength.NOT_EXIST, length); + Assertions.assertEquals(ContentLength.NOT_EXIST, length); int nullLength = contentLength.getLength(null); - org.junit.Assert.assertEquals(ContentLength.NOT_EXIST, nullLength); + Assertions.assertEquals(ContentLength.NOT_EXIST, nullLength); } @@ -86,9 +87,9 @@ public void overflow_file() { when(file.length()).thenReturn(Long.MAX_VALUE); int intLength = content.getLength(file); - org.junit.Assert.assertEquals(Integer.MAX_VALUE, intLength); + Assertions.assertEquals(Integer.MAX_VALUE, intLength); long longLength = content.getLongLength(file); - org.junit.Assert.assertEquals(Long.MAX_VALUE, longLength); + Assertions.assertEquals(Long.MAX_VALUE, longLength); } } \ No newline at end of file diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/DelegateEnumerationTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/DelegateEnumerationTest.java index 03b9e1f0a92d..7de90b351300 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/DelegateEnumerationTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/DelegateEnumerationTest.java @@ -16,12 +16,19 @@ package com.navercorp.pinpoint.common.util; -import static org.mockito.Mockito.*; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import org.junit.Assert; -import org.junit.Test; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.List; +import java.util.NoSuchElementException; -import java.util.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class DelegateEnumerationTest { @@ -37,19 +44,19 @@ public void testNormal() { Enumeration enumeration = hashTable.elements(); DelegateEnumeration delegateEnumeration = new DelegateEnumeration<>(enumeration); - Assert.assertTrue(delegateEnumeration.hasMoreElements()); - Assert.assertTrue(valueList.remove(delegateEnumeration.nextElement())); + Assertions.assertTrue(delegateEnumeration.hasMoreElements()); + Assertions.assertTrue(valueList.remove(delegateEnumeration.nextElement())); - Assert.assertTrue(delegateEnumeration.hasMoreElements()); - Assert.assertTrue(valueList.remove(delegateEnumeration.nextElement())); + Assertions.assertTrue(delegateEnumeration.hasMoreElements()); + Assertions.assertTrue(valueList.remove(delegateEnumeration.nextElement())); - Assert.assertTrue(delegateEnumeration.hasMoreElements()); - Assert.assertTrue(valueList.remove(delegateEnumeration.nextElement())); + Assertions.assertTrue(delegateEnumeration.hasMoreElements()); + Assertions.assertTrue(valueList.remove(delegateEnumeration.nextElement())); - Assert.assertTrue(valueList.isEmpty()); + Assertions.assertTrue(valueList.isEmpty()); - Assert.assertFalse(delegateEnumeration.hasMoreElements()); - Assert.assertNull(delegateEnumeration._getNextException()); + Assertions.assertFalse(delegateEnumeration.hasMoreElements()); + Assertions.assertNull(delegateEnumeration._getNextException()); assertNextElements_Expected_ExceptionEmulation(enumeration, delegateEnumeration); } @@ -60,8 +67,8 @@ public void bug69_Inefficient_exception_is_created() { Enumeration enumeration = hashTable.elements(); DelegateEnumeration delegateEnumeration = new DelegateEnumeration<>(enumeration); - Assert.assertFalse(delegateEnumeration.hasMoreElements()); - Assert.assertNull(delegateEnumeration._getNextException()); + Assertions.assertFalse(delegateEnumeration.hasMoreElements()); + Assertions.assertNull(delegateEnumeration._getNextException()); assertNextElements_Expected_ExceptionEmulation(enumeration, delegateEnumeration); } @@ -75,13 +82,13 @@ public void bug69_Inefficient_exception_is_created_nextElement() { DelegateEnumeration delegateEnumeration = new DelegateEnumeration<>(enumeration); - Assert.assertNull(delegateEnumeration.nextElement()); + Assertions.assertNull(delegateEnumeration.nextElement()); verify(enumeration, times(1)).nextElement(); - Assert.assertNull(delegateEnumeration.nextElement()); + Assertions.assertNull(delegateEnumeration.nextElement()); verify(enumeration, times(2)).nextElement(); - Assert.assertNull(delegateEnumeration.nextElement()); + Assertions.assertNull(delegateEnumeration.nextElement()); verify(enumeration, times(3)).nextElement(); } @@ -106,19 +113,19 @@ public boolean filter(String s) { } }); - Assert.assertTrue(delegateEnumeration.hasMoreElements()); - Assert.assertTrue(valueList.remove(delegateEnumeration.nextElement())); + Assertions.assertTrue(delegateEnumeration.hasMoreElements()); + Assertions.assertTrue(valueList.remove(delegateEnumeration.nextElement())); - Assert.assertTrue(delegateEnumeration.hasMoreElements()); - Assert.assertTrue(valueList.remove(delegateEnumeration.nextElement())); + Assertions.assertTrue(delegateEnumeration.hasMoreElements()); + Assertions.assertTrue(valueList.remove(delegateEnumeration.nextElement())); - Assert.assertEquals(valueList.size(), 1); + Assertions.assertEquals(valueList.size(), 1); - Assert.assertFalse(delegateEnumeration.hasMoreElements()); + Assertions.assertFalse(delegateEnumeration.hasMoreElements()); assertNextElements_Expected_ExceptionEmulation(enumeration, delegateEnumeration); - Assert.assertEquals(valueList.size(), 1); + Assertions.assertEquals(valueList.size(), 1); - Assert.assertEquals(valueList.get(0), "bb"); + Assertions.assertEquals(valueList.get(0), "bb"); } @Test @@ -128,16 +135,16 @@ public void testExceptionTest_Exception() { Enumeration enumeration = hashTable.elements(); DelegateEnumeration delegateEnumeration = new DelegateEnumeration<>(enumeration); - Assert.assertFalse(delegateEnumeration.hasMoreElements()); - Assert.assertFalse(delegateEnumeration.hasMoreElements()); - Assert.assertFalse(delegateEnumeration.hasMoreElements()); + Assertions.assertFalse(delegateEnumeration.hasMoreElements()); + Assertions.assertFalse(delegateEnumeration.hasMoreElements()); + Assertions.assertFalse(delegateEnumeration.hasMoreElements()); assertNextElements_Expected_ExceptionEmulation(enumeration, delegateEnumeration); - Assert.assertFalse(delegateEnumeration.hasMoreElements()); + Assertions.assertFalse(delegateEnumeration.hasMoreElements()); assertNextElements_Expected_ExceptionEmulation(enumeration, delegateEnumeration); assertNextElements_Expected_ExceptionEmulation(enumeration, delegateEnumeration); - Assert.assertFalse(delegateEnumeration.hasMoreElements()); + Assertions.assertFalse(delegateEnumeration.hasMoreElements()); } @Test @@ -150,15 +157,15 @@ public void testExceptionTest_Exception2() { DelegateEnumeration delegateEnumeration = new DelegateEnumeration<>(enumeration); - Assert.assertEquals(enumeration.hasMoreElements(), delegateEnumeration.hasMoreElements()); - Assert.assertEquals(enumeration.hasMoreElements(), delegateEnumeration.hasMoreElements()); + Assertions.assertEquals(enumeration.hasMoreElements(), delegateEnumeration.hasMoreElements()); + Assertions.assertEquals(enumeration.hasMoreElements(), delegateEnumeration.hasMoreElements()); assertNextElements_Expected_ExceptionEmulation(enumeration, delegateEnumeration); - Assert.assertEquals(enumeration.hasMoreElements(), delegateEnumeration.hasMoreElements()); + Assertions.assertEquals(enumeration.hasMoreElements(), delegateEnumeration.hasMoreElements()); assertNextElements_Expected_ExceptionEmulation(enumeration, delegateEnumeration); assertNextElements_Expected_ExceptionEmulation(enumeration, delegateEnumeration); - Assert.assertEquals(enumeration.hasMoreElements(), delegateEnumeration.hasMoreElements()); + Assertions.assertEquals(enumeration.hasMoreElements(), delegateEnumeration.hasMoreElements()); } @Test @@ -171,13 +178,13 @@ public void testExceptionTest_Null() { DelegateEnumeration delegateEnumeration = new DelegateEnumeration<>(enumeration); - Assert.assertFalse(delegateEnumeration.hasMoreElements()); - Assert.assertFalse(delegateEnumeration.hasMoreElements()); + Assertions.assertFalse(delegateEnumeration.hasMoreElements()); + Assertions.assertFalse(delegateEnumeration.hasMoreElements()); - Assert.assertSame(delegateEnumeration.nextElement(), null); - Assert.assertSame(delegateEnumeration.nextElement(), null); - Assert.assertFalse(delegateEnumeration.hasMoreElements()); + Assertions.assertSame(delegateEnumeration.nextElement(), null); + Assertions.assertSame(delegateEnumeration.nextElement(), null); + Assertions.assertFalse(delegateEnumeration.hasMoreElements()); } @@ -185,6 +192,7 @@ public void testExceptionTest_Null() { public void testExceptionTest_Null2() { Enumeration enumeration = new Enumeration() { private boolean first = true; + @Override public boolean hasMoreElements() { return first; @@ -203,29 +211,29 @@ public String nextElement() { DelegateEnumeration delegateEnumeration = new DelegateEnumeration<>(enumeration); - Assert.assertTrue(delegateEnumeration.hasMoreElements()); - Assert.assertTrue(delegateEnumeration.hasMoreElements()); + Assertions.assertTrue(delegateEnumeration.hasMoreElements()); + Assertions.assertTrue(delegateEnumeration.hasMoreElements()); - Assert.assertSame(delegateEnumeration.nextElement(), "exist"); - Assert.assertFalse(delegateEnumeration.hasMoreElements()); + Assertions.assertSame(delegateEnumeration.nextElement(), "exist"); + Assertions.assertFalse(delegateEnumeration.hasMoreElements()); - Assert.assertSame(delegateEnumeration.nextElement(), null); - Assert.assertSame(delegateEnumeration.nextElement(), null); - Assert.assertFalse(delegateEnumeration.hasMoreElements()); + Assertions.assertSame(delegateEnumeration.nextElement(), null); + Assertions.assertSame(delegateEnumeration.nextElement(), null); + Assertions.assertFalse(delegateEnumeration.hasMoreElements()); } private void assertNextElements_Expected_ExceptionEmulation(Enumeration elements, DelegateEnumeration delegateEnumeration) { Exception original = getException(elements); - Assert.assertNotSame(original, null); + Assertions.assertNotSame(original, null); Exception delegate = getException(delegateEnumeration); - Assert.assertNotSame(delegate, null); + Assertions.assertNotSame(delegate, null); - Assert.assertEquals(original.getClass(), delegate.getClass()); - Assert.assertEquals(original.getMessage(), delegate.getMessage()); - Assert.assertEquals(original.getCause(), delegate.getCause()); + Assertions.assertEquals(original.getClass(), delegate.getClass()); + Assertions.assertEquals(original.getMessage(), delegate.getMessage()); + Assertions.assertEquals(original.getCause(), delegate.getCause()); } @@ -235,7 +243,7 @@ private Exception getException(Enumeration elements) { } catch (Exception e) { return e; } - Assert.fail("NoSuchElementException"); + Assertions.fail("NoSuchElementException"); return null; } diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/FileUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/FileUtilsTest.java index 780768ca453c..5348e3489a74 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/FileUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/FileUtilsTest.java @@ -16,16 +16,15 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; import java.io.File; import java.io.IOException; import java.net.URL; -import static org.junit.Assert.assertEquals; - +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Woonduk Kang(emeroad) diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/HttpUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/HttpUtilsTest.java index 0e281d725b52..14a12c7df261 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/HttpUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/HttpUtilsTest.java @@ -16,20 +16,18 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Assert; - -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; - public class HttpUtilsTest { @Test public void contentTypeCharset1() { String test = "text/plain; charset=UTF-8"; String charset = HttpUtils.parseContentTypeCharset(test); - Assert.assertEquals(StandardCharsets.UTF_8.name(), charset); + Assertions.assertEquals(StandardCharsets.UTF_8.name(), charset); } @Test @@ -37,7 +35,7 @@ public void contentTypeCharset2() { String test = "text/plain; charset=UTF-8;"; String charset = HttpUtils.parseContentTypeCharset(test); - Assert.assertEquals(StandardCharsets.UTF_8.name(), charset); + Assertions.assertEquals(StandardCharsets.UTF_8.name(), charset); } @Test @@ -45,7 +43,7 @@ public void contentTypeCharset3() { String test = "text/plain; charset=UTF-8; test=a"; String charset = HttpUtils.parseContentTypeCharset(test); - Assert.assertEquals(StandardCharsets.UTF_8.name(), charset); + Assertions.assertEquals(StandardCharsets.UTF_8.name(), charset); } @Test @@ -53,7 +51,7 @@ public void contentTypeCharset4() { String test = "text/plain; charset= UTF-8 ; test=a"; String charset = HttpUtils.parseContentTypeCharset(test); - Assert.assertEquals(StandardCharsets.UTF_8.name(), charset); + Assertions.assertEquals(StandardCharsets.UTF_8.name(), charset); } } \ No newline at end of file diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/IOUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/IOUtilsTest.java index 382cdc70eae2..73c3bc956eab 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/IOUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/IOUtilsTest.java @@ -1,12 +1,12 @@ package com.navercorp.pinpoint.common.util; import org.apache.commons.lang3.RandomUtils; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.ByteArrayInputStream; import java.io.IOException; - public class IOUtilsTest { @Test @@ -91,7 +91,7 @@ public synchronized int read(byte[] b, int off, int len) { byte[] bytes = IOUtils.toByteArray(inputStream); - org.junit.Assert.assertArrayEquals(source, bytes); + Assertions.assertArrayEquals(source, bytes); } } diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/IdValidateUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/IdValidateUtilsTest.java index 0b45f8d642ca..97cbd0b537a8 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/IdValidateUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/IdValidateUtilsTest.java @@ -16,50 +16,50 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -public class IdValidateUtilsTest { +public class IdValidateUtilsTest { @Test public void testValidateId() { - Assert.assertTrue(IdValidateUtils.validateId("abcd")); - Assert.assertTrue(IdValidateUtils.validateId("ab-_bc")); - Assert.assertTrue(IdValidateUtils.validateId("test.abc")); + Assertions.assertTrue(IdValidateUtils.validateId("abcd")); + Assertions.assertTrue(IdValidateUtils.validateId("ab-_bc")); + Assertions.assertTrue(IdValidateUtils.validateId("test.abc")); - Assert.assertTrue(IdValidateUtils.validateId("--__")); + Assertions.assertTrue(IdValidateUtils.validateId("--__")); - Assert.assertFalse(IdValidateUtils.validateId("()")); + Assertions.assertFalse(IdValidateUtils.validateId("()")); - Assert.assertTrue(IdValidateUtils.validateId(".")); - Assert.assertFalse(IdValidateUtils.validateId("")); + Assertions.assertTrue(IdValidateUtils.validateId(".")); + Assertions.assertFalse(IdValidateUtils.validateId("")); - Assert.assertFalse(IdValidateUtils.validateId("한글")); // test with parameter written in Korean. + Assertions.assertFalse(IdValidateUtils.validateId("한글")); // test with parameter written in Korean. } @Test public void testValidateId_max_length() { - Assert.assertTrue("check max length", IdValidateUtils.validateId("0123456789012")); - Assert.assertTrue("check max length", IdValidateUtils.validateId("012345678901234567891234")); + Assertions.assertTrue(IdValidateUtils.validateId("0123456789012"), "check max length"); + Assertions.assertTrue(IdValidateUtils.validateId("012345678901234567891234"), "check max length"); - Assert.assertFalse("check max length", IdValidateUtils.validateId("0123456789012345678912345")); - Assert.assertFalse("check max length", IdValidateUtils.validateId("0123456789012345678912345")); - Assert.assertFalse("empty", IdValidateUtils.validateId("")); + Assertions.assertFalse(IdValidateUtils.validateId("0123456789012345678912345"), "check max length"); + Assertions.assertFalse(IdValidateUtils.validateId("0123456789012345678912345"), "check max length"); + Assertions.assertFalse(IdValidateUtils.validateId(""), "empty"); } @Test public void testValidateId_custom_max_length() { - Assert.assertTrue("check max length", IdValidateUtils.validateId("0", 1)); - Assert.assertFalse("check max length", IdValidateUtils.validateId("01", 1)); + Assertions.assertTrue(IdValidateUtils.validateId("0", 1), "check max length"); + Assertions.assertFalse(IdValidateUtils.validateId("01", 1), "check max length"); - Assert.assertTrue("check max length", IdValidateUtils.validateId("0", 2)); - Assert.assertFalse("check max length", IdValidateUtils.validateId("0123", 2)); + Assertions.assertTrue(IdValidateUtils.validateId("0", 2), "check max length"); + Assertions.assertFalse(IdValidateUtils.validateId("0123", 2), "check max length"); try { IdValidateUtils.validateId("0123", -1); - Assert.fail(); + Assertions.fail(); } catch (IllegalArgumentException ignored) { } } @@ -67,16 +67,16 @@ public void testValidateId_custom_max_length() { @Test public void testValidateId_offset() { String postFix = "agent^"; - Assert.assertTrue(IdValidateUtils.checkId(postFix, 0, postFix.length() - 1)); + Assertions.assertTrue(IdValidateUtils.checkId(postFix, 0, postFix.length() - 1)); String preFix = "^agent"; - Assert.assertTrue(IdValidateUtils.checkId(preFix, 1, preFix.length())); + Assertions.assertTrue(IdValidateUtils.checkId(preFix, 1, preFix.length())); String all = "^agent^"; - Assert.assertTrue(IdValidateUtils.checkId(all, 1, all.length() -1)); + Assertions.assertTrue(IdValidateUtils.checkId(all, 1, all.length() - 1)); String error = "^age&nt&"; - Assert.assertFalse(IdValidateUtils.checkId(error, 1, error.length())); + Assertions.assertFalse(IdValidateUtils.checkId(error, 1, error.length())); } diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/InetAddressUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/InetAddressUtilsTest.java index 016fc47f1718..117c39adc086 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/InetAddressUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/InetAddressUtilsTest.java @@ -16,9 +16,9 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; import java.net.InetAddress; import java.net.UnknownHostException; @@ -36,7 +36,7 @@ public void test() throws UnknownHostException { logger.debug("{}", byName); logger.debug("{}", byName.getAddress().length); - InetAddress ipv4= InetAddress.getByName("127.0.0.1"); + InetAddress ipv4 = InetAddress.getByName("127.0.0.1"); logger.debug("{}", ipv4); } } diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/JvmTypeTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/JvmTypeTest.java index 170a353222f6..bd8acbe05bb7 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/JvmTypeTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/JvmTypeTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author HyunGil Jeong @@ -27,40 +27,40 @@ public class JvmTypeTest { @Test public void fromVendorNullParameter() { JvmType actualType = JvmType.fromVendor(null); - Assert.assertSame(JvmType.UNKNOWN, actualType); + Assertions.assertSame(JvmType.UNKNOWN, actualType); } @Test public void fromVendorEmptyParameter() { JvmType actualType = JvmType.fromVendor(""); - Assert.assertSame(JvmType.UNKNOWN, actualType); + Assertions.assertSame(JvmType.UNKNOWN, actualType); } @Test public void fromVendorValidParameter() { - Assert.assertSame(JvmType.IBM, JvmType.fromVendor("IBM")); - Assert.assertSame(JvmType.IBM, JvmType.fromVendor("ibm")); - Assert.assertSame(JvmType.ORACLE, JvmType.fromVendor("Oracle")); - Assert.assertSame(JvmType.ORACLE, JvmType.fromVendor("oracle")); - Assert.assertSame(JvmType.OPENJDK, JvmType.fromVendor("OpenJDK")); - Assert.assertSame(JvmType.OPENJDK, JvmType.fromVendor("openjdk")); + Assertions.assertSame(JvmType.IBM, JvmType.fromVendor("IBM")); + Assertions.assertSame(JvmType.IBM, JvmType.fromVendor("ibm")); + Assertions.assertSame(JvmType.ORACLE, JvmType.fromVendor("Oracle")); + Assertions.assertSame(JvmType.ORACLE, JvmType.fromVendor("oracle")); + Assertions.assertSame(JvmType.OPENJDK, JvmType.fromVendor("OpenJDK")); + Assertions.assertSame(JvmType.OPENJDK, JvmType.fromVendor("openjdk")); } @Test public void fromVendorInvalidParameter() { - Assert.assertSame(JvmType.UNKNOWN, JvmType.fromVendor("Some Invalid Parameter")); + Assertions.assertSame(JvmType.UNKNOWN, JvmType.fromVendor("Some Invalid Parameter")); } @Test public void fromVmNameNullParameter() { JvmType actualType = JvmType.fromVendor(null); - Assert.assertSame(JvmType.UNKNOWN, actualType); + Assertions.assertSame(JvmType.UNKNOWN, actualType); } @Test public void fromVmNameEmptyParameter() { JvmType actualType = JvmType.fromVendor(""); - Assert.assertSame(JvmType.UNKNOWN, actualType); + Assertions.assertSame(JvmType.UNKNOWN, actualType); } @Test @@ -68,14 +68,14 @@ public void fromVmNameValidParameter() { final String openJdkJavaVmName = "OpenJDK 64-Bit Server VM"; final String oracleJavaVmName = "Java HotSpot(TM) 64-Bit Server VM"; final String ibmJavaVmName = "IBM J9 VM"; - Assert.assertSame(JvmType.OPENJDK, JvmType.fromVmName(openJdkJavaVmName)); - Assert.assertSame(JvmType.ORACLE, JvmType.fromVmName(oracleJavaVmName)); - Assert.assertSame(JvmType.IBM, JvmType.fromVmName(ibmJavaVmName)); + Assertions.assertSame(JvmType.OPENJDK, JvmType.fromVmName(openJdkJavaVmName)); + Assertions.assertSame(JvmType.ORACLE, JvmType.fromVmName(oracleJavaVmName)); + Assertions.assertSame(JvmType.IBM, JvmType.fromVmName(ibmJavaVmName)); } @Test public void fromVmNameInvalidParameter() { - Assert.assertSame(JvmType.UNKNOWN, JvmType.fromVmName("Some Invalid Parameter")); + Assertions.assertSame(JvmType.UNKNOWN, JvmType.fromVmName("Some Invalid Parameter")); } } diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/JvmUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/JvmUtilsTest.java index f936601d5b62..dac3bc365e1d 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/JvmUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/JvmUtilsTest.java @@ -16,9 +16,9 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/JvmVersionTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/JvmVersionTest.java index c8837e70a30b..c4274c53ebcd 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/JvmVersionTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/JvmVersionTest.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static com.navercorp.pinpoint.common.util.JvmVersion.JAVA_10; import static com.navercorp.pinpoint.common.util.JvmVersion.JAVA_11; @@ -27,9 +27,9 @@ import static com.navercorp.pinpoint.common.util.JvmVersion.JAVA_9; import static com.navercorp.pinpoint.common.util.JvmVersion.JAVA_RECENT; import static com.navercorp.pinpoint.common.util.JvmVersion.UNSUPPORTED; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author hyungil.jeong diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/LineNumberTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/LineNumberTest.java index 982ce2e43a6e..38dca1646bde 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/LineNumberTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/LineNumberTest.java @@ -1,22 +1,21 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Assert; -import org.junit.Test; - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class LineNumberTest { @Test public void isNoLineNumber() { - Assert.assertTrue(LineNumber.isNoLineNumber(0)); - Assert.assertTrue(LineNumber.isNoLineNumber(-1)); + Assertions.assertTrue(LineNumber.isNoLineNumber(0)); + Assertions.assertTrue(LineNumber.isNoLineNumber(-1)); } @Test public void isLineNumber() { - Assert.assertTrue(LineNumber.isLineNumber(1)); + Assertions.assertTrue(LineNumber.isLineNumber(1)); - Assert.assertFalse(LineNumber.isLineNumber(0)); - Assert.assertFalse(LineNumber.isLineNumber(-1)); + Assertions.assertFalse(LineNumber.isLineNumber(0)); + Assertions.assertFalse(LineNumber.isLineNumber(-1)); } } \ No newline at end of file diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/MapUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/MapUtilsTest.java index 9def572d80b7..d36936c451e8 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/MapUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/MapUtilsTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Collections; @@ -28,13 +28,13 @@ public class MapUtilsTest { @Test public void isEmpty() { - Assert.assertTrue(MapUtils.isEmpty(null)); - Assert.assertTrue(MapUtils.isEmpty(Collections.emptyMap())); + Assertions.assertTrue(MapUtils.isEmpty(null)); + Assertions.assertTrue(MapUtils.isEmpty(Collections.emptyMap())); } @Test public void isNotEmpty() { - Assert.assertFalse(MapUtils.hasLength(null)); - Assert.assertFalse(MapUtils.hasLength(Collections.emptyMap())); + Assertions.assertFalse(MapUtils.hasLength(null)); + Assertions.assertFalse(MapUtils.hasLength(Collections.emptyMap())); } } \ No newline at end of file diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/MathUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/MathUtilsTest.java index 8d76a770e6b6..54a873431b6e 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/MathUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/MathUtilsTest.java @@ -16,25 +16,22 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Assert; - -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; - -import com.navercorp.pinpoint.common.util.MathUtils; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad */ public class MathUtilsTest { private final Logger logger = LogManager.getLogger(this.getClass()); - + @Test public void fastAbs() { - Assert.assertTrue(MathUtils.fastAbs(-1) > 0); - Assert.assertTrue(MathUtils.fastAbs(0) == 0); - Assert.assertTrue(MathUtils.fastAbs(1) > 0); + Assertions.assertTrue(MathUtils.fastAbs(-1) > 0); + Assertions.assertTrue(MathUtils.fastAbs(0) == 0); + Assertions.assertTrue(MathUtils.fastAbs(1) > 0); } @Test @@ -54,31 +51,31 @@ public void overflow() { index++; } } - + @Test public void roundToNearestMultipleOf() { - Assert.assertEquals(1, MathUtils.roundToNearestMultipleOf(1, 1)); - Assert.assertEquals(4, MathUtils.roundToNearestMultipleOf(1, 4)); - Assert.assertEquals(4, MathUtils.roundToNearestMultipleOf(2, 4)); - Assert.assertEquals(4, MathUtils.roundToNearestMultipleOf(3, 4)); - Assert.assertEquals(4, MathUtils.roundToNearestMultipleOf(4, 4)); - Assert.assertEquals(4, MathUtils.roundToNearestMultipleOf(5, 4)); - Assert.assertEquals(8, MathUtils.roundToNearestMultipleOf(6, 4)); - Assert.assertEquals(8, MathUtils.roundToNearestMultipleOf(7, 4)); - Assert.assertEquals(8, MathUtils.roundToNearestMultipleOf(8, 4)); - Assert.assertEquals(10, MathUtils.roundToNearestMultipleOf(10, 5)); - Assert.assertEquals(10, MathUtils.roundToNearestMultipleOf(11, 5)); - Assert.assertEquals(10, MathUtils.roundToNearestMultipleOf(12, 5)); - Assert.assertEquals(15, MathUtils.roundToNearestMultipleOf(13, 5)); - Assert.assertEquals(15, MathUtils.roundToNearestMultipleOf(14, 5)); - Assert.assertEquals(15, MathUtils.roundToNearestMultipleOf(15, 5)); - Assert.assertEquals(15, MathUtils.roundToNearestMultipleOf(16, 5)); - Assert.assertEquals(15, MathUtils.roundToNearestMultipleOf(17, 5)); - Assert.assertEquals(20, MathUtils.roundToNearestMultipleOf(18, 5)); - Assert.assertEquals(20, MathUtils.roundToNearestMultipleOf(19, 5)); - Assert.assertEquals(20, MathUtils.roundToNearestMultipleOf(20, 5)); - Assert.assertEquals(5000, MathUtils.roundToNearestMultipleOf(6000, 5000)); - Assert.assertEquals(10000, MathUtils.roundToNearestMultipleOf(9000, 5000)); + Assertions.assertEquals(1, MathUtils.roundToNearestMultipleOf(1, 1)); + Assertions.assertEquals(4, MathUtils.roundToNearestMultipleOf(1, 4)); + Assertions.assertEquals(4, MathUtils.roundToNearestMultipleOf(2, 4)); + Assertions.assertEquals(4, MathUtils.roundToNearestMultipleOf(3, 4)); + Assertions.assertEquals(4, MathUtils.roundToNearestMultipleOf(4, 4)); + Assertions.assertEquals(4, MathUtils.roundToNearestMultipleOf(5, 4)); + Assertions.assertEquals(8, MathUtils.roundToNearestMultipleOf(6, 4)); + Assertions.assertEquals(8, MathUtils.roundToNearestMultipleOf(7, 4)); + Assertions.assertEquals(8, MathUtils.roundToNearestMultipleOf(8, 4)); + Assertions.assertEquals(10, MathUtils.roundToNearestMultipleOf(10, 5)); + Assertions.assertEquals(10, MathUtils.roundToNearestMultipleOf(11, 5)); + Assertions.assertEquals(10, MathUtils.roundToNearestMultipleOf(12, 5)); + Assertions.assertEquals(15, MathUtils.roundToNearestMultipleOf(13, 5)); + Assertions.assertEquals(15, MathUtils.roundToNearestMultipleOf(14, 5)); + Assertions.assertEquals(15, MathUtils.roundToNearestMultipleOf(15, 5)); + Assertions.assertEquals(15, MathUtils.roundToNearestMultipleOf(16, 5)); + Assertions.assertEquals(15, MathUtils.roundToNearestMultipleOf(17, 5)); + Assertions.assertEquals(20, MathUtils.roundToNearestMultipleOf(18, 5)); + Assertions.assertEquals(20, MathUtils.roundToNearestMultipleOf(19, 5)); + Assertions.assertEquals(20, MathUtils.roundToNearestMultipleOf(20, 5)); + Assertions.assertEquals(5000, MathUtils.roundToNearestMultipleOf(6000, 5000)); + Assertions.assertEquals(10000, MathUtils.roundToNearestMultipleOf(9000, 5000)); } } diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/NetUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/NetUtilsTest.java index 95d1ad9158ea..3ff4b6f87413 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/NetUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/NetUtilsTest.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.InetSocketAddress; @@ -13,20 +13,20 @@ public class NetUtilsTest { @Test public void toInetSocketAddress() { InetSocketAddress inetSocketAddress = NetUtils.toInetSocketAddress("192.168.0.1:8081"); - Assert.assertEquals(inetSocketAddress.getHostName(), "192.168.0.1"); - Assert.assertEquals(inetSocketAddress.getPort(), 8081); + Assertions.assertEquals(inetSocketAddress.getHostName(), "192.168.0.1"); + Assertions.assertEquals(inetSocketAddress.getPort(), 8081); } @Test public void toInetSocketAddress_miss_port1() { InetSocketAddress inetSocketAddress = NetUtils.toInetSocketAddress("192.168.0.1"); - Assert.assertNull(inetSocketAddress); + Assertions.assertNull(inetSocketAddress); } @Test public void toInetSocketAddress_miss_port2() { InetSocketAddress inetSocketAddress = NetUtils.toInetSocketAddress("192.168.0.1:"); - Assert.assertNull(inetSocketAddress); + Assertions.assertNull(inetSocketAddress); } } \ No newline at end of file diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/OsEnvSimplePropertyTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/OsEnvSimplePropertyTest.java index 91d224c13b9a..70a217cd0454 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/OsEnvSimplePropertyTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/OsEnvSimplePropertyTest.java @@ -1,11 +1,11 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; - public class OsEnvSimplePropertyTest { @Test @@ -14,7 +14,7 @@ public void test() { String ip = "1.1.1.1"; map.put("PROFILER_TRANSPORT_GRPC_COLLECTOR_IP", ip); OsEnvSimpleProperty osenv = new OsEnvSimpleProperty(map); - org.junit.Assert.assertEquals(ip, osenv.getProperty("profiler.transport.grpc.collector.ip")); + Assertions.assertEquals(ip, osenv.getProperty("profiler.transport.grpc.collector.ip")); } } \ No newline at end of file diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/OsTypeTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/OsTypeTest.java index 24c879befe93..2cfbc7c3e4ea 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/OsTypeTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/OsTypeTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.EnumSet; @@ -29,41 +29,41 @@ public class OsTypeTest { @Test public void fromVendorNullParameter() { OsType actualType = OsType.fromVendor(null); - Assert.assertSame(OsType.UNKNOWN, actualType); + Assertions.assertSame(OsType.UNKNOWN, actualType); } @Test public void fromVendorEmptyParameter() { OsType actualType = OsType.fromVendor(""); - Assert.assertSame(OsType.UNKNOWN, actualType); + Assertions.assertSame(OsType.UNKNOWN, actualType); } @Test public void fromVendorValidParameter() { - Assert.assertSame(OsType.WINDOW, OsType.fromVendor("window")); - Assert.assertSame(OsType.MAC, OsType.fromVendor("mac")); - Assert.assertSame(OsType.LINUX, OsType.fromVendor("linux")); - Assert.assertSame(OsType.SOLARIS, OsType.fromVendor("SOLARIS")); - Assert.assertSame(OsType.AIX, OsType.fromVendor("aix")); - Assert.assertSame(OsType.HP_UX, OsType.fromVendor("HP_Ux")); - Assert.assertSame(OsType.BSD, OsType.fromVendor("bsd")); + Assertions.assertSame(OsType.WINDOW, OsType.fromVendor("window")); + Assertions.assertSame(OsType.MAC, OsType.fromVendor("mac")); + Assertions.assertSame(OsType.LINUX, OsType.fromVendor("linux")); + Assertions.assertSame(OsType.SOLARIS, OsType.fromVendor("SOLARIS")); + Assertions.assertSame(OsType.AIX, OsType.fromVendor("aix")); + Assertions.assertSame(OsType.HP_UX, OsType.fromVendor("HP_Ux")); + Assertions.assertSame(OsType.BSD, OsType.fromVendor("bsd")); } @Test public void fromVendorInvalidParameter() { - Assert.assertSame(OsType.UNKNOWN, OsType.fromVendor("Some Invalid Parameter")); + Assertions.assertSame(OsType.UNKNOWN, OsType.fromVendor("Some Invalid Parameter")); } @Test public void fromOsNameNullParameter() { OsType actualType = OsType.fromOsName(null); - Assert.assertSame(OsType.UNKNOWN, actualType); + Assertions.assertSame(OsType.UNKNOWN, actualType); } @Test public void fromOsNameEmptyParameter() { OsType actualType = OsType.fromOsName(""); - Assert.assertSame(OsType.UNKNOWN, actualType); + Assertions.assertSame(OsType.UNKNOWN, actualType); } @Test @@ -73,16 +73,16 @@ public void fromOsNameValidParameter() { final String linuxOsName = "Linux"; final String solarisOsName = "Solaris"; final String hpOsName = "HP-Ux"; - Assert.assertSame(OsType.WINDOW, OsType.fromOsName(windowOsName)); - Assert.assertSame(OsType.MAC, OsType.fromOsName(macOsName)); - Assert.assertSame(OsType.LINUX, OsType.fromOsName(linuxOsName)); - Assert.assertSame(OsType.SOLARIS, OsType.fromOsName(solarisOsName)); - Assert.assertSame(OsType.HP_UX, OsType.fromOsName(hpOsName)); + Assertions.assertSame(OsType.WINDOW, OsType.fromOsName(windowOsName)); + Assertions.assertSame(OsType.MAC, OsType.fromOsName(macOsName)); + Assertions.assertSame(OsType.LINUX, OsType.fromOsName(linuxOsName)); + Assertions.assertSame(OsType.SOLARIS, OsType.fromOsName(solarisOsName)); + Assertions.assertSame(OsType.HP_UX, OsType.fromOsName(hpOsName)); } @Test public void fromOsNameInvalidParameter() { - Assert.assertSame(OsType.UNKNOWN, OsType.fromOsName("Some Invalid Parameter")); + Assertions.assertSame(OsType.UNKNOWN, OsType.fromOsName("Some Invalid Parameter")); } @Test @@ -99,8 +99,8 @@ public void testInvalidOSName() { continue; } - if(osType.getInclusiveString().toLowerCase().contains(osType2.getInclusiveString().toLowerCase())) { - Assert.fail("May cause duplicate Os types, check list of OsType"); + if (osType.getInclusiveString().toLowerCase().contains(osType2.getInclusiveString().toLowerCase())) { + Assertions.fail("May cause duplicate Os types, check list of OsType"); } } } diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/OsUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/OsUtilsTest.java index 2a96c53ade0b..de3e40b12a01 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/OsUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/OsUtilsTest.java @@ -16,9 +16,9 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; /** * @author Roy Kim diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/PropertyUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/PropertyUtilsTest.java index 29a3ba4b0033..19f3660f1b5b 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/PropertyUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/PropertyUtilsTest.java @@ -16,14 +16,13 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Assert; - -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.URL; import java.util.Properties; -public class PropertyUtilsTest { +public class PropertyUtilsTest { @Test public void testLoadProperty() throws Exception { @@ -42,6 +41,6 @@ public void testLoadPropertyFromClassPath() throws Exception { private void assertProperty(Properties properties) { String test = properties.getProperty("test"); - Assert.assertEquals("pinpoint", test); + Assertions.assertEquals("pinpoint", test); } } \ No newline at end of file diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/StringJoinUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/StringJoinUtilsTest.java index a86781f31edf..ddd554a24a91 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/StringJoinUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/StringJoinUtilsTest.java @@ -16,14 +16,12 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.*; - /** * @author Woonduk Kang(emeroad) */ @@ -35,7 +33,7 @@ public void join1() { stringList.add("abc"); String join = StringJoinUtils.join(stringList, ","); - Assert.assertEquals(join, "abc"); + Assertions.assertEquals(join, "abc"); } @@ -46,7 +44,7 @@ public void join2() { stringList.add("bcd"); String join = StringJoinUtils.join(stringList, ","); - Assert.assertEquals(join, "abc,bcd"); + Assertions.assertEquals(join, "abc,bcd"); } @@ -58,7 +56,7 @@ public void join3() { stringList.add("f"); String join = StringJoinUtils.join(stringList, ","); - Assert.assertEquals(join, "abc,bcd,f"); + Assertions.assertEquals(join, "abc,bcd,f"); } } \ No newline at end of file diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/StringTraceHeaderParserTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/StringTraceHeaderParserTest.java index d3b2a84e555a..57600bc09699 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/StringTraceHeaderParserTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/StringTraceHeaderParserTest.java @@ -16,11 +16,10 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; - +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.UUID; @@ -31,7 +30,7 @@ public class StringTraceHeaderParserTest { private final Logger logger = LogManager.getLogger(this.getClass()); - private final StringTraceHeaderParser parser= new StringTraceHeaderParser(); + private final StringTraceHeaderParser parser = new StringTraceHeaderParser(); @Test public void getIdSize() { @@ -48,16 +47,15 @@ public void createStringBaseTraceHeader() { } - private void createAndParser(String uuid, int spanId, int pSpanId, int sampling, short flag) { String traceHeader = parser.createHeader(uuid, spanId, pSpanId, sampling, flag); TraceHeader header = parser.parseHeader(traceHeader); - Assert.assertEquals("id", uuid, header.getId()); - Assert.assertEquals("spanId", String.valueOf(spanId), header.getSpanId()); - Assert.assertEquals("pSpanId", String.valueOf(pSpanId), header.getParentSpanId()); - Assert.assertEquals("sampling", String.valueOf(sampling), header.getSampling()); - Assert.assertEquals("flag", String.valueOf(flag), header.getFlag()); + Assertions.assertEquals(uuid, header.getId(), "id"); + Assertions.assertEquals(String.valueOf(spanId), header.getSpanId(), "spanId"); + Assertions.assertEquals(String.valueOf(pSpanId), header.getParentSpanId(), "pSpanId"); + Assertions.assertEquals(String.valueOf(sampling), header.getSampling(), "sampling"); + Assertions.assertEquals(String.valueOf(flag), header.getFlag(), "flag"); logger.debug("parse:{}", header); } } diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/StringUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/StringUtilsTest.java index 2a7d66d1ed98..08d4d7da1a17 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/StringUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/StringUtilsTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; @@ -34,18 +34,18 @@ public class StringUtilsTest { @Test public void defaultString() { - Assert.assertNull(StringUtils.defaultString(null, null)); - Assert.assertEquals(StringUtils.defaultString(null, shortString), shortString); - Assert.assertEquals(StringUtils.defaultString(shortString, null), shortString); - Assert.assertEquals(StringUtils.defaultString(shortString, shortString), shortString); + Assertions.assertNull(StringUtils.defaultString(null, null)); + Assertions.assertEquals(StringUtils.defaultString(null, shortString), shortString); + Assertions.assertEquals(StringUtils.defaultString(shortString, null), shortString); + Assertions.assertEquals(StringUtils.defaultString(shortString, shortString), shortString); } @Test public void defaultIfEmpty() { - Assert.assertNull(StringUtils.defaultIfEmpty("", null)); - Assert.assertEquals(StringUtils.defaultIfEmpty("", shortString), shortString); - Assert.assertEquals(StringUtils.defaultIfEmpty(shortString, null), shortString); - Assert.assertEquals(StringUtils.defaultIfEmpty(shortString, shortString), shortString); + Assertions.assertNull(StringUtils.defaultIfEmpty("", null)); + Assertions.assertEquals(StringUtils.defaultIfEmpty("", shortString), shortString); + Assertions.assertEquals(StringUtils.defaultIfEmpty(shortString, null), shortString); + Assertions.assertEquals(StringUtils.defaultIfEmpty(shortString, shortString), shortString); } @@ -53,41 +53,41 @@ public void defaultIfEmpty() { public void toStringTest() { int[] array = {0, 1}; - Assert.assertEquals(StringUtils.toString(null), "null"); - Assert.assertEquals(StringUtils.toString(1), "1"); - Assert.assertEquals(StringUtils.toString(1234.567), "1234.567"); - Assert.assertEquals(StringUtils.toString(shortString), shortString); - Assert.assertEquals(StringUtils.toString(array), array.toString()); + Assertions.assertEquals(StringUtils.toString(null), "null"); + Assertions.assertEquals(StringUtils.toString(1), "1"); + Assertions.assertEquals(StringUtils.toString(1234.567), "1234.567"); + Assertions.assertEquals(StringUtils.toString(shortString), shortString); + Assertions.assertEquals(StringUtils.toString(array), array.toString()); } @Test public void abbreviate() { - Assert.assertEquals(StringUtils.abbreviate(null), "null"); - Assert.assertEquals(StringUtils.abbreviate(null, 4), "null"); - Assert.assertEquals(StringUtils.abbreviate(null, 0), "null"); - Assert.assertEquals(StringUtils.abbreviate(null, -4), "null"); + Assertions.assertEquals(StringUtils.abbreviate(null), "null"); + Assertions.assertEquals(StringUtils.abbreviate(null, 4), "null"); + Assertions.assertEquals(StringUtils.abbreviate(null, 0), "null"); + Assertions.assertEquals(StringUtils.abbreviate(null, -4), "null"); - Assert.assertEquals(StringUtils.abbreviate(longString), "This is a very long string for testing drop function. Length of ...(100)"); - Assert.assertEquals(StringUtils.abbreviate(longString, 4), "This...(100)"); - Assert.assertEquals(StringUtils.abbreviate(longString, 0), "...(100)"); + Assertions.assertEquals(StringUtils.abbreviate(longString), "This is a very long string for testing drop function. Length of ...(100)"); + Assertions.assertEquals(StringUtils.abbreviate(longString, 4), "This...(100)"); + Assertions.assertEquals(StringUtils.abbreviate(longString, 0), "...(100)"); try { StringUtils.abbreviate(longString, -4); - Assert.fail(); + Assertions.fail(); } catch (IllegalArgumentException ignored) { } catch (Exception e) { - Assert.fail(); + Assertions.fail(); } - Assert.assertEquals(StringUtils.abbreviate(shortString), shortString); - Assert.assertEquals(StringUtils.abbreviate(shortString, 4), "This...(22)"); - Assert.assertEquals(StringUtils.abbreviate(shortString, 0), "...(22)"); + Assertions.assertEquals(StringUtils.abbreviate(shortString), shortString); + Assertions.assertEquals(StringUtils.abbreviate(shortString, 4), "This...(22)"); + Assertions.assertEquals(StringUtils.abbreviate(shortString, 0), "...(22)"); try { StringUtils.abbreviate(shortString, -4); - Assert.fail(); + Assertions.fail(); } catch (IllegalArgumentException ignored) { } catch (Exception e) { - Assert.fail(); + Assertions.fail(); } } @@ -96,19 +96,19 @@ public void appendAbbreviate() { StringBuilder buffer = new StringBuilder(); StringUtils.appendAbbreviate(buffer, null, 4); - Assert.assertEquals(buffer.toString(), ""); + Assertions.assertEquals(buffer.toString(), ""); StringUtils.appendAbbreviate(buffer, null, 0); - Assert.assertEquals(buffer.toString(), ""); + Assertions.assertEquals(buffer.toString(), ""); StringUtils.appendAbbreviate(buffer, null, -4); - Assert.assertEquals(buffer.toString(), ""); + Assertions.assertEquals(buffer.toString(), ""); StringUtils.appendAbbreviate(buffer, shortString, 4); - Assert.assertEquals(buffer.toString(), "This...(22)"); + Assertions.assertEquals(buffer.toString(), "This...(22)"); StringUtils.appendAbbreviate(buffer, longString, 16); - Assert.assertEquals(buffer.toString(), "This...(22)This is a very l...(100)"); + Assertions.assertEquals(buffer.toString(), "This...(22)This is a very l...(100)"); } @@ -116,28 +116,28 @@ public void appendAbbreviate() { public void testAbbreviate1() { String string = "abc"; String drop = StringUtils.abbreviate(string, 1); - Assert.assertEquals("a...(3)", drop); + Assertions.assertEquals("a...(3)", drop); } @Test public void testAbbreviate2() { String string = "abc"; String drop = StringUtils.abbreviate(string, 5); - Assert.assertEquals("abc", drop); + Assertions.assertEquals("abc", drop); } @Test public void testAbbreviate3() { String string = "abc"; String drop = StringUtils.abbreviate(string, 3); - Assert.assertEquals("abc", drop); + Assertions.assertEquals("abc", drop); } @Test public void testAbbreviate4() { String string = "abc"; String drop = StringUtils.abbreviate(string, 0); - Assert.assertEquals("...(3)", drop); + Assertions.assertEquals("...(3)", drop); } @@ -146,7 +146,7 @@ public void testAbbreviateNegative() { String string = "abc"; try { StringUtils.abbreviate(string, -1); - Assert.fail(); + Assertions.fail(); } catch (Exception ignored) { // skip } @@ -154,10 +154,10 @@ public void testAbbreviateNegative() { @Test public void testIsEmpty() { - Assert.assertTrue(StringUtils.isEmpty("")); - Assert.assertTrue(StringUtils.isEmpty(null)); + Assertions.assertTrue(StringUtils.isEmpty("")); + Assertions.assertTrue(StringUtils.isEmpty(null)); - Assert.assertFalse(StringUtils.isEmpty("a")); + Assertions.assertFalse(StringUtils.isEmpty("a")); } @Test @@ -165,7 +165,7 @@ public void testTokenizeToStringList() { final String sample = "a, b, ,, c"; List tokenList = StringUtils.tokenizeToStringList(sample, ","); - Assert.assertEquals(Arrays.asList("a", "b", "c"), tokenList); + Assertions.assertEquals(Arrays.asList("a", "b", "c"), tokenList); } @@ -178,7 +178,7 @@ public void testTokenizeToStringList_compatibility() { List tokenList = StringUtils.tokenizeToStringList(sample, ","); List backup_splitAndTrim = backup_splitAndTrim(sample, ","); - Assert.assertEquals(tokenList, backup_splitAndTrim); + Assertions.assertEquals(tokenList, backup_splitAndTrim); } @@ -186,7 +186,7 @@ public void testTokenizeToStringList_compatibility() { public void testTokenizeToStringList_nullValue() { List tokenList = StringUtils.tokenizeToStringList(null, ","); - Assert.assertEquals(tokenList.size(), 0); + Assertions.assertEquals(tokenList.size(), 0); } @@ -215,47 +215,47 @@ private static List backup_splitAndTrim(String value, String separator) @Test public void testGetLength() { - Assert.assertEquals(StringUtils.getLength(null), 0); + Assertions.assertEquals(StringUtils.getLength(null), 0); - Assert.assertEquals(StringUtils.getLength(""), 0); - Assert.assertEquals(StringUtils.getLength("abc"), 3); + Assertions.assertEquals(StringUtils.getLength(""), 0); + Assertions.assertEquals(StringUtils.getLength("abc"), 3); } @Test public void testGetLength_defaultNull() { - Assert.assertEquals(StringUtils.getLength(null, -1), -1); + Assertions.assertEquals(StringUtils.getLength(null, -1), -1); - Assert.assertEquals(StringUtils.getLength("", -1), 0); - Assert.assertEquals(StringUtils.getLength("abc"), 3); + Assertions.assertEquals(StringUtils.getLength("", -1), 0); + Assertions.assertEquals(StringUtils.getLength("abc"), 3); } @Test public void testHasLength() { - Assert.assertTrue(StringUtils.hasLength("1")); - Assert.assertTrue(StringUtils.hasLength(" ")); + Assertions.assertTrue(StringUtils.hasLength("1")); + Assertions.assertTrue(StringUtils.hasLength(" ")); - Assert.assertFalse(StringUtils.hasLength(null)); - Assert.assertFalse(StringUtils.hasLength("")); + Assertions.assertFalse(StringUtils.hasLength(null)); + Assertions.assertFalse(StringUtils.hasLength("")); } @Test public void testHasText() { - Assert.assertTrue(StringUtils.hasText("1")); - Assert.assertTrue(StringUtils.hasText(" 1")); + Assertions.assertTrue(StringUtils.hasText("1")); + Assertions.assertTrue(StringUtils.hasText(" 1")); - Assert.assertFalse(StringUtils.hasText(null)); - Assert.assertFalse(StringUtils.hasText("")); - Assert.assertFalse(StringUtils.hasText(" ")); + Assertions.assertFalse(StringUtils.hasText(null)); + Assertions.assertFalse(StringUtils.hasText("")); + Assertions.assertFalse(StringUtils.hasText(" ")); } @Test public void abbreviateBufferSize() { - Assert.assertEquals("a...(123)".length(), StringUtils.abbreviateBufferSize(1, 123)); + Assertions.assertEquals("a...(123)".length(), StringUtils.abbreviateBufferSize(1, 123)); } diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/ThreadMXBeanUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/ThreadMXBeanUtilsTest.java index 9038835bd566..7a091431fb07 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/ThreadMXBeanUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/ThreadMXBeanUtilsTest.java @@ -16,11 +16,10 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Assert; - -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.lang.management.ThreadInfo; import java.util.Arrays; @@ -33,7 +32,7 @@ public class ThreadMXBeanUtilsTest { public void testName() { ThreadInfo[] threadInfos = ThreadMXBeanUtils.dumpAllThread(); - Assert.assertNotNull(threadInfos); + Assertions.assertNotNull(threadInfos); logger.trace("thread:{}", Arrays.toString(threadInfos)); } @@ -48,22 +47,22 @@ public void testHasThreadName() { String threadName = "ThreadMXBeanUtils-test-thread"; - Assert.assertFalse(ThreadMXBeanUtils.findThreadName(threadName)); + Assertions.assertFalse(ThreadMXBeanUtils.findThreadName(threadName)); WaitingRunnable waiting = new WaitingRunnable(); Thread thread = new Thread(waiting, threadName); thread.start(); - Assert.assertTrue(ThreadMXBeanUtils.findThreadName(threadName)); + Assertions.assertTrue(ThreadMXBeanUtils.findThreadName(threadName)); waiting.stop(); try { thread.join(2000); } catch (InterruptedException e) { - Assert.fail(); + Assertions.fail(); } - Assert.assertFalse(ThreadMXBeanUtils.findThreadName(threadName)); + Assertions.assertFalse(ThreadMXBeanUtils.findThreadName(threadName)); } private static class WaitingRunnable implements Runnable { diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/TimeUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/TimeUtilsTest.java index 03e51856c3e8..c6b11deb6bf9 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/TimeUtilsTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/TimeUtilsTest.java @@ -16,11 +16,8 @@ package com.navercorp.pinpoint.common.util; -import org.junit.Assert; - -import org.junit.Test; - -import com.navercorp.pinpoint.common.util.TimeUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -32,7 +29,7 @@ public void testReverseCurrentTimeMillis() throws Exception { long reverseTime = TimeUtils.reverseTimeMillis(currentTime); long recoveryTime = TimeUtils.recoveryTimeMillis(reverseTime); - Assert.assertEquals(currentTime, recoveryTime); + Assertions.assertEquals(currentTime, recoveryTime); } @Test @@ -41,7 +38,7 @@ public void testTimeOrder() throws InterruptedException { Thread.sleep(5); long l2 = TimeUtils.reverseCurrentTimeMillis(); - Assert.assertTrue(l1 > l2); + Assertions.assertTrue(l1 > l2); } } diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/logger/StdoutCommonLoggerTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/logger/StdoutCommonLoggerTest.java index 9edc67d50c4a..ca09e97d03d2 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/logger/StdoutCommonLoggerTest.java +++ b/commons/src/test/java/com/navercorp/pinpoint/common/util/logger/StdoutCommonLoggerTest.java @@ -17,10 +17,10 @@ package com.navercorp.pinpoint.common.util.logger; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -56,7 +56,7 @@ public void testLogging() { private void assertMessage(String out, String message) { logger.debug("log-message {}", out); - Assert.assertTrue(out.contains(message)); + Assertions.assertTrue(out.contains(message)); } diff --git a/flink/src/test/java/com/navercorp/pinpoint/flink/config/FlinkConfigurationTest.java b/flink/src/test/java/com/navercorp/pinpoint/flink/config/FlinkConfigurationTest.java index d8147a4eb6ac..9b577b3869ee 100644 --- a/flink/src/test/java/com/navercorp/pinpoint/flink/config/FlinkConfigurationTest.java +++ b/flink/src/test/java/com/navercorp/pinpoint/flink/config/FlinkConfigurationTest.java @@ -17,18 +17,18 @@ package com.navercorp.pinpoint.flink.config; import com.navercorp.pinpoint.common.server.cluster.zookeeper.config.ClusterConfigurationFactory; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; /** * @author Woonduk Kang(emeroad) */ @ContextConfiguration(classes = {FlinkConfiguration.class, ClusterConfigurationFactory.class}) -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) public class FlinkConfigurationTest { @Autowired private FlinkConfiguration flinkConfiguration; diff --git a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinAgentStatBoMapperTest.java b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinAgentStatBoMapperTest.java index e7f3e52809d6..afd35965ea90 100644 --- a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinAgentStatBoMapperTest.java +++ b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinAgentStatBoMapperTest.java @@ -37,13 +37,12 @@ import com.navercorp.pinpoint.thrift.dto.flink.TFTotalThreadCount; import com.navercorp.pinpoint.thrift.dto.flink.TFTransaction; import com.navercorp.pinpoint.thrift.dto.flink.TFLoadedClass; - -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinDataSourceListBoMapperTest.java b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinDataSourceListBoMapperTest.java index b437539270ba..9d9506745e34 100644 --- a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinDataSourceListBoMapperTest.java +++ b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinDataSourceListBoMapperTest.java @@ -22,12 +22,12 @@ import com.navercorp.pinpoint.thrift.dto.flink.TFAgentStat; import com.navercorp.pinpoint.thrift.dto.flink.TFDataSource; import com.navercorp.pinpoint.thrift.dto.flink.TFDataSourceList; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinDirectBufferBoMapperTest.java b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinDirectBufferBoMapperTest.java index 78ad246b718e..50679a5a30a6 100644 --- a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinDirectBufferBoMapperTest.java +++ b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinDirectBufferBoMapperTest.java @@ -20,10 +20,10 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLongFieldBo; import com.navercorp.pinpoint.thrift.dto.flink.TFAgentStat; import com.navercorp.pinpoint.thrift.dto.flink.TFDirectBuffer; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author Roy Kim diff --git a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinFileDescriptorBoMapperTest.java b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinFileDescriptorBoMapperTest.java index 898d1729687b..1ecd5f5d6d2b 100644 --- a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinFileDescriptorBoMapperTest.java +++ b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinFileDescriptorBoMapperTest.java @@ -19,10 +19,10 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinFileDescriptorBo; import com.navercorp.pinpoint.thrift.dto.flink.TFAgentStat; import com.navercorp.pinpoint.thrift.dto.flink.TFFileDescriptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author Roy Kim diff --git a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinLoadedClassBoMapperTest.java b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinLoadedClassBoMapperTest.java index a387196ab054..ea4dcf9a41c5 100644 --- a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinLoadedClassBoMapperTest.java +++ b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinLoadedClassBoMapperTest.java @@ -20,10 +20,10 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLongFieldBo; import com.navercorp.pinpoint.thrift.dto.flink.TFAgentStat; import com.navercorp.pinpoint.thrift.dto.flink.TFLoadedClass; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class JoinLoadedClassBoMapperTest { @Test diff --git a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinMemoryBoMapperTest.java b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinMemoryBoMapperTest.java index 17cda87860cd..1bbabb901cfa 100644 --- a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinMemoryBoMapperTest.java +++ b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinMemoryBoMapperTest.java @@ -20,10 +20,9 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinMemoryBo; import com.navercorp.pinpoint.thrift.dto.flink.TFAgentStat; import com.navercorp.pinpoint.thrift.dto.flink.TFJvmGc; +import org.junit.jupiter.api.Test; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinResponseTimeBoMapperTest.java b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinResponseTimeBoMapperTest.java index 9ff72c070ae3..db0e9aa29e3b 100644 --- a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinResponseTimeBoMapperTest.java +++ b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinResponseTimeBoMapperTest.java @@ -20,10 +20,9 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinResponseTimeBo; import com.navercorp.pinpoint.thrift.dto.flink.TFAgentStat; import com.navercorp.pinpoint.thrift.dto.flink.TFResponseTime; +import org.junit.jupiter.api.Test; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinThriftActiveTraceBoMapperTest.java b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinThriftActiveTraceBoMapperTest.java index 42240612787d..ec64a13403f4 100644 --- a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinThriftActiveTraceBoMapperTest.java +++ b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinThriftActiveTraceBoMapperTest.java @@ -21,12 +21,13 @@ import com.navercorp.pinpoint.thrift.dto.flink.TFActiveTrace; import com.navercorp.pinpoint.thrift.dto.flink.TFActiveTraceHistogram; import com.navercorp.pinpoint.thrift.dto.flink.TFAgentStat; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author minwoo.jung @@ -46,7 +47,7 @@ public void mapTest() throws Exception { activeTraceCount.add(20); activeTraceCount.add(40); activeTraceCount.add(50); - tFActiveTraceHistogram.setVersion((short)2); + tFActiveTraceHistogram.setVersion((short) 2); tFActiveTraceHistogram.setHistogramSchemaType(1); tFActiveTraceHistogram.setActiveTraceCount(activeTraceCount); diff --git a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinThriftCpuLoadBoMapperTest.java b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinThriftCpuLoadBoMapperTest.java index b524865bce84..e45b8305c661 100644 --- a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinThriftCpuLoadBoMapperTest.java +++ b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinThriftCpuLoadBoMapperTest.java @@ -20,11 +20,10 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinDoubleFieldBo; import com.navercorp.pinpoint.thrift.dto.flink.TFAgentStat; import com.navercorp.pinpoint.thrift.dto.flink.TFCpuLoad; +import org.junit.jupiter.api.Test; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author minwoo.jung diff --git a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinTotalThreadCountBoMapperTest.java b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinTotalThreadCountBoMapperTest.java index 39e68c2a4c3b..62e50aa0f432 100644 --- a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinTotalThreadCountBoMapperTest.java +++ b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinTotalThreadCountBoMapperTest.java @@ -20,10 +20,10 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinTotalThreadCountBo; import com.navercorp.pinpoint.thrift.dto.flink.TFAgentStat; import com.navercorp.pinpoint.thrift.dto.flink.TFTotalThreadCount; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; public class JoinTotalThreadCountBoMapperTest { @Test diff --git a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinTransactionBoMapperTest.java b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinTransactionBoMapperTest.java index 87b8d9bdb9e8..4efd277bc869 100644 --- a/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinTransactionBoMapperTest.java +++ b/flink/src/test/java/com/navercorp/pinpoint/flink/mapper/thrift/stat/JoinTransactionBoMapperTest.java @@ -20,11 +20,10 @@ import com.navercorp.pinpoint.common.server.bo.stat.join.JoinTransactionBo; import com.navercorp.pinpoint.thrift.dto.flink.TFAgentStat; import com.navercorp.pinpoint.thrift.dto.flink.TFTransaction; +import org.junit.jupiter.api.Test; -import org.junit.Test; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author minwoo.jung diff --git a/flink/src/test/java/com/navercorp/pinpoint/flink/process/TBaseFlatMapperTest.java b/flink/src/test/java/com/navercorp/pinpoint/flink/process/TBaseFlatMapperTest.java index 43eb95a2822d..98826b7c3a62 100644 --- a/flink/src/test/java/com/navercorp/pinpoint/flink/process/TBaseFlatMapperTest.java +++ b/flink/src/test/java/com/navercorp/pinpoint/flink/process/TBaseFlatMapperTest.java @@ -16,17 +16,7 @@ package com.navercorp.pinpoint.flink.process; -import com.navercorp.pinpoint.common.server.bo.stat.join.JoinAgentStatBo; -import com.navercorp.pinpoint.common.server.bo.stat.join.JoinApplicationStatBo; -import com.navercorp.pinpoint.common.server.bo.stat.join.JoinCpuLoadBo; -import com.navercorp.pinpoint.common.server.bo.stat.join.JoinDirectBufferBo; -import com.navercorp.pinpoint.common.server.bo.stat.join.JoinDoubleFieldBo; -import com.navercorp.pinpoint.common.server.bo.stat.join.JoinFileDescriptorBo; -import com.navercorp.pinpoint.common.server.bo.stat.join.JoinLongFieldBo; -import com.navercorp.pinpoint.common.server.bo.stat.join.JoinMemoryBo; -import com.navercorp.pinpoint.common.server.bo.stat.join.JoinStatBo; -import com.navercorp.pinpoint.common.server.bo.stat.join.JoinTransactionBo; -import com.navercorp.pinpoint.common.server.bo.stat.join.StatType; +import com.navercorp.pinpoint.common.server.bo.stat.join.*; import com.navercorp.pinpoint.flink.mapper.thrift.stat.JoinAgentStatBoMapper; import com.navercorp.pinpoint.flink.vo.RawData; import com.navercorp.pinpoint.thrift.dto.flink.TFAgentStat; @@ -36,10 +26,9 @@ import com.navercorp.pinpoint.thrift.dto.flink.TFFileDescriptor; import com.navercorp.pinpoint.thrift.dto.flink.TFJvmGc; import com.navercorp.pinpoint.thrift.dto.flink.TFTransaction; - import org.apache.flink.api.common.functions.util.ListCollector; import org.apache.flink.api.java.tuple.Tuple3; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; @@ -47,12 +36,11 @@ import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; - /** * @author minwoo.jung */ @@ -97,7 +85,7 @@ public void flatMapTest() throws Exception { private ApplicationCache newMockApplicationCache() { ApplicationCache applicationCache = mock(ApplicationCache.class); when(applicationCache.findApplicationId(any(ApplicationCache.ApplicationKey.class))) - .thenReturn(APPLICATION_ID); + .thenReturn(APPLICATION_ID); return applicationCache; } @@ -159,7 +147,6 @@ private TFAgentStatBatch createTFAgentStatBatch() { } - @Test public void flatMap2Test() throws Exception { ApplicationCache applicationCache = newMockApplicationCache(); diff --git a/grpc/src/test/java/com/navercorp/pinpoint/grpc/ChannelFactoryTest.java b/grpc/src/test/java/com/navercorp/pinpoint/grpc/ChannelFactoryTest.java index 80ce463a9e98..61fe697e894b 100644 --- a/grpc/src/test/java/com/navercorp/pinpoint/grpc/ChannelFactoryTest.java +++ b/grpc/src/test/java/com/navercorp/pinpoint/grpc/ChannelFactoryTest.java @@ -21,9 +21,9 @@ import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.grpc.client.ChannelFactory; import com.navercorp.pinpoint.grpc.client.ChannelFactoryBuilder; -import com.navercorp.pinpoint.grpc.client.config.ClientOption; import com.navercorp.pinpoint.grpc.client.DefaultChannelFactoryBuilder; import com.navercorp.pinpoint.grpc.client.HeaderFactory; +import com.navercorp.pinpoint.grpc.client.config.ClientOption; import com.navercorp.pinpoint.grpc.server.MetadataServerTransportFilter; import com.navercorp.pinpoint.grpc.server.ServerContext; import com.navercorp.pinpoint.grpc.server.ServerFactory; @@ -33,25 +33,15 @@ import com.navercorp.pinpoint.grpc.trace.PSpan; import com.navercorp.pinpoint.grpc.trace.PSpanMessage; import com.navercorp.pinpoint.grpc.trace.SpanGrpc; -import io.grpc.CallOptions; -import io.grpc.Channel; -import io.grpc.ClientCall; -import io.grpc.ClientInterceptor; -import io.grpc.ManagedChannel; -import io.grpc.MethodDescriptor; -import io.grpc.NameResolverProvider; -import io.grpc.Server; -import io.grpc.ServerInterceptor; -import io.grpc.ServerTransportFilter; -import io.grpc.Status; +import io.grpc.*; import io.grpc.internal.PinpointDnsNameResolverProvider; import io.grpc.stub.StreamObserver; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import javax.net.ssl.SSLException; import java.util.concurrent.CountDownLatch; @@ -79,7 +69,7 @@ public class ChannelFactoryTest { private static ExecutorService dnsExecutorService; private static NameResolverProvider nameResolverProvider; - @BeforeClass + @BeforeAll public static void setUp() throws Exception { dnsExecutorService = newCachedExecutorService("dnsExecutor"); nameResolverProvider = new PinpointDnsNameResolverProvider("dnsExecutor", dnsExecutorService); @@ -89,9 +79,9 @@ public static void setUp() throws Exception { server.start(); } - @AfterClass + @AfterAll public static void tearDown() throws Exception { - if (server != null ) { + if (server != null) { server.shutdownNow(); server.awaitTermination(); serverFactory.close(); @@ -137,7 +127,7 @@ public void build() throws InterruptedException { logger.debug("client-onCompleted"); sendSpan.onCompleted(); - Assert.assertEquals(1, countRecordClientInterceptor.getExecutedInterceptCallCount()); + Assertions.assertEquals(1, countRecordClientInterceptor.getExecutedInterceptCallCount()); logger.debug("state:{}", managedChannel.getState(true)); spanService.awaitOnCompleted(); @@ -200,10 +190,10 @@ public StreamObserver sendSpan(final StreamObserver respons public void onNext(PSpanMessage value) { Header header = ServerContext.getAgentInfo(); - logger.debug("server-onNext:{} header:{}" , value, header); + logger.debug("server-onNext:{} header:{}", value, header); logger.debug("server-threadName:{}", Thread.currentThread().getName()); - logger.debug("server-onNext: send Empty" ); + logger.debug("server-onNext: send Empty"); Empty.Builder builder = Empty.newBuilder(); responseObserver.onNext(builder.build()); } diff --git a/grpc/src/test/java/com/navercorp/pinpoint/grpc/ManagedChannelUtilsTest.java b/grpc/src/test/java/com/navercorp/pinpoint/grpc/ManagedChannelUtilsTest.java index 900df40bab58..4f065cfaf313 100644 --- a/grpc/src/test/java/com/navercorp/pinpoint/grpc/ManagedChannelUtilsTest.java +++ b/grpc/src/test/java/com/navercorp/pinpoint/grpc/ManagedChannelUtilsTest.java @@ -1,8 +1,8 @@ package com.navercorp.pinpoint.grpc; import io.grpc.Channel; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -13,6 +13,6 @@ public void testGetLogId() { Channel channel = mock(Channel.class); when(channel.toString()).thenReturn("ManagedChannelOrphanWrapper{delegate=ManagedChannelImpl{logId=1, target=127.0.0.1:9993}}"); - Assert.assertEquals(1, ManagedChannelUtils.getLogId(channel)); + Assertions.assertEquals(1, ManagedChannelUtils.getLogId(channel)); } } \ No newline at end of file diff --git a/grpc/src/test/java/com/navercorp/pinpoint/grpc/MetadataTest.java b/grpc/src/test/java/com/navercorp/pinpoint/grpc/MetadataTest.java index b4b0888dc7a3..c5ec1012c05b 100644 --- a/grpc/src/test/java/com/navercorp/pinpoint/grpc/MetadataTest.java +++ b/grpc/src/test/java/com/navercorp/pinpoint/grpc/MetadataTest.java @@ -19,9 +19,9 @@ import com.navercorp.pinpoint.common.util.BytesUtils; import io.grpc.InternalMetadata; import io.grpc.Metadata; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; public class MetadataTest { private static final Logger logger = LogManager.getLogger(ChannelFactoryTest.class); diff --git a/grpc/src/test/java/com/navercorp/pinpoint/grpc/StatusErrorsTest.java b/grpc/src/test/java/com/navercorp/pinpoint/grpc/StatusErrorsTest.java index 1cf6c806aedf..43c1ffe116a8 100644 --- a/grpc/src/test/java/com/navercorp/pinpoint/grpc/StatusErrorsTest.java +++ b/grpc/src/test/java/com/navercorp/pinpoint/grpc/StatusErrorsTest.java @@ -16,11 +16,12 @@ package com.navercorp.pinpoint.grpc; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; /** * @author jaehong.kim diff --git a/grpc/src/test/java/com/navercorp/pinpoint/grpc/client/UnaryCallDeadlineInterceptorTest.java b/grpc/src/test/java/com/navercorp/pinpoint/grpc/client/UnaryCallDeadlineInterceptorTest.java index 17d8271f1f3f..ee153ea45266 100644 --- a/grpc/src/test/java/com/navercorp/pinpoint/grpc/client/UnaryCallDeadlineInterceptorTest.java +++ b/grpc/src/test/java/com/navercorp/pinpoint/grpc/client/UnaryCallDeadlineInterceptorTest.java @@ -18,13 +18,12 @@ import com.navercorp.pinpoint.grpc.trace.PAgentInfo; import com.navercorp.pinpoint.grpc.trace.PResult; - import io.grpc.CallOptions; import io.grpc.Channel; import io.grpc.ClientCall; import io.grpc.MethodDescriptor; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; /** @@ -40,7 +39,7 @@ public void withDeadlineTest() { ClientCall pAgentInfoPResultClientCall = unaryCallDeadlineInterceptor.interceptCall(createMethodDescritor(MethodDescriptor.MethodType.UNARY), CallOptions.DEFAULT.withAuthority("test"), channel); - Assert.assertNotNull(((TestChannel) channel).callOptions.getDeadline()); + Assertions.assertNotNull(((TestChannel) channel).callOptions.getDeadline()); } @Test @@ -51,7 +50,7 @@ public void withoutDeadlineTest() { unaryCallDeadlineInterceptor.interceptCall(createMethodDescritor(MethodDescriptor.MethodType.BIDI_STREAMING), CallOptions.DEFAULT.withAuthority("test"), channel); - Assert.assertNull(((TestChannel) channel).callOptions.getDeadline()); + Assertions.assertNull(((TestChannel) channel).callOptions.getDeadline()); } private MethodDescriptor createMethodDescritor(MethodDescriptor.MethodType methodType) { diff --git a/grpc/src/test/java/com/navercorp/pinpoint/grpc/client/config/ClientOptionTest.java b/grpc/src/test/java/com/navercorp/pinpoint/grpc/client/config/ClientOptionTest.java index 71743eb7485b..dd6e63355934 100644 --- a/grpc/src/test/java/com/navercorp/pinpoint/grpc/client/config/ClientOptionTest.java +++ b/grpc/src/test/java/com/navercorp/pinpoint/grpc/client/config/ClientOptionTest.java @@ -17,12 +17,12 @@ package com.navercorp.pinpoint.grpc.client.config; import com.navercorp.pinpoint.bootstrap.config.util.ValueAnnotationProcessor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Properties; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ClientOptionTest { diff --git a/grpc/src/test/java/com/navercorp/pinpoint/grpc/client/interceptor/DiscardClientInterceptorTest.java b/grpc/src/test/java/com/navercorp/pinpoint/grpc/client/interceptor/DiscardClientInterceptorTest.java index 685a6188ea9a..6db4d66833a5 100644 --- a/grpc/src/test/java/com/navercorp/pinpoint/grpc/client/interceptor/DiscardClientInterceptorTest.java +++ b/grpc/src/test/java/com/navercorp/pinpoint/grpc/client/interceptor/DiscardClientInterceptorTest.java @@ -22,15 +22,15 @@ import io.grpc.ClientCall; import io.grpc.Metadata; import io.grpc.MethodDescriptor; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -40,7 +40,7 @@ /** * @author Woonduk Kang(emeroad) */ -@RunWith(org.mockito.junit.MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class DiscardClientInterceptorTest { private final Logger logger = LogManager.getLogger(this.getClass()); @@ -65,9 +65,9 @@ public class DiscardClientInterceptorTest { private DiscardClientInterceptor interceptor; - private DiscardClientCall call ; + private DiscardClientCall call; - @Before + @BeforeEach public void setUp() { this.descriptor = MethodDescriptor.newBuilder() .setType(MethodDescriptor.MethodType.CLIENT_STREAMING) @@ -92,7 +92,7 @@ public void interceptCall_success() { clientCall.isReady = true; call.sendMessage("test"); - Assert.assertTrue(call.getOnReadyState()); + Assertions.assertTrue(call.getOnReadyState()); verify(discardEventListener, never()).onDiscard(anyString(), anyString()); } @@ -105,7 +105,7 @@ public void interceptCall_not_ready() { call.sendMessage("test"); - Assert.assertTrue(call.getOnReadyState()); + Assertions.assertTrue(call.getOnReadyState()); verify(discardEventListener).onDiscard(anyString(), anyString()); } @@ -113,9 +113,9 @@ public void interceptCall_not_ready() { public void interceptCall_pending_queue() { call.sendMessage("test"); - Assert.assertFalse(call.getOnReadyState()); + Assertions.assertFalse(call.getOnReadyState()); verify(discardEventListener, never()).onDiscard(anyString(), anyString()); - Assert.assertEquals(call.getPendingCount(), 1); + Assertions.assertEquals(call.getPendingCount(), 1); } @Test @@ -124,14 +124,15 @@ public void interceptCall_pending_fail() { call.sendMessage("test"); call.sendMessage("test"); - Assert.assertFalse(call.getOnReadyState()); + Assertions.assertFalse(call.getOnReadyState()); verify(discardEventListener).onDiscard(anyString(), anyString()); - Assert.assertEquals(call.getPendingCount(), 2); + Assertions.assertEquals(call.getPendingCount(), 2); } private static class ClientCallRecorder extends ClientCall { boolean isReady; Listener responseListener; + @Override public boolean isReady() { return isReady; diff --git a/grpc/src/test/java/com/navercorp/pinpoint/grpc/client/interceptor/DiscardLimiterTest.java b/grpc/src/test/java/com/navercorp/pinpoint/grpc/client/interceptor/DiscardLimiterTest.java index 2cf2ff7b5de8..b48ed7cd5586 100644 --- a/grpc/src/test/java/com/navercorp/pinpoint/grpc/client/interceptor/DiscardLimiterTest.java +++ b/grpc/src/test/java/com/navercorp/pinpoint/grpc/client/interceptor/DiscardLimiterTest.java @@ -16,11 +16,13 @@ package com.navercorp.pinpoint.grpc.client.interceptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * @author jaehong.kim diff --git a/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/AgentHeaderReaderTest.java b/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/AgentHeaderReaderTest.java index a698a44c7885..85102522e7ff 100644 --- a/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/AgentHeaderReaderTest.java +++ b/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/AgentHeaderReaderTest.java @@ -21,8 +21,8 @@ import com.navercorp.pinpoint.grpc.HeaderReader; import io.grpc.Metadata; import io.grpc.StatusRuntimeException; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -43,26 +43,30 @@ public void extract() { Metadata metadata = newMetadata(); Header header = reader.extract(metadata); - Assert.assertEquals(header.getAgentId(), AGENT_ID); - Assert.assertEquals(header.getAgentName(), AGENT_NAME); - Assert.assertEquals(header.getApplicationName(), APPLICATION_NAME); - Assert.assertEquals(header.getAgentStartTime(), AGENT_START_TIME); - Assert.assertEquals(header.getSocketId(), SOCKET_ID); - Assert.assertEquals(header.getServiceType(), SERVICE_TYPE); + Assertions.assertEquals(header.getAgentId(), AGENT_ID); + Assertions.assertEquals(header.getAgentName(), AGENT_NAME); + Assertions.assertEquals(header.getApplicationName(), APPLICATION_NAME); + Assertions.assertEquals(header.getAgentStartTime(), AGENT_START_TIME); + Assertions.assertEquals(header.getSocketId(), SOCKET_ID); + Assertions.assertEquals(header.getServiceType(), SERVICE_TYPE); } - @Test(expected = StatusRuntimeException.class) + @Test public void extract_fail_agentId() { - Metadata metadata = newMetadata(); - metadata.put(Header.AGENT_ID_KEY, "!!agentId"); - reader.extract(metadata); + Assertions.assertThrows(StatusRuntimeException.class, () -> { + Metadata metadata = newMetadata(); + metadata.put(Header.AGENT_ID_KEY, "!!agentId"); + reader.extract(metadata); + }); } - @Test(expected = StatusRuntimeException.class) + @Test public void extract_fail_agentName() { - Metadata metadata = newMetadata(); - metadata.put(Header.AGENT_NAME_KEY, "!!agentName"); - reader.extract(metadata); + Assertions.assertThrows(StatusRuntimeException.class, () -> { + Metadata metadata = newMetadata(); + metadata.put(Header.AGENT_NAME_KEY, "!!agentName"); + reader.extract(metadata); + }); } @Test @@ -70,14 +74,16 @@ public void extract_no_agentName() { Metadata metadata = newMetadata(); metadata.remove(Header.AGENT_NAME_KEY, AGENT_NAME); final Header header = reader.extract(metadata); - Assert.assertNull(header.getAgentName()); + Assertions.assertNull(header.getAgentName()); } - @Test(expected = StatusRuntimeException.class) + @Test public void extract_fail_applicationName() { - Metadata metadata = newMetadata(); - metadata.put(Header.APPLICATION_NAME_KEY, "!!applicationName"); - reader.extract(metadata); + Assertions.assertThrows(StatusRuntimeException.class, () -> { + Metadata metadata = newMetadata(); + metadata.put(Header.APPLICATION_NAME_KEY, "!!applicationName"); + reader.extract(metadata); + }); } private Metadata newMetadata() { diff --git a/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/ServerOptionTest.java b/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/ServerOptionTest.java index 415031e81858..ff1d05b4dfbb 100644 --- a/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/ServerOptionTest.java +++ b/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/ServerOptionTest.java @@ -16,9 +16,9 @@ package com.navercorp.pinpoint.grpc.server; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ServerOptionTest { diff --git a/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/SocketAddressUtilsTest.java b/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/SocketAddressUtilsTest.java index 1de85bbd8d2f..2622cfee1c75 100644 --- a/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/SocketAddressUtilsTest.java +++ b/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/SocketAddressUtilsTest.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.grpc.server; import junit.framework.TestCase; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import java.net.InetSocketAddress; @@ -10,6 +10,6 @@ public class SocketAddressUtilsTest extends TestCase { public void testTestToString() { InetSocketAddress unresolved = InetSocketAddress.createUnresolved("127.0.0.1", 9999); String address = SocketAddressUtils.toString(unresolved); - Assert.assertEquals("127.0.0.1:9999", address); + Assertions.assertEquals("127.0.0.1:9999", address); } } \ No newline at end of file diff --git a/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/flowcontrol/DefaultIdleTimeoutTest.java b/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/flowcontrol/DefaultIdleTimeoutTest.java index 67b1dd47ecab..13e6119c7575 100644 --- a/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/flowcontrol/DefaultIdleTimeoutTest.java +++ b/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/flowcontrol/DefaultIdleTimeoutTest.java @@ -1,24 +1,26 @@ package com.navercorp.pinpoint.grpc.server.flowcontrol; import com.navercorp.pinpoint.common.util.Clock; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; public class DefaultIdleTimeoutTest { - @Test(expected = IllegalArgumentException.class) + @Test public void isExpired_invalid_parameter() { - new DefaultIdleTimeout(-1); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + new DefaultIdleTimeout(-1); + }); } @Test public void isExpired_init_state() { IdleTimeout idleTimeout = new DefaultIdleTimeout(5000); - Assert.assertFalse(idleTimeout.isExpired()); - Assert.assertFalse(idleTimeout.isExpired()); + Assertions.assertFalse(idleTimeout.isExpired()); + Assertions.assertFalse(idleTimeout.isExpired()); } @Test @@ -28,8 +30,8 @@ public void isExpired_expired() { IdleTimeout idleTimeout = new DefaultIdleTimeout(0, clock); - Assert.assertTrue(idleTimeout.isExpired()); - Assert.assertTrue(idleTimeout.isExpired()); + Assertions.assertTrue(idleTimeout.isExpired()); + Assertions.assertTrue(idleTimeout.isExpired()); } @Test @@ -39,13 +41,13 @@ public void isExpired_update() { IdleTimeout idleTimeout = new DefaultIdleTimeout(2, clock); - Assert.assertFalse(idleTimeout.isExpired()); + Assertions.assertFalse(idleTimeout.isExpired()); when(clock.getTime()).thenReturn(5L); - Assert.assertTrue(idleTimeout.isExpired()); + Assertions.assertTrue(idleTimeout.isExpired()); when(clock.getTime()).thenReturn(0L); - Assert.assertTrue(idleTimeout.isExpired()); + Assertions.assertTrue(idleTimeout.isExpired()); } } \ No newline at end of file diff --git a/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/flowcontrol/StreamExecutorRejectedExecutionRequestSchedulerTest.java b/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/flowcontrol/StreamExecutorRejectedExecutionRequestSchedulerTest.java index 1f2690485900..208ecbce67ca 100644 --- a/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/flowcontrol/StreamExecutorRejectedExecutionRequestSchedulerTest.java +++ b/grpc/src/test/java/com/navercorp/pinpoint/grpc/server/flowcontrol/StreamExecutorRejectedExecutionRequestSchedulerTest.java @@ -18,7 +18,7 @@ import io.grpc.Metadata; import io.grpc.Status; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import java.util.concurrent.Future; @@ -26,8 +26,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; diff --git a/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/core/ChangeSetManagerTest.java b/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/core/ChangeSetManagerTest.java index aec9454ddeee..087467d5fc16 100644 --- a/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/core/ChangeSetManagerTest.java +++ b/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/core/ChangeSetManagerTest.java @@ -18,7 +18,8 @@ import com.navercorp.pinpoint.hbase.schema.domain.SchemaChangeLog; import com.navercorp.pinpoint.hbase.schema.reader.core.ChangeSet; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; @@ -70,35 +71,41 @@ public void getExecutedChangeSets_largerSchemaChangeLogs() { assertThat(executedChangeSets, contains(changeSet)); } - @Test(expected = IllegalArgumentException.class) + @Test public void getExecutedChangeSets_invalidId() { - ChangeSet changeSet = newChangeSet("id1", "value1"); - List changeSets = Arrays.asList(changeSet); - List schemaChangeLogs = Arrays.asList(newSchemaChangeLog("id2", "value1", 1)); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + ChangeSet changeSet = newChangeSet("id1", "value1"); + List changeSets = Arrays.asList(changeSet); + List schemaChangeLogs = Arrays.asList(newSchemaChangeLog("id2", "value1", 1)); - ChangeSetManager changeSetManager = new ChangeSetManager(changeSets); - changeSetManager.getExecutedChangeSets(schemaChangeLogs); + ChangeSetManager changeSetManager = new ChangeSetManager(changeSets); + changeSetManager.getExecutedChangeSets(schemaChangeLogs); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void getExecutedChangeSets_invalidCheckSum() { - ChangeSet changeSet = newChangeSet("id1", "value1"); - List changeSets = Arrays.asList(changeSet); - CheckSum invalidCheckSum = CheckSum.compute(CheckSum.getCurrentVersion(), "value2"); - List schemaChangeLogs = Arrays.asList(newSchemaChangeLog("id1", "value1", invalidCheckSum, 1)); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + ChangeSet changeSet = newChangeSet("id1", "value1"); + List changeSets = Arrays.asList(changeSet); + CheckSum invalidCheckSum = CheckSum.compute(CheckSum.getCurrentVersion(), "value2"); + List schemaChangeLogs = Arrays.asList(newSchemaChangeLog("id1", "value1", invalidCheckSum, 1)); - ChangeSetManager changeSetManager = new ChangeSetManager(changeSets); - changeSetManager.getExecutedChangeSets(schemaChangeLogs); + ChangeSetManager changeSetManager = new ChangeSetManager(changeSets); + changeSetManager.getExecutedChangeSets(schemaChangeLogs); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void getExecutedChangeSets_invalidOrder() { - ChangeSet changeSet1 = newChangeSet("id1", "value1"); - List changeSets = Arrays.asList(changeSet1); - List schemaChangeLogs = Arrays.asList(newSchemaChangeLog("id1", "value1", 2)); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + ChangeSet changeSet1 = newChangeSet("id1", "value1"); + List changeSets = Arrays.asList(changeSet1); + List schemaChangeLogs = Arrays.asList(newSchemaChangeLog("id1", "value1", 2)); - ChangeSetManager changeSetManager = new ChangeSetManager(changeSets); - changeSetManager.getExecutedChangeSets(schemaChangeLogs); + ChangeSetManager changeSetManager = new ChangeSetManager(changeSets); + changeSetManager.getExecutedChangeSets(schemaChangeLogs); + }); } @Test @@ -136,35 +143,41 @@ public void filterExecutedChangeSets_largerSchemaChangeLogs() { assertThat(unexecutedChangeSets, is(empty())); } - @Test(expected = IllegalArgumentException.class) + @Test public void filterExecutedChangeSets_invalidId() { - ChangeSet changeSet = newChangeSet("id1", "value1"); - List changeSets = Arrays.asList(changeSet); - List schemaChangeLogs = Arrays.asList(newSchemaChangeLog("id2", "value1", 1)); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + ChangeSet changeSet = newChangeSet("id1", "value1"); + List changeSets = Arrays.asList(changeSet); + List schemaChangeLogs = Arrays.asList(newSchemaChangeLog("id2", "value1", 1)); - ChangeSetManager changeSetManager = new ChangeSetManager(changeSets); - changeSetManager.filterExecutedChangeSets(schemaChangeLogs); + ChangeSetManager changeSetManager = new ChangeSetManager(changeSets); + changeSetManager.filterExecutedChangeSets(schemaChangeLogs); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void filterExecutedChangeSets_invalidCheckSum() { - ChangeSet changeSet = newChangeSet("id1", "value1"); - List changeSets = Arrays.asList(changeSet); - CheckSum invalidCheckSum = CheckSum.compute(CheckSum.getCurrentVersion(), "value2"); - List schemaChangeLogs = Arrays.asList(newSchemaChangeLog("id1", "value1", invalidCheckSum, 1)); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + ChangeSet changeSet = newChangeSet("id1", "value1"); + List changeSets = Arrays.asList(changeSet); + CheckSum invalidCheckSum = CheckSum.compute(CheckSum.getCurrentVersion(), "value2"); + List schemaChangeLogs = Arrays.asList(newSchemaChangeLog("id1", "value1", invalidCheckSum, 1)); - ChangeSetManager changeSetManager = new ChangeSetManager(changeSets); - changeSetManager.filterExecutedChangeSets(schemaChangeLogs); + ChangeSetManager changeSetManager = new ChangeSetManager(changeSets); + changeSetManager.filterExecutedChangeSets(schemaChangeLogs); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void filterExecutedChangeSets_invalidOrder() { - ChangeSet changeSet1 = newChangeSet("id1", "value1"); - List changeSets = Arrays.asList(changeSet1); - List schemaChangeLogs = Arrays.asList(newSchemaChangeLog("id1", "value1", 2)); - - ChangeSetManager changeSetManager = new ChangeSetManager(changeSets); - changeSetManager.filterExecutedChangeSets(schemaChangeLogs); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + ChangeSet changeSet1 = newChangeSet("id1", "value1"); + List changeSets = Arrays.asList(changeSet1); + List schemaChangeLogs = Arrays.asList(newSchemaChangeLog("id1", "value1", 2)); + + ChangeSetManager changeSetManager = new ChangeSetManager(changeSets); + changeSetManager.filterExecutedChangeSets(schemaChangeLogs); + }); } private ChangeSet newChangeSet(String id, String value) { diff --git a/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/core/HtdHbaseSchemaVerifierTest.java b/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/core/HtdHbaseSchemaVerifierTest.java index 7c7304dd32b8..addd854e253a 100644 --- a/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/core/HtdHbaseSchemaVerifierTest.java +++ b/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/core/HtdHbaseSchemaVerifierTest.java @@ -21,7 +21,7 @@ import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.TableName; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; diff --git a/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/core/command/HbaseSchemaCommandManagerTest.java b/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/core/command/HbaseSchemaCommandManagerTest.java index 2dfe81bca5bc..9f773f29e4b4 100644 --- a/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/core/command/HbaseSchemaCommandManagerTest.java +++ b/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/core/command/HbaseSchemaCommandManagerTest.java @@ -30,7 +30,8 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableName; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.util.Arrays; @@ -42,7 +43,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.never; @@ -75,31 +76,35 @@ public void shouldFilterTablesFromDifferentNamespace() { assertThat(schemaSnapshot, not(contains(differentNamespaceHtd))); } - @Test(expected = InvalidHbaseSchemaException.class) + @Test public void creatingExistingTableShouldFail() { - String namespace = "namespace"; - String tableName = "table"; - HTableDescriptor existingTable = createHtd(namespace, tableName, "CF"); - HbaseSchemaCommandManager manager = new HbaseSchemaCommandManager(namespace, null, Arrays.asList(existingTable)); + Assertions.assertThrows(InvalidHbaseSchemaException.class, () -> { + String namespace = "namespace"; + String tableName = "table"; + HTableDescriptor existingTable = createHtd(namespace, tableName, "CF"); + HbaseSchemaCommandManager manager = new HbaseSchemaCommandManager(namespace, null, Arrays.asList(existingTable)); - TableChange createTableChange = newTableChange(ChangeType.CREATE, tableName); - ChangeSet createTableChangeSet = newChangeSet(createTableChange); + TableChange createTableChange = newTableChange(ChangeType.CREATE, tableName); + ChangeSet createTableChangeSet = newChangeSet(createTableChange); - manager.applyChangeSet(createTableChangeSet); + manager.applyChangeSet(createTableChangeSet); + }); } - @Test(expected = InvalidHbaseSchemaException.class) + @Test public void modifyingNonExistingTableShouldFail() { - String namespace = "namespace"; - String tableName = "table"; - String nonExistingTableName = "anotherTable"; - HTableDescriptor existingTable = createHtd(namespace, tableName, "CF"); - HbaseSchemaCommandManager manager = new HbaseSchemaCommandManager(namespace, null, Arrays.asList(existingTable)); - - TableChange modifyTableChange = newTableChange(ChangeType.MODIFY, nonExistingTableName); - ChangeSet modifyTableChangeSet = newChangeSet(modifyTableChange); - - manager.applyChangeSet(modifyTableChangeSet); + Assertions.assertThrows(InvalidHbaseSchemaException.class, () -> { + String namespace = "namespace"; + String tableName = "table"; + String nonExistingTableName = "anotherTable"; + HTableDescriptor existingTable = createHtd(namespace, tableName, "CF"); + HbaseSchemaCommandManager manager = new HbaseSchemaCommandManager(namespace, null, Arrays.asList(existingTable)); + + TableChange modifyTableChange = newTableChange(ChangeType.MODIFY, nonExistingTableName); + ChangeSet modifyTableChangeSet = newChangeSet(modifyTableChange); + + manager.applyChangeSet(modifyTableChangeSet); + }); } @Test diff --git a/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/dao/hbase/codec/SchemaChangeLogCodecTest.java b/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/dao/hbase/codec/SchemaChangeLogCodecTest.java index e59df31b1626..5851712cbbe9 100644 --- a/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/dao/hbase/codec/SchemaChangeLogCodecTest.java +++ b/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/dao/hbase/codec/SchemaChangeLogCodecTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.hbase.schema.core.CheckSum; import com.navercorp.pinpoint.hbase.schema.domain.SchemaChangeLog; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Random; import java.util.UUID; diff --git a/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/reader/core/CheckSumTest.java b/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/reader/core/CheckSumTest.java index 80ce26c26678..9d5857727d0d 100644 --- a/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/reader/core/CheckSumTest.java +++ b/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/reader/core/CheckSumTest.java @@ -17,8 +17,8 @@ package com.navercorp.pinpoint.hbase.schema.reader.core; import com.navercorp.pinpoint.hbase.schema.core.CheckSum; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.UUID; @@ -32,7 +32,7 @@ public void computeAndParse() { String randomValue = UUID.randomUUID().toString(); CheckSum checkSum = CheckSum.compute(CheckSum.getCurrentVersion(), randomValue); CheckSum parsedCheckSum = CheckSum.parse(checkSum.toString()); - Assert.assertEquals(checkSum.getVersion(), parsedCheckSum.getVersion()); - Assert.assertEquals(checkSum.getCheckSum(), parsedCheckSum.getCheckSum()); + Assertions.assertEquals(checkSum.getVersion(), parsedCheckSum.getVersion()); + Assertions.assertEquals(checkSum.getCheckSum(), parsedCheckSum.getCheckSum()); } } diff --git a/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/reader/xml/XmlHbaseSchemaParserTest.java b/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/reader/xml/XmlHbaseSchemaParserTest.java index d2aef942a000..67d6f6006f45 100644 --- a/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/reader/xml/XmlHbaseSchemaParserTest.java +++ b/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/reader/xml/XmlHbaseSchemaParserTest.java @@ -24,7 +24,7 @@ import com.navercorp.pinpoint.hbase.schema.reader.core.ModifyTableChange; import com.navercorp.pinpoint.hbase.schema.reader.core.TableChange; import com.navercorp.pinpoint.hbase.schema.reader.core.TableConfiguration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.xml.sax.InputSource; import java.io.InputStream; diff --git a/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/reader/xml/XmlHbaseSchemaReaderTest.java b/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/reader/xml/XmlHbaseSchemaReaderTest.java index 2e78f0e54f14..bda80a4f06bb 100644 --- a/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/reader/xml/XmlHbaseSchemaReaderTest.java +++ b/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/reader/xml/XmlHbaseSchemaReaderTest.java @@ -26,7 +26,7 @@ import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Matcher; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; diff --git a/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/service/HbaseSchemaServiceImplTest.java b/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/service/HbaseSchemaServiceImplTest.java index 73546c36fec4..ecbca6ee3476 100644 --- a/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/service/HbaseSchemaServiceImplTest.java +++ b/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/service/HbaseSchemaServiceImplTest.java @@ -25,9 +25,8 @@ import com.navercorp.pinpoint.hbase.schema.reader.core.TableChange; import org.apache.hadoop.hbase.HTableDescriptor; import org.hamcrest.MatcherAssert; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -59,7 +58,7 @@ public class HbaseSchemaServiceImplTest { private HbaseSchemaService hbaseSchemaService; - @Before + @BeforeEach public void setUp() { MockitoAnnotations.initMocks(this); hbaseSchemaService = new HbaseSchemaServiceImpl(hbaseAdminOperation, schemaChangeLogService, hbaseSchemaVerifier); diff --git a/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/service/SchemaChangeLogServiceImplTest.java b/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/service/SchemaChangeLogServiceImplTest.java index 585a8902ae7d..8a0c317c85a8 100644 --- a/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/service/SchemaChangeLogServiceImplTest.java +++ b/hbase/hbase-schema/src/test/java/com/navercorp/pinpoint/hbase/schema/service/SchemaChangeLogServiceImplTest.java @@ -21,9 +21,9 @@ import com.navercorp.pinpoint.hbase.schema.domain.SchemaChangeLog; import com.navercorp.pinpoint.hbase.schema.reader.core.ChangeSet; import org.hamcrest.MatcherAssert; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -50,7 +50,7 @@ public class SchemaChangeLogServiceImplTest { private SchemaChangeLogService schemaChangeLogService; - @Before + @BeforeEach public void setUp() { MockitoAnnotations.initMocks(this); schemaChangeLogService = new SchemaChangeLogServiceImpl(schemaChangeLogDao); @@ -149,44 +149,48 @@ public void getSchemaChangeLogs() { } } - @Test(expected = IllegalStateException.class) + @Test public void getSchemaChangeLogs_shouldFailOnDuplicateOrder() { - // Given - final int numSchemaChangeLogs = random.nextInt(100) + 1; - final List schemaChangeLogs = new ArrayList<>(); - int order = 1; - for (int i = 0; i < numSchemaChangeLogs; i++) { - schemaChangeLogs.add(newSchemaChangeLog("id" + order, order)); - order++; - } - // add schema change log with duplicate order - final int duplicateOrder = random.nextInt(numSchemaChangeLogs) + 1; - schemaChangeLogs.add(newSchemaChangeLog("duplicateOrderedId", duplicateOrder)); - when(schemaChangeLogDao.getChangeLogs(anyString())).thenReturn(schemaChangeLogs); - // When - schemaChangeLogService.getSchemaChangeLogs("namespace"); - // Then - Assert.fail(); + Assertions.assertThrows(IllegalStateException.class, () -> { + // Given + final int numSchemaChangeLogs = random.nextInt(100) + 1; + final List schemaChangeLogs = new ArrayList<>(); + int order = 1; + for (int i = 0; i < numSchemaChangeLogs; i++) { + schemaChangeLogs.add(newSchemaChangeLog("id" + order, order)); + order++; + } + // add schema change log with duplicate order + final int duplicateOrder = random.nextInt(numSchemaChangeLogs) + 1; + schemaChangeLogs.add(newSchemaChangeLog("duplicateOrderedId", duplicateOrder)); + when(schemaChangeLogDao.getChangeLogs(anyString())).thenReturn(schemaChangeLogs); + // When + schemaChangeLogService.getSchemaChangeLogs("namespace"); + // Then + Assertions.fail(); + }); } - @Test(expected = IllegalStateException.class) + @Test public void getSchemaChangeLogs_shouldFailOnDuplicateId() { - // Given - final int numSchemaChangeLogs = random.nextInt(100) + 1; - final List schemaChangeLogs = new ArrayList<>(); - int order = 1; - for (int i = 0; i < numSchemaChangeLogs; i++) { - schemaChangeLogs.add(newSchemaChangeLog("id" + order, order)); - order++; - } - // add duplicate element - final String duplicateId = "id" + (random.nextInt(numSchemaChangeLogs) + 1); - schemaChangeLogs.add(newSchemaChangeLog(duplicateId, order)); - when(schemaChangeLogDao.getChangeLogs(anyString())).thenReturn(schemaChangeLogs); - // When - schemaChangeLogService.getSchemaChangeLogs("namespace"); - // Then - Assert.fail(); + Assertions.assertThrows(IllegalStateException.class, () -> { + // Given + final int numSchemaChangeLogs = random.nextInt(100) + 1; + final List schemaChangeLogs = new ArrayList<>(); + int order = 1; + for (int i = 0; i < numSchemaChangeLogs; i++) { + schemaChangeLogs.add(newSchemaChangeLog("id" + order, order)); + order++; + } + // add duplicate element + final String duplicateId = "id" + (random.nextInt(numSchemaChangeLogs) + 1); + schemaChangeLogs.add(newSchemaChangeLog(duplicateId, order)); + when(schemaChangeLogDao.getChangeLogs(anyString())).thenReturn(schemaChangeLogs); + // When + schemaChangeLogService.getSchemaChangeLogs("namespace"); + // Then + Assertions.fail(); + }); } private static ChangeSet newChangeSet(String id) { diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/KafkaTemplateTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/KafkaTemplateTest.java index 8a5822e77829..545d69bd51bd 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/KafkaTemplateTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/KafkaTemplateTest.java @@ -2,33 +2,33 @@ import org.apache.kafka.clients.producer.ProducerConfig; import org.apache.kafka.common.serialization.StringSerializer; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.kafka.core.DefaultKafkaProducerFactory; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.kafka.core.ProducerFactory; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.HashMap; import java.util.Map; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(locations = {"classpath:applicationContext-kafka-template-test.xml"}) public class KafkaTemplateTest { @Autowired private KafkaTemplate kafkaTestTemplate; - @Ignore + @Disabled @Test public void testAutowiredTemplate() { kafkaTestTemplate.sendDefault("hello"); } - @Ignore + @Disabled @Test public void testKafkaTemplate() { Map senderProps = senderProps(); diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/PinotIngestionTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/PinotIngestionTest.java index 373854b79df8..71be553fae31 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/PinotIngestionTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/PinotIngestionTest.java @@ -18,8 +18,8 @@ import org.apache.kafka.clients.producer.KafkaProducer; import org.apache.kafka.clients.producer.ProducerRecord; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.Date; import java.util.Properties; @@ -31,7 +31,7 @@ public class PinotIngestionTest { Random random = new Random(); - @Ignore + @Disabled @Test public void testFixedMetric() { KafkaProducer producer = createProducer(); @@ -47,7 +47,7 @@ public void testFixedMetric() { producer.close(); } - @Ignore + @Disabled @Test public void testRandomMetric() { 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 2b38527188cb..6cabada6d5dd 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 @@ -21,10 +21,9 @@ import com.navercorp.pinpoint.metric.common.model.LongMetric; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.invocation.InvocationOnMock; @@ -54,7 +53,7 @@ public class PinotSystemMetricDaoTest { @Mock private LongMetric longMetric; - @Before + @BeforeEach public void setupTemplate() { MockitoAnnotations.initMocks(this); @@ -75,7 +74,7 @@ public void testLogDao() throws JsonProcessingException { longDao.insert("hostGroupName", "hostName", longMetricList); - Assert.assertEquals(longMetricList.size(), sendCount.getSendCount()); + Assertions.assertEquals(longMetricList.size(), sendCount.getSendCount()); } private List createLongCounterList() { diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/model/serialize/TelegrafJsonDeserializerTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/model/serialize/TelegrafJsonDeserializerTest.java index 69464c5fbcab..3e073768c5a3 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/model/serialize/TelegrafJsonDeserializerTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/model/serialize/TelegrafJsonDeserializerTest.java @@ -2,12 +2,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.navercorp.pinpoint.metric.collector.model.TelegrafMetric; - import com.navercorp.pinpoint.metric.collector.model.TelegrafMetrics; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.InputStream; @@ -28,11 +27,11 @@ public void deserialize_batch() throws IOException { TelegrafMetrics systemMetrics = mapper.readValue(stream, TelegrafMetrics.class); List metrics = systemMetrics.getMetrics(); - Assert.assertEquals(2, metrics.size()); + Assertions.assertEquals(2, metrics.size()); logger.debug("{}", metrics); - Assert.assertTrue(metrics.get(0).getFields().contains(new TelegrafMetric.Field("field_1", 30))); - Assert.assertTrue(metrics.get(1).getFields().contains(new TelegrafMetric.Field("field_N", 59))); + Assertions.assertTrue(metrics.get(0).getFields().contains(new TelegrafMetric.Field("field_1", 30))); + Assertions.assertTrue(metrics.get(1).getFields().contains(new TelegrafMetric.Field("field_N", 59))); } @Test @@ -43,10 +42,10 @@ public void deserialize_standard() throws IOException { TelegrafMetrics systemMetrics = mapper.readValue(stream, TelegrafMetrics.class); List metrics = systemMetrics.getMetrics(); - Assert.assertEquals(1, metrics.size()); + Assertions.assertEquals(1, metrics.size()); logger.debug("{}", metrics); - Assert.assertTrue(metrics.get(0).getFields().contains(new TelegrafMetric.Field("field_1", 30))); + Assertions.assertTrue(metrics.get(0).getFields().contains(new TelegrafMetric.Field("field_1", 30))); } } \ No newline at end of file diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/MetricDataTypeCacheTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/MetricDataTypeCacheTest.java index 69d29e77f7c8..b6cc7f390d21 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/MetricDataTypeCacheTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/MetricDataTypeCacheTest.java @@ -4,10 +4,10 @@ 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.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -15,7 +15,7 @@ /** * @author minwoo.jung */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class MetricDataTypeCacheTest { @Test @@ -28,7 +28,7 @@ public void getMetricDataTypeTest() { when(systemMetricDataTypeDao.selectMetricDataType(metricDataName)).thenReturn(null); MetricData metricDataResult = metricDataTypeCache.getMetricDataType(metricDataName); - Assert.assertNull(metricDataResult); + Assertions.assertNull(metricDataResult); } @Test @@ -41,7 +41,7 @@ public void getMetricDataType2Test() { when(systemMetricDataTypeDao.selectMetricDataType(metricDataName)).thenReturn(metricData); MetricData metricDataResult = metricDataTypeCache.getMetricDataType(metricDataName); - Assert.assertEquals(metricData, metricDataResult); + Assertions.assertEquals(metricData, metricDataResult); } @Test @@ -53,6 +53,6 @@ public void saveMetricDataTypeTest() { MetricDataName metricDataName = new MetricDataName(metricData.getMetricName(), metricData.getFieldName()); MetricData metricDataResult = metricDataTypeCache.saveMetricDataType(metricDataName, metricData); - Assert.assertEquals(metricData, metricDataResult); + Assertions.assertEquals(metricData, metricDataResult); } } \ No newline at end of file diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/MetricTagCacheTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/MetricTagCacheTest.java index bfb13b4a261e..80ee3f2e3181 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/MetricTagCacheTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/MetricTagCacheTest.java @@ -1,23 +1,26 @@ package com.navercorp.pinpoint.metric.collector.service; import com.navercorp.pinpoint.metric.collector.dao.MetricTagDao; -import com.navercorp.pinpoint.metric.common.model.MetricTagCollection; 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.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.ArrayList; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; /** * @author minwoo.jung */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class MetricTagCacheTest { @Test @@ -30,7 +33,7 @@ public void getMetricTag() { MetricTagCollection metricTagCollection = metricTagCache.getMetricTag(metricTagKey); - Assert.assertNull(metricTagCollection); + Assertions.assertNull(metricTagCollection); } @Test @@ -44,7 +47,7 @@ public void getMetricTag2() { MetricTagCollection returnData = metricTagCache.getMetricTag(metricTagKey); - Assert.assertEquals(returnData, metricTagCollection); + Assertions.assertEquals(returnData, metricTagCollection); } @Test @@ -67,6 +70,6 @@ public void updateCacheforMetricTag() { MetricTagCollection metricTagCollection = new MetricTagCollection("applicationId", "hostName", "metricName", "fieldName", new ArrayList(1)); MetricTagCollection metricTagCollectionResult = metricTagCache.updateCacheForMetricTag(metricTagKey, metricTagCollection); - Assert.assertEquals(metricTagCollection, metricTagCollectionResult); + Assertions.assertEquals(metricTagCollection, metricTagCollectionResult); } } \ No newline at end of file diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/SystemMetricDataTypeServiceImplTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/SystemMetricDataTypeServiceImplTest.java index dafb6a6ed356..41ad622e1917 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/SystemMetricDataTypeServiceImplTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/SystemMetricDataTypeServiceImplTest.java @@ -1,19 +1,28 @@ package com.navercorp.pinpoint.metric.collector.service; -import com.navercorp.pinpoint.metric.common.model.*; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import com.navercorp.pinpoint.metric.common.model.DoubleMetric; +import com.navercorp.pinpoint.metric.common.model.LongMetric; +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 com.navercorp.pinpoint.metric.common.model.SystemMetric; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.ArrayList; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; /** * @author minwoo.jung */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class SystemMetricDataTypeServiceImplTest { @Test diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/SystemMetricFilterTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/SystemMetricFilterTest.java index e033ddc31ce0..8048a65bbe71 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/SystemMetricFilterTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/SystemMetricFilterTest.java @@ -22,9 +22,9 @@ import com.navercorp.pinpoint.metric.common.model.LongMetric; import com.navercorp.pinpoint.metric.common.model.Metrics; import com.navercorp.pinpoint.metric.common.model.SystemMetric; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -49,7 +49,7 @@ public class SystemMetricFilterTest { @Mock private PinotSystemMetricDoubleDao doubleDao; - @Before + @BeforeEach public void setUp() { MockitoAnnotations.initMocks(this); systemMetricService = new SystemMetricService(longDao, doubleDao); @@ -64,8 +64,8 @@ public void testFilter() { List longMetricList = systemMetricService.filterLongCounter(systemMetrics); List doubleMetricList = systemMetricService.filterDoubleCounter(systemMetrics); - Assert.assertEquals(longCount, longMetricList.size()); - Assert.assertEquals(doubleCount, doubleMetricList.size()); + Assertions.assertEquals(longCount, longMetricList.size()); + Assertions.assertEquals(doubleCount, doubleMetricList.size()); } private Metrics createList(int longCount, int doubleCount) { diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/SystemMetricTagServiceImplTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/SystemMetricTagServiceImplTest.java index b4c1eeeceb3c..5c6fad964701 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/SystemMetricTagServiceImplTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/collector/service/SystemMetricTagServiceImplTest.java @@ -1,24 +1,30 @@ package com.navercorp.pinpoint.metric.collector.service; +import com.navercorp.pinpoint.metric.common.model.LongMetric; +import com.navercorp.pinpoint.metric.common.model.MetricTag; import com.navercorp.pinpoint.metric.common.model.MetricTagCollection; -import com.navercorp.pinpoint.metric.common.model.*; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import com.navercorp.pinpoint.metric.common.model.MetricTagKey; +import com.navercorp.pinpoint.metric.common.model.SystemMetric; +import com.navercorp.pinpoint.metric.common.model.Tag; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.ArrayList; import java.util.List; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; /** * @author minwoo.jung */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class SystemMetricTagServiceImplTest { @@ -117,22 +123,22 @@ public void createMetricTagCollection() { tagList.add(new Tag("key2", "value2")); MetricTagCollection metricTagCollection = systemMetricTagService.createMetricTagCollection(applicationName, hostName, metricName, fieldName, tagList); - Assert.assertEquals(metricTagCollection.getHostGroupName(), applicationName); - Assert.assertEquals(metricTagCollection.getHostName(), hostName); - Assert.assertEquals(metricTagCollection.getMetricName(), metricName); - Assert.assertEquals(metricTagCollection.getFieldName(), fieldName); + Assertions.assertEquals(metricTagCollection.getHostGroupName(), applicationName); + Assertions.assertEquals(metricTagCollection.getHostName(), hostName); + Assertions.assertEquals(metricTagCollection.getMetricName(), metricName); + Assertions.assertEquals(metricTagCollection.getFieldName(), fieldName); List metricTagList = metricTagCollection.getMetricTagList(); - Assert.assertEquals(metricTagList.size(), 1); + Assertions.assertEquals(metricTagList.size(), 1); MetricTag metricTag = metricTagList.get(0); - Assert.assertEquals(metricTag.getHostGroupName(), applicationName); - Assert.assertEquals(metricTag.getHostName(), hostName); - Assert.assertEquals(metricTag.getMetricName(), metricName); - Assert.assertEquals(metricTag.getFieldName(), fieldName); + Assertions.assertEquals(metricTag.getHostGroupName(), applicationName); + Assertions.assertEquals(metricTag.getHostName(), hostName); + Assertions.assertEquals(metricTag.getMetricName(), metricName); + Assertions.assertEquals(metricTag.getFieldName(), fieldName); List tags = metricTag.getTags(); - Assert.assertEquals(tags.size(), 2); - Assert.assertEquals(tags, tagList); + Assertions.assertEquals(tags.size(), 2); + Assertions.assertEquals(tags, tagList); } @Test @@ -170,13 +176,13 @@ public void createMetricTagCollection2() { MetricTagCollection mtc = new MetricTagCollection(applicationName, hostName, metricName, fieldName, metricTagList); MetricTagCollection metricTagCollection = systemMetricTagService.createMetricTagCollection(mtc, tagList4); - Assert.assertEquals(metricTagCollection.getHostGroupName(), applicationName); - Assert.assertEquals(metricTagCollection.getHostName(), hostName); - Assert.assertEquals(metricTagCollection.getMetricName(), metricName); - Assert.assertEquals(metricTagCollection.getFieldName(), fieldName); + Assertions.assertEquals(metricTagCollection.getHostGroupName(), applicationName); + Assertions.assertEquals(metricTagCollection.getHostName(), hostName); + Assertions.assertEquals(metricTagCollection.getMetricName(), metricName); + Assertions.assertEquals(metricTagCollection.getFieldName(), fieldName); List mtList = metricTagCollection.getMetricTagList(); - Assert.assertEquals(mtList.size(), 4); + Assertions.assertEquals(mtList.size(), 4); } @Test @@ -191,7 +197,7 @@ public void tagListCopyAndEquals() { List tags = systemMetricTagService.tagListCopy(tagList); - Assert.assertEquals(tags, tagList); + Assertions.assertEquals(tags, tagList); } diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/common/model/SystemMetricSerializerTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/common/model/SystemMetricSerializerTest.java index e04e0efd86a0..b5e4d12bd3fa 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/common/model/SystemMetricSerializerTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/common/model/SystemMetricSerializerTest.java @@ -21,7 +21,7 @@ import com.navercorp.pinpoint.metric.collector.view.SystemMetricView; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/common/model/TagComparatorTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/common/model/TagComparatorTest.java index c3b510beabc8..268a14a85c9a 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/common/model/TagComparatorTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/common/model/TagComparatorTest.java @@ -1,13 +1,12 @@ package com.navercorp.pinpoint.metric.common.model; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Comparator; import java.util.List; - /** * @author minwoo.jung */ @@ -23,24 +22,24 @@ public void compareTest() { tagList.add(new Tag("ACCC", "1123")); tagList.add(new Tag("AAAAAAAA", "1123")); - Assert.assertEquals(tagList.size(), 6); - Assert.assertEquals(tagList.get(0).getName(), "HHH"); - Assert.assertEquals(tagList.get(1).getName(), "AAAA"); - Assert.assertEquals(tagList.get(2).getName(), "ZZZZ"); - Assert.assertEquals(tagList.get(3).getName(), "AABB"); - Assert.assertEquals(tagList.get(4).getName(), "ACCC"); - Assert.assertEquals(tagList.get(5).getName(), "AAAAAAAA"); + Assertions.assertEquals(tagList.size(), 6); + Assertions.assertEquals(tagList.get(0).getName(), "HHH"); + Assertions.assertEquals(tagList.get(1).getName(), "AAAA"); + Assertions.assertEquals(tagList.get(2).getName(), "ZZZZ"); + Assertions.assertEquals(tagList.get(3).getName(), "AABB"); + Assertions.assertEquals(tagList.get(4).getName(), "ACCC"); + Assertions.assertEquals(tagList.get(5).getName(), "AAAAAAAA"); Comparator comparator = new TagComparator(); tagList.sort(comparator); - Assert.assertEquals(tagList.size(), 6); - Assert.assertEquals(tagList.get(0).getName(), "AAAA"); - Assert.assertEquals(tagList.get(1).getName(), "AAAAAAAA"); - Assert.assertEquals(tagList.get(2).getName(), "AABB"); - Assert.assertEquals(tagList.get(3).getName(), "ACCC"); - Assert.assertEquals(tagList.get(4).getName(), "HHH"); - Assert.assertEquals(tagList.get(5).getName(), "ZZZZ"); + Assertions.assertEquals(tagList.size(), 6); + Assertions.assertEquals(tagList.get(0).getName(), "AAAA"); + Assertions.assertEquals(tagList.get(1).getName(), "AAAAAAAA"); + Assertions.assertEquals(tagList.get(2).getName(), "AABB"); + Assertions.assertEquals(tagList.get(3).getName(), "ACCC"); + Assertions.assertEquals(tagList.get(4).getName(), "HHH"); + Assertions.assertEquals(tagList.get(5).getName(), "ZZZZ"); } } diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/common/model/mybatis/TagListTypeHandlerTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/common/model/mybatis/TagListTypeHandlerTest.java index 0ec34c122fbb..26a41423890d 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/common/model/mybatis/TagListTypeHandlerTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/common/model/mybatis/TagListTypeHandlerTest.java @@ -6,8 +6,8 @@ import com.navercorp.pinpoint.metric.common.model.json.Tags; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -30,6 +30,6 @@ public void test() throws JsonProcessingException { Tags tags = mapper.readValue(json, Tags.class); logger.debug("deserialize:{}", tags.getTags()); - Assert.assertEquals(list, tags.getTags()); + Assertions.assertEquals(list, tags.getTags()); } } \ No newline at end of file diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/common/model/validation/TelegrafMetricsValidatorTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/common/model/validation/TelegrafMetricsValidatorTest.java index 10afd1d29444..e053e2b78a87 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/common/model/validation/TelegrafMetricsValidatorTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/common/model/validation/TelegrafMetricsValidatorTest.java @@ -4,8 +4,8 @@ import com.navercorp.pinpoint.metric.common.model.SystemMetric; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; @@ -28,7 +28,7 @@ public void testMetrics() { Set> result = validator.validate(metrics); - Assert.assertEquals(1, result.size()); + Assertions.assertEquals(1, result.size()); ConstraintViolationException invalid_metric = new ConstraintViolationException("invalid metric", result); logger.debug("{}", invalid_metric.toString()); diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/mapping/MappingsTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/mapping/MappingsTest.java index afaeb98be8bc..009268fd2503 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/mapping/MappingsTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/mapping/MappingsTest.java @@ -18,9 +18,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import com.navercorp.pinpoint.metric.web.model.basic.metric.group.MatchingRule; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.InputStream; @@ -36,9 +35,9 @@ public void test2() throws IOException { Mappings mappings = mapper.readValue(resource, Mappings.class); Metric metric = mappings.getMappings().get(0); - Assert.assertEquals("cpu", metric.getName()); - Assert.assertEquals("usage_user", metric.getFields().get(0).getName()); -// Assert.assertEquals(""); + Assertions.assertEquals("cpu", metric.getName()); + Assertions.assertEquals("usage_user", metric.getFields().get(0).getName()); +// Assertions.assertEquals(""); } } \ No newline at end of file diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/model/chart/SystemMetricChartTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/model/chart/SystemMetricChartTest.java index f009e06c62f3..f4e844ff67b4 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/model/chart/SystemMetricChartTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/model/chart/SystemMetricChartTest.java @@ -24,8 +24,8 @@ import com.navercorp.pinpoint.metric.web.util.TimeWindowSlotCentricSampler; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -75,24 +75,24 @@ public void createSystemMetricChartTest() { SystemMetricChart.SystemMetricChartGroup systemMetricChartGroup = systemMetricChart.getSystemMetricChartGroup(); List> tagsList = systemMetricChartGroup.getTagsList(); - Assert.assertEquals(2, tagsList.size()); - Assert.assertEquals(tagList1, tagsList.get(0)); - Assert.assertEquals(tagList2, tagsList.get(1)); + Assertions.assertEquals(2, tagsList.size()); + Assertions.assertEquals(tagList1, tagsList.get(0)); + Assertions.assertEquals(tagList2, tagsList.get(1)); List chartList = systemMetricChartGroup.getCharts(); - Assert.assertEquals(2, chartList.size()); + Assertions.assertEquals(2, chartList.size()); List pointsFromChart1 = chartList.get(0).getPoints(); int index = 0; for (Point point : pointsFromChart1) { - Assert.assertTrue(point.equals(sampledSystemMetricList.get(index * 2).getPoint())); + Assertions.assertTrue(point.equals(sampledSystemMetricList.get(index * 2).getPoint())); index++; } List pointsFromChart2 = chartList.get(1).getPoints(); index = 0; for (Point point : pointsFromChart2) { - Assert.assertTrue(point.equals(sampledSystemMetricList.get(index * 2 + 1).getPoint())); + Assertions.assertTrue(point.equals(sampledSystemMetricList.get(index * 2 + 1).getPoint())); index++; } } diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/mybatis/MybatisTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/mybatis/MybatisTest.java index 617ef857bac5..fabb83fbe665 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/mybatis/MybatisTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/mybatis/MybatisTest.java @@ -20,14 +20,14 @@ import org.apache.ibatis.session.SqlSessionFactory; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mybatis.spring.SqlSessionTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import javax.sql.DataSource; import java.sql.Connection; @@ -36,7 +36,7 @@ /** * @author Hyunjoon Cho */ -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith(SpringExtension.class) @ContextConfiguration(locations = {"classpath:/pinot/applicationContext-pinot-test.xml"}) public class MybatisTest { private final Logger logger = LogManager.getLogger(this.getClass()); @@ -50,24 +50,24 @@ public class MybatisTest { @Autowired SqlSessionTemplate sqlSessionTemplate; - @Ignore + @Disabled @Test public void testDataSource() throws Exception { Connection connection = dataSource.getConnection(); - Assert.assertTrue(connection instanceof PinotConnectionDelegator); + Assertions.assertTrue(connection instanceof PinotConnectionDelegator); PreparedStatement preparedStatement = connection.prepareStatement("testSQL"); - Assert.assertTrue(preparedStatement instanceof WrappedPinotPreparedStatement); + Assertions.assertTrue(preparedStatement instanceof WrappedPinotPreparedStatement); connection.close(); } - @Ignore + @Disabled @Test public void testFactory() { SqlSession session = sqlSessionFactory.openSession(); logger.info("session: {}", session); } - @Ignore + @Disabled @Test public void testTemplate() { logger.info("sqlSessionTemplate: {}", sqlSessionTemplate); diff --git a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/service/SystemMetricHostInfoServiceImplTest.java b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/service/SystemMetricHostInfoServiceImplTest.java index 25f6db50f5ea..16bbb0c34fd9 100644 --- a/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/service/SystemMetricHostInfoServiceImplTest.java +++ b/metric-module/metric/src/test/java/com/navercorp/pinpoint/metric/web/service/SystemMetricHostInfoServiceImplTest.java @@ -3,8 +3,8 @@ import com.navercorp.pinpoint.metric.common.model.Tag; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -25,7 +25,7 @@ public void test() { if (tagList.containsAll(comparedTagList)) { logger.debug("success"); } else { - Assert.fail(); + Assertions.fail(); } } diff --git a/plugins-loader/src/test/java/com/navercorp/pinpoint/loader/plugins/trace/yaml/TraceMetadataProviderYamlParserTest.java b/plugins-loader/src/test/java/com/navercorp/pinpoint/loader/plugins/trace/yaml/TraceMetadataProviderYamlParserTest.java index 9983767de494..25356415aaa2 100644 --- a/plugins-loader/src/test/java/com/navercorp/pinpoint/loader/plugins/trace/yaml/TraceMetadataProviderYamlParserTest.java +++ b/plugins-loader/src/test/java/com/navercorp/pinpoint/loader/plugins/trace/yaml/TraceMetadataProviderYamlParserTest.java @@ -16,18 +16,9 @@ package com.navercorp.pinpoint.loader.plugins.trace.yaml; -import com.navercorp.pinpoint.common.trace.AnnotationKey; -import com.navercorp.pinpoint.common.trace.AnnotationKeyMatcher; -import com.navercorp.pinpoint.common.trace.AnnotationKeyMatchers; -import com.navercorp.pinpoint.common.trace.AnnotationKeyProperty; -import com.navercorp.pinpoint.common.trace.DefaultServiceTypeInfo; -import com.navercorp.pinpoint.common.trace.ServiceType; -import com.navercorp.pinpoint.common.trace.ServiceTypeInfo; -import com.navercorp.pinpoint.common.trace.ServiceTypeProperty; -import com.navercorp.pinpoint.common.trace.TraceMetadataProvider; -import com.navercorp.pinpoint.common.trace.TraceMetadataSetupContext; +import com.navercorp.pinpoint.common.trace.*; import com.navercorp.pinpoint.loader.plugins.trace.TraceMetadataProviderParser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.URL; import java.util.ArrayList; @@ -39,7 +30,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author HyunGil Jeong diff --git a/plugins/akka-http/src/test/java/com/navercorp/pinpoint/plugin/akka/http/interceptor/RequestContextImplCompleteInterceptorTest.java b/plugins/akka-http/src/test/java/com/navercorp/pinpoint/plugin/akka/http/interceptor/RequestContextImplCompleteInterceptorTest.java index 31f1854774e2..fc9a7981d6e4 100644 --- a/plugins/akka-http/src/test/java/com/navercorp/pinpoint/plugin/akka/http/interceptor/RequestContextImplCompleteInterceptorTest.java +++ b/plugins/akka-http/src/test/java/com/navercorp/pinpoint/plugin/akka/http/interceptor/RequestContextImplCompleteInterceptorTest.java @@ -21,14 +21,15 @@ import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.plugin.akka.http.AkkaHttpConstants; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.verify; -@RunWith(org.mockito.junit.MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class RequestContextImplCompleteInterceptorTest { @Mock private TraceContext traceContext; @@ -44,7 +45,7 @@ public class RequestContextImplCompleteInterceptorTest { private RequestContextImplCompleteInterceptor interceptor; - @Before + @BeforeEach public void setUp() throws Exception { interceptor = new RequestContextImplCompleteInterceptor(traceContext, descriptor); } diff --git a/plugins/akka-http/src/test/java/com/navercorp/pinpoint/plugin/akka/http/interceptor/RequestContextImplFailInterceptorTest.java b/plugins/akka-http/src/test/java/com/navercorp/pinpoint/plugin/akka/http/interceptor/RequestContextImplFailInterceptorTest.java index 195972b507c7..95889f801fd4 100644 --- a/plugins/akka-http/src/test/java/com/navercorp/pinpoint/plugin/akka/http/interceptor/RequestContextImplFailInterceptorTest.java +++ b/plugins/akka-http/src/test/java/com/navercorp/pinpoint/plugin/akka/http/interceptor/RequestContextImplFailInterceptorTest.java @@ -20,14 +20,15 @@ import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.plugin.akka.http.AkkaHttpConstants; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.verify; -@RunWith(org.mockito.junit.MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class RequestContextImplFailInterceptorTest { @Mock @@ -43,7 +44,7 @@ public class RequestContextImplFailInterceptorTest { RequestContextImplFailInterceptor interceptor; - @Before + @BeforeEach public void setUp() { interceptor = new RequestContextImplFailInterceptor(traceContext, descriptor); } diff --git a/plugins/akka-http/src/test/java/com/navercorp/pinpoint/plugin/akka/http/interceptor/RequestContextImplRedirectInterceptorTest.java b/plugins/akka-http/src/test/java/com/navercorp/pinpoint/plugin/akka/http/interceptor/RequestContextImplRedirectInterceptorTest.java index 4ff639fb6748..4dbffde6103a 100644 --- a/plugins/akka-http/src/test/java/com/navercorp/pinpoint/plugin/akka/http/interceptor/RequestContextImplRedirectInterceptorTest.java +++ b/plugins/akka-http/src/test/java/com/navercorp/pinpoint/plugin/akka/http/interceptor/RequestContextImplRedirectInterceptorTest.java @@ -20,13 +20,14 @@ import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.plugin.akka.http.AkkaHttpConstants; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.verify; -@RunWith(org.mockito.junit.MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class RequestContextImplRedirectInterceptorTest { @Mock private TraceContext traceContext; diff --git a/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboConfigurationTest.java b/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboConfigurationTest.java index 1d674c7ee528..2fb6c8bdb066 100644 --- a/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboConfigurationTest.java +++ b/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboConfigurationTest.java @@ -17,13 +17,13 @@ package com.navercorp.pinpoint.plugin.apache.dubbo; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ApacheDubboConfigurationTest { @Mock @@ -33,13 +33,13 @@ public class ApacheDubboConfigurationTest { public void isDubboEnabled() { ApacheDubboConfiguration configuration = new ApacheDubboConfiguration(config); - Assert.assertFalse(configuration.isDubboEnabled()); + Assertions.assertFalse(configuration.isDubboEnabled()); } @Test public void getDubboBootstrapMains() { ApacheDubboConfiguration configuration = new ApacheDubboConfiguration(config); - Assert.assertEquals(configuration.getDubboBootstrapMains().size(),0); + Assertions.assertEquals(configuration.getDubboBootstrapMains().size(), 0); } } \ No newline at end of file diff --git a/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboConstantsTest.java b/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboConstantsTest.java index 179bca19a20e..aa4eb28cb610 100644 --- a/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboConstantsTest.java +++ b/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboConstantsTest.java @@ -16,27 +16,27 @@ package com.navercorp.pinpoint.plugin.apache.dubbo; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class ApacheDubboConstantsTest { @Test public void test() { - Assert.assertEquals(ApacheDubboConstants.DUBBO_PROVIDER_SERVICE_TYPE.getCode(), 1999); - Assert.assertEquals(ApacheDubboConstants.DUBBO_CONSUMER_SERVICE_TYPE.getCode(), 9997); - Assert.assertEquals(ApacheDubboConstants.DUBBO_PROVIDER_SERVICE_NO_STATISTICS_TYPE.getCode(), 9999); - Assert.assertEquals(ApacheDubboConstants.DUBBO_ARGS_ANNOTATION_KEY.getCode(), 997); - Assert.assertEquals(ApacheDubboConstants.DUBBO_RESULT_ANNOTATION_KEY.getCode(), 998); - Assert.assertEquals(ApacheDubboConstants.DUBBO_RPC_ANNOTATION_KEY.getCode(), 999); + Assertions.assertEquals(ApacheDubboConstants.DUBBO_PROVIDER_SERVICE_TYPE.getCode(), 1999); + Assertions.assertEquals(ApacheDubboConstants.DUBBO_CONSUMER_SERVICE_TYPE.getCode(), 9997); + Assertions.assertEquals(ApacheDubboConstants.DUBBO_PROVIDER_SERVICE_NO_STATISTICS_TYPE.getCode(), 9999); + Assertions.assertEquals(ApacheDubboConstants.DUBBO_ARGS_ANNOTATION_KEY.getCode(), 997); + Assertions.assertEquals(ApacheDubboConstants.DUBBO_RESULT_ANNOTATION_KEY.getCode(), 998); + Assertions.assertEquals(ApacheDubboConstants.DUBBO_RPC_ANNOTATION_KEY.getCode(), 999); - Assert.assertEquals(ApacheDubboConstants.META_DO_NOT_TRACE, "_DUBBO_DO_NOT_TRACE"); - Assert.assertEquals(ApacheDubboConstants.META_TRANSACTION_ID, "_DUBBO_TRASACTION_ID"); - Assert.assertEquals(ApacheDubboConstants.META_SPAN_ID, "_DUBBO_SPAN_ID"); - Assert.assertEquals(ApacheDubboConstants.META_PARENT_SPAN_ID, "_DUBBO_PARENT_SPAN_ID"); - Assert.assertEquals(ApacheDubboConstants.META_PARENT_APPLICATION_NAME, "_DUBBO_PARENT_APPLICATION_NAME"); - Assert.assertEquals(ApacheDubboConstants.META_PARENT_APPLICATION_TYPE, "_DUBBO_PARENT_APPLICATION_TYPE"); - Assert.assertEquals(ApacheDubboConstants.META_FLAGS, "_DUBBO_FLAGS"); - Assert.assertEquals(ApacheDubboConstants.MONITOR_SERVICE_FQCN, "org.apache.dubbo.monitor.MonitorService"); + Assertions.assertEquals(ApacheDubboConstants.META_DO_NOT_TRACE, "_DUBBO_DO_NOT_TRACE"); + Assertions.assertEquals(ApacheDubboConstants.META_TRANSACTION_ID, "_DUBBO_TRASACTION_ID"); + Assertions.assertEquals(ApacheDubboConstants.META_SPAN_ID, "_DUBBO_SPAN_ID"); + Assertions.assertEquals(ApacheDubboConstants.META_PARENT_SPAN_ID, "_DUBBO_PARENT_SPAN_ID"); + Assertions.assertEquals(ApacheDubboConstants.META_PARENT_APPLICATION_NAME, "_DUBBO_PARENT_APPLICATION_NAME"); + Assertions.assertEquals(ApacheDubboConstants.META_PARENT_APPLICATION_TYPE, "_DUBBO_PARENT_APPLICATION_TYPE"); + Assertions.assertEquals(ApacheDubboConstants.META_FLAGS, "_DUBBO_FLAGS"); + Assertions.assertEquals(ApacheDubboConstants.MONITOR_SERVICE_FQCN, "org.apache.dubbo.monitor.MonitorService"); } } \ No newline at end of file diff --git a/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboPluginTest.java b/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboPluginTest.java index 47811aebf982..d15777d06d64 100644 --- a/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboPluginTest.java +++ b/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboPluginTest.java @@ -20,7 +20,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentContext; import com.navercorp.pinpoint.bootstrap.instrument.transformer.TransformTemplate; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPluginSetupContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboProviderMethodDescriptorTest.java b/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboProviderMethodDescriptorTest.java index cda0166e4f23..2c855a3f9b4c 100644 --- a/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboProviderMethodDescriptorTest.java +++ b/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboProviderMethodDescriptorTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.common.trace.MethodType; import com.navercorp.pinpoint.common.util.LineNumber; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class ApacheDubboProviderMethodDescriptorTest { @@ -27,19 +27,19 @@ public class ApacheDubboProviderMethodDescriptorTest { public void test() { ApacheDubboProviderMethodDescriptor descriptor = new ApacheDubboProviderMethodDescriptor(); - Assert.assertEquals(descriptor.getApiDescriptor(), "Apache Dubbo Provider Process"); - Assert.assertEquals(descriptor.getApiId(), 0); - Assert.assertNull(descriptor.getClassName()); - Assert.assertEquals(descriptor.getFullName(), "com.navercorp.pinpoint.plugin.apache.dubbo.ApacheDubboProviderMethodDescriptor.invoke()"); + Assertions.assertEquals(descriptor.getApiDescriptor(), "Apache Dubbo Provider Process"); + Assertions.assertEquals(descriptor.getApiId(), 0); + Assertions.assertNull(descriptor.getClassName()); + Assertions.assertEquals(descriptor.getFullName(), "com.navercorp.pinpoint.plugin.apache.dubbo.ApacheDubboProviderMethodDescriptor.invoke()"); - Assert.assertEquals(descriptor.getLineNumber(), LineNumber.NO_LINE_NUMBER); - Assert.assertNull(descriptor.getMethodName()); + Assertions.assertEquals(descriptor.getLineNumber(), LineNumber.NO_LINE_NUMBER); + Assertions.assertNull(descriptor.getMethodName()); - Assert.assertNull(descriptor.getParameterDescriptor()); + Assertions.assertNull(descriptor.getParameterDescriptor()); - Assert.assertArrayEquals(descriptor.getParameterTypes(), new String[0]); + Assertions.assertArrayEquals(descriptor.getParameterTypes(), new String[0]); - Assert.assertArrayEquals(descriptor.getParameterVariableName(), new String[0]); - Assert.assertEquals(descriptor.getType(), MethodType.WEB_REQUEST); + Assertions.assertArrayEquals(descriptor.getParameterVariableName(), new String[0]); + Assertions.assertEquals(descriptor.getType(), MethodType.WEB_REQUEST); } } \ No newline at end of file diff --git a/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboTraceMetadataProviderTest.java b/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboTraceMetadataProviderTest.java index e8b2177bf58d..9817274162fd 100644 --- a/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboTraceMetadataProviderTest.java +++ b/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/ApacheDubboTraceMetadataProviderTest.java @@ -17,14 +17,14 @@ package com.navercorp.pinpoint.plugin.apache.dubbo; import com.navercorp.pinpoint.common.trace.TraceMetadataSetupContext; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ApacheDubboTraceMetadataProviderTest { @Mock diff --git a/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/interceptor/ApacheDubboConsumerInterceptorTest.java b/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/interceptor/ApacheDubboConsumerInterceptorTest.java index ec41a05a13c6..20c6c389ffb8 100644 --- a/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/interceptor/ApacheDubboConsumerInterceptorTest.java +++ b/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/interceptor/ApacheDubboConsumerInterceptorTest.java @@ -24,14 +24,14 @@ import org.apache.dubbo.common.URL; import org.apache.dubbo.rpc.RpcInvocation; import org.apache.dubbo.rpc.protocol.dubbo.DubboInvoker; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.doReturn; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ApacheDubboConsumerInterceptorTest { @Mock diff --git a/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/interceptor/ApacheDubboProviderInterceptorTest.java b/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/interceptor/ApacheDubboProviderInterceptorTest.java index 32bc92960860..c978b66a962a 100644 --- a/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/interceptor/ApacheDubboProviderInterceptorTest.java +++ b/plugins/apache-dubbo/src/test/java/com/navercorp/pinpoint/plugin/apache/dubbo/interceptor/ApacheDubboProviderInterceptorTest.java @@ -26,16 +26,16 @@ import org.apache.dubbo.rpc.Invoker; import org.apache.dubbo.rpc.RpcInvocation; import org.apache.dubbo.rpc.protocol.dubbo.DubboInvoker; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.UUID; import static org.mockito.Mockito.doReturn; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ApacheDubboProviderInterceptorTest { @Mock diff --git a/plugins/arcus/src/test/java/com/navercorp/pinpoint/plugin/arcus/ArcusPluginTest.java b/plugins/arcus/src/test/java/com/navercorp/pinpoint/plugin/arcus/ArcusPluginTest.java index 9327de951a77..0a3dfeafe262 100644 --- a/plugins/arcus/src/test/java/com/navercorp/pinpoint/plugin/arcus/ArcusPluginTest.java +++ b/plugins/arcus/src/test/java/com/navercorp/pinpoint/plugin/arcus/ArcusPluginTest.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.plugin.arcus; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; //@RunWith(ForkRunner.class) //@PinpointConfig("pinpoint-test.config") @@ -10,9 +10,9 @@ public class ArcusPluginTest { // TODO how to test intercpetor? - + @Test - @Ignore // until arcus modifier/interceptors are removed from pinpoint-profiler + @Disabled // until arcus modifier/interceptors are removed from pinpoint-profiler public void test() throws Exception { // // Class arcusClient = Class.forName("net.spy.memcached.ArcusClient"); diff --git a/plugins/arcus/src/test/java/com/navercorp/pinpoint/plugin/arcus/FrontCacheGetFutureModifierIntegrationTest.java b/plugins/arcus/src/test/java/com/navercorp/pinpoint/plugin/arcus/FrontCacheGetFutureModifierIntegrationTest.java index 15682dc9664c..c9c908eea7d9 100644 --- a/plugins/arcus/src/test/java/com/navercorp/pinpoint/plugin/arcus/FrontCacheGetFutureModifierIntegrationTest.java +++ b/plugins/arcus/src/test/java/com/navercorp/pinpoint/plugin/arcus/FrontCacheGetFutureModifierIntegrationTest.java @@ -1,21 +1,21 @@ package com.navercorp.pinpoint.plugin.arcus; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; /** * @author harebox */ public class FrontCacheGetFutureModifierIntegrationTest /*extends BasePinpointTest*/ { - @Before + @BeforeEach public void setUp() throws Exception { // MockitoAnnotations.initMocks(this); } @Test - @Ignore + @Disabled // FIXME 테스트 깨짐 public void frontCacheShouldBeTraced() throws Exception { // // given: front-cache-enabled ArcusClient diff --git a/plugins/arcus/src/test/java/com/navercorp/pinpoint/plugin/arcus/interceptor/ApiInterceptorTest.java b/plugins/arcus/src/test/java/com/navercorp/pinpoint/plugin/arcus/interceptor/ApiInterceptorTest.java index ebb302153877..4b90e66a3fc5 100644 --- a/plugins/arcus/src/test/java/com/navercorp/pinpoint/plugin/arcus/interceptor/ApiInterceptorTest.java +++ b/plugins/arcus/src/test/java/com/navercorp/pinpoint/plugin/arcus/interceptor/ApiInterceptorTest.java @@ -1,6 +1,6 @@ package com.navercorp.pinpoint.plugin.arcus.interceptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ApiInterceptorTest { diff --git a/plugins/arcus/src/test/java/com/navercorp/pinpoint/plugin/arcus/interceptor/BaseOperationTransitionStateInterceptorTest.java b/plugins/arcus/src/test/java/com/navercorp/pinpoint/plugin/arcus/interceptor/BaseOperationTransitionStateInterceptorTest.java index a927d03f9d04..cef66211d645 100644 --- a/plugins/arcus/src/test/java/com/navercorp/pinpoint/plugin/arcus/interceptor/BaseOperationTransitionStateInterceptorTest.java +++ b/plugins/arcus/src/test/java/com/navercorp/pinpoint/plugin/arcus/interceptor/BaseOperationTransitionStateInterceptorTest.java @@ -1,15 +1,15 @@ package com.navercorp.pinpoint.plugin.arcus.interceptor; -import org.junit.Assert; import net.spy.memcached.ops.OperationState; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class BaseOperationTransitionStateInterceptorTest { @Test public void testComplete() throws Exception { String complete = OperationState.COMPLETE.toString(); - Assert.assertEquals("COMPLETE", complete); + Assertions.assertEquals("COMPLETE", complete); } @Test @@ -27,7 +27,7 @@ public void existArcusTimeoutState() throws Exception { } } - Assert.fail("OperationState.TIMEDOUT state not found"); + Assertions.fail("OperationState.TIMEDOUT state not found"); } private boolean isArcusExist() { diff --git a/plugins/common-servlet/src/test/java/com/navercorp/pinpoint/plugin/common/servlet/RemoteAddressResolverFactoryTest.java b/plugins/common-servlet/src/test/java/com/navercorp/pinpoint/plugin/common/servlet/RemoteAddressResolverFactoryTest.java index ab9fc9edcc54..9d8920d83295 100644 --- a/plugins/common-servlet/src/test/java/com/navercorp/pinpoint/plugin/common/servlet/RemoteAddressResolverFactoryTest.java +++ b/plugins/common-servlet/src/test/java/com/navercorp/pinpoint/plugin/common/servlet/RemoteAddressResolverFactoryTest.java @@ -19,11 +19,11 @@ import com.navercorp.pinpoint.bootstrap.plugin.request.RequestAdaptor; import com.navercorp.pinpoint.bootstrap.plugin.request.util.RemoteAddressResolverFactory; import com.navercorp.pinpoint.plugin.common.servlet.util.HttpServletRequestAdaptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.servlet.http.HttpServletRequest; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/plugins/common-servlet/src/test/java/com/navercorp/pinpoint/plugin/common/servlet/ServerRequestRecorderFactoryTest.java b/plugins/common-servlet/src/test/java/com/navercorp/pinpoint/plugin/common/servlet/ServerRequestRecorderFactoryTest.java index 8c99a81bc8c2..646243fa08dc 100644 --- a/plugins/common-servlet/src/test/java/com/navercorp/pinpoint/plugin/common/servlet/ServerRequestRecorderFactoryTest.java +++ b/plugins/common-servlet/src/test/java/com/navercorp/pinpoint/plugin/common/servlet/ServerRequestRecorderFactoryTest.java @@ -21,7 +21,7 @@ import com.navercorp.pinpoint.bootstrap.plugin.request.ServerRequestRecorder; import com.navercorp.pinpoint.bootstrap.plugin.request.ServerRequestWrapper; import com.navercorp.pinpoint.bootstrap.plugin.request.ServerRequestWrapperAdaptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/plugins/common-servlet/src/test/java/com/navercorp/pinpoint/plugin/common/servlet/util/ServletArgumentValidatorTest.java b/plugins/common-servlet/src/test/java/com/navercorp/pinpoint/plugin/common/servlet/util/ServletArgumentValidatorTest.java index bc4077969a5d..306df422a682 100644 --- a/plugins/common-servlet/src/test/java/com/navercorp/pinpoint/plugin/common/servlet/util/ServletArgumentValidatorTest.java +++ b/plugins/common-servlet/src/test/java/com/navercorp/pinpoint/plugin/common/servlet/util/ServletArgumentValidatorTest.java @@ -18,9 +18,9 @@ import com.navercorp.pinpoint.bootstrap.logging.PLogger; import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -33,7 +33,8 @@ public class ServletArgumentValidatorTest { private ArgumentValidator validator; - @Before + + @BeforeEach public void setUp() throws Exception { PLogger logger = PLoggerFactory.getLogger(this.getClass()); this.validator = new ServletArgumentValidator(logger, 0, ServletRequest.class, 1, ServletResponse.class); @@ -45,20 +46,20 @@ public void valid() { Object[] argument = new Object[2]; argument[0] = mock(ServletRequest.class); argument[1] = mock(ServletResponse.class); - Assert.assertTrue(validator.validate(argument)); + Assertions.assertTrue(validator.validate(argument)); } @Test public void valid_boundary_check() { - Assert.assertFalse(validator.validate(null)); - Assert.assertFalse(validator.validate(new Object[0])); - Assert.assertFalse(validator.validate(new Object[1])); + Assertions.assertFalse(validator.validate(null)); + Assertions.assertFalse(validator.validate(new Object[0])); + Assertions.assertFalse(validator.validate(new Object[1])); Object[] argument = new Object[10]; argument[0] = mock(ServletRequest.class); argument[1] = mock(ServletResponse.class); - Assert.assertTrue(validator.validate(argument)); + Assertions.assertTrue(validator.validate(argument)); } @Test @@ -66,7 +67,7 @@ public void valid_fail1() { Object[] argument = new Object[2]; argument[0] = mock(ServletRequest.class); argument[1] = new Object(); - Assert.assertFalse(validator.validate(argument)); + Assertions.assertFalse(validator.validate(argument)); } @@ -76,6 +77,6 @@ public void valid_fail2() { Object[] argument = new Object[2]; argument[0] = new Object(); argument[1] = mock(ServletResponse.class); - Assert.assertFalse(validator.validate(argument)); + Assertions.assertFalse(validator.validate(argument)); } } \ No newline at end of file diff --git a/plugins/cubrid-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/cubrid/CubridConnectionStringParserTest.java b/plugins/cubrid-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/cubrid/CubridConnectionStringParserTest.java index eba2cd4b4ca6..eef74ff5bbfa 100644 --- a/plugins/cubrid-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/cubrid/CubridConnectionStringParserTest.java +++ b/plugins/cubrid-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/cubrid/CubridConnectionStringParserTest.java @@ -19,8 +19,8 @@ import com.navercorp.pinpoint.bootstrap.context.DatabaseInfo; import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcUrlParserV2; import com.navercorp.pinpoint.common.trace.ServiceType; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -28,18 +28,18 @@ public class CubridConnectionStringParserTest { private final JdbcUrlParserV2 parser = new CubridJdbcUrlParser(); - + @Test public void testParse1() { String cubrid = "jdbc:cubrid:10.99.196.126:34001:nrdwapw:::?charset=utf-8:"; DatabaseInfo dbInfo = parser.parse(cubrid); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(CubridConstants.CUBRID, dbInfo.getType()); - Assert.assertEquals("10.99.196.126:34001", dbInfo.getHost().get(0)); - Assert.assertEquals("nrdwapw", dbInfo.getDatabaseId()); - Assert.assertEquals("jdbc:cubrid:10.99.196.126:34001:nrdwapw:::", dbInfo.getUrl()); + Assertions.assertEquals(CubridConstants.CUBRID, dbInfo.getType()); + Assertions.assertEquals("10.99.196.126:34001", dbInfo.getHost().get(0)); + Assertions.assertEquals("nrdwapw", dbInfo.getDatabaseId()); + Assertions.assertEquals("jdbc:cubrid:10.99.196.126:34001:nrdwapw:::", dbInfo.getUrl()); } @Test @@ -47,12 +47,12 @@ public void testParse2() { String cubrid = "jdbc:cubrid-mysql:10.99.196.126:34001:nrdwapw:::?charset=utf-8:"; DatabaseInfo dbInfo = parser.parse(cubrid); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(CubridConstants.CUBRID, dbInfo.getType()); - Assert.assertEquals("10.99.196.126:34001", dbInfo.getHost().get(0)); - Assert.assertEquals("nrdwapw", dbInfo.getDatabaseId()); - Assert.assertEquals("jdbc:cubrid-mysql:10.99.196.126:34001:nrdwapw:::", dbInfo.getUrl()); + Assertions.assertEquals(CubridConstants.CUBRID, dbInfo.getType()); + Assertions.assertEquals("10.99.196.126:34001", dbInfo.getHost().get(0)); + Assertions.assertEquals("nrdwapw", dbInfo.getDatabaseId()); + Assertions.assertEquals("jdbc:cubrid-mysql:10.99.196.126:34001:nrdwapw:::", dbInfo.getUrl()); } @Test @@ -60,29 +60,29 @@ public void testParse3() { String cubrid = "jdbc:cubrid-oracle:10.99.196.126:34001:nrdwapw:::?charset=utf-8:"; DatabaseInfo dbInfo = parser.parse(cubrid); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(CubridConstants.CUBRID, dbInfo.getType()); - Assert.assertEquals("10.99.196.126:34001", dbInfo.getHost().get(0)); - Assert.assertEquals("nrdwapw", dbInfo.getDatabaseId()); - Assert.assertEquals("jdbc:cubrid-oracle:10.99.196.126:34001:nrdwapw:::", dbInfo.getUrl()); + Assertions.assertEquals(CubridConstants.CUBRID, dbInfo.getType()); + Assertions.assertEquals("10.99.196.126:34001", dbInfo.getHost().get(0)); + Assertions.assertEquals("nrdwapw", dbInfo.getDatabaseId()); + Assertions.assertEquals("jdbc:cubrid-oracle:10.99.196.126:34001:nrdwapw:::", dbInfo.getUrl()); } @Test public void parseFailTest1() { DatabaseInfo dbInfo = parser.parse(null); - Assert.assertFalse(dbInfo.isParsingComplete()); + Assertions.assertFalse(dbInfo.isParsingComplete()); - Assert.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); + Assertions.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); } @Test public void parseFailTest2() { String cubrid = "jdbc:mysql:10.99.196.126:34001:nrdwapw:::?charset=utf-8:"; DatabaseInfo dbInfo = parser.parse(cubrid); - Assert.assertFalse(dbInfo.isParsingComplete()); + Assertions.assertFalse(dbInfo.isParsingComplete()); - Assert.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); + Assertions.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); } } diff --git a/plugins/dbcp/src/test/java/com/navercorp/pinpoint/plugin/commons/dbcp/CommonsDbcpConfigTest.java b/plugins/dbcp/src/test/java/com/navercorp/pinpoint/plugin/commons/dbcp/CommonsDbcpConfigTest.java index 6803a4d451b6..428d4497f556 100644 --- a/plugins/dbcp/src/test/java/com/navercorp/pinpoint/plugin/commons/dbcp/CommonsDbcpConfigTest.java +++ b/plugins/dbcp/src/test/java/com/navercorp/pinpoint/plugin/commons/dbcp/CommonsDbcpConfigTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfigLoader; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -32,32 +32,32 @@ public class CommonsDbcpConfigTest { public void configTest1() throws Exception { CommonsDbcpConfig commonsDbcpConfig = createCommonsDbcpConfig("false", "false"); - Assert.assertFalse(commonsDbcpConfig.isPluginEnable()); - Assert.assertFalse(commonsDbcpConfig.isProfileClose()); + Assertions.assertFalse(commonsDbcpConfig.isPluginEnable()); + Assertions.assertFalse(commonsDbcpConfig.isProfileClose()); } @Test public void configTest2() throws Exception { CommonsDbcpConfig commonsDbcpConfig = createCommonsDbcpConfig("false", "true"); - Assert.assertFalse(commonsDbcpConfig.isPluginEnable()); - Assert.assertTrue(commonsDbcpConfig.isProfileClose()); + Assertions.assertFalse(commonsDbcpConfig.isPluginEnable()); + Assertions.assertTrue(commonsDbcpConfig.isProfileClose()); } @Test public void configTest3() throws Exception { CommonsDbcpConfig commonsDbcpConfig = createCommonsDbcpConfig("true", "false"); - Assert.assertTrue(commonsDbcpConfig.isPluginEnable()); - Assert.assertFalse(commonsDbcpConfig.isProfileClose()); + Assertions.assertTrue(commonsDbcpConfig.isPluginEnable()); + Assertions.assertFalse(commonsDbcpConfig.isProfileClose()); } @Test public void configTest4() throws Exception { CommonsDbcpConfig commonsDbcpConfig = createCommonsDbcpConfig("true", "true"); - Assert.assertTrue(commonsDbcpConfig.isPluginEnable()); - Assert.assertTrue(commonsDbcpConfig.isProfileClose()); + Assertions.assertTrue(commonsDbcpConfig.isPluginEnable()); + Assertions.assertTrue(commonsDbcpConfig.isProfileClose()); } private CommonsDbcpConfig createCommonsDbcpConfig(String pluginEnable, String profileConnectionCloseEnable) { diff --git a/plugins/dbcp2/src/test/java/com/navercorp/pinpoint/plugin/commons/dbcp2/CommonsDbcp2ConfigTest.java b/plugins/dbcp2/src/test/java/com/navercorp/pinpoint/plugin/commons/dbcp2/CommonsDbcp2ConfigTest.java index 41ecf9016b1b..79d26ea5e228 100644 --- a/plugins/dbcp2/src/test/java/com/navercorp/pinpoint/plugin/commons/dbcp2/CommonsDbcp2ConfigTest.java +++ b/plugins/dbcp2/src/test/java/com/navercorp/pinpoint/plugin/commons/dbcp2/CommonsDbcp2ConfigTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfigLoader; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -32,32 +32,32 @@ public class CommonsDbcp2ConfigTest { public void configTest1() { CommonsDbcp2Config commonsDbcpConfig = createCommonsDbcpConfig("false", "false"); - Assert.assertFalse(commonsDbcpConfig.isPluginEnable()); - Assert.assertFalse(commonsDbcpConfig.isProfileClose()); + Assertions.assertFalse(commonsDbcpConfig.isPluginEnable()); + Assertions.assertFalse(commonsDbcpConfig.isProfileClose()); } @Test public void configTest2() { CommonsDbcp2Config commonsDbcpConfig = createCommonsDbcpConfig("false", "true"); - Assert.assertFalse(commonsDbcpConfig.isPluginEnable()); - Assert.assertTrue(commonsDbcpConfig.isProfileClose()); + Assertions.assertFalse(commonsDbcpConfig.isPluginEnable()); + Assertions.assertTrue(commonsDbcpConfig.isProfileClose()); } @Test public void configTest3() { CommonsDbcp2Config commonsDbcpConfig = createCommonsDbcpConfig("true", "false"); - Assert.assertTrue(commonsDbcpConfig.isPluginEnable()); - Assert.assertFalse(commonsDbcpConfig.isProfileClose()); + Assertions.assertTrue(commonsDbcpConfig.isPluginEnable()); + Assertions.assertFalse(commonsDbcpConfig.isProfileClose()); } @Test public void configTest4() { CommonsDbcp2Config commonsDbcpConfig = createCommonsDbcpConfig("true", "true"); - Assert.assertTrue(commonsDbcpConfig.isPluginEnable()); - Assert.assertTrue(commonsDbcpConfig.isProfileClose()); + Assertions.assertTrue(commonsDbcpConfig.isPluginEnable()); + Assertions.assertTrue(commonsDbcpConfig.isProfileClose()); } private CommonsDbcp2Config createCommonsDbcpConfig(String pluginEnable, String profileConnectionCloseEnable) { diff --git a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DataSourceMonitorAccessorTest.java b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DataSourceMonitorAccessorTest.java index 1d64489e70bc..e3dea301f5d7 100644 --- a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DataSourceMonitorAccessorTest.java +++ b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DataSourceMonitorAccessorTest.java @@ -1,6 +1,6 @@ package com.navercorp.pinpoint.plugin.druid; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DataSourceMonitorAccessorTest implements DataSourceMonitorAccessor { diff --git a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidConfigTest.java b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidConfigTest.java index 19590d97937a..f630cd62a75f 100644 --- a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidConfigTest.java +++ b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidConfigTest.java @@ -1,8 +1,8 @@ package com.navercorp.pinpoint.plugin.druid; import com.navercorp.pinpoint.bootstrap.config.DefaultProfilerConfig; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class DruidConfigTest { @@ -11,9 +11,9 @@ public void test() { DruidConfig config = new DruidConfig(new DefaultProfilerConfig()); - Assert.assertNotNull(config); - Assert.assertFalse(config.isPluginEnable()); - Assert.assertFalse(config.isProfileClose()); + Assertions.assertNotNull(config); + Assertions.assertFalse(config.isPluginEnable()); + Assertions.assertFalse(config.isProfileClose()); } diff --git a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidConstantsTest.java b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidConstantsTest.java index 63b2b7b01754..c4453e03a48b 100644 --- a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidConstantsTest.java +++ b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidConstantsTest.java @@ -1,22 +1,22 @@ package com.navercorp.pinpoint.plugin.druid; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class DruidConstantsTest { @Test public void test() { - Assert.assertEquals(DruidConstants.SCOPE, "DRUID_SCOPE"); - Assert.assertEquals(DruidConstants.SERVICE_TYPE.getName(), "DRUID"); + Assertions.assertEquals(DruidConstants.SCOPE, "DRUID_SCOPE"); + Assertions.assertEquals(DruidConstants.SERVICE_TYPE.getName(), "DRUID"); - Assert.assertEquals("com.navercorp.pinpoint.plugin.druid.DataSourceMonitorAccessor", "com.navercorp.pinpoint.plugin.druid.DataSourceMonitorAccessor"); - Assert.assertEquals("com.navercorp.pinpoint.plugin.druid.interceptor.DataSourceConstructorInterceptor", "com.navercorp.pinpoint.plugin.druid.interceptor.DataSourceConstructorInterceptor"); - Assert.assertEquals("com.navercorp.pinpoint.plugin.druid.interceptor.DataSourceCloseInterceptor", "com.navercorp.pinpoint.plugin.druid.interceptor.DataSourceCloseInterceptor"); - Assert.assertEquals("com.navercorp.pinpoint.plugin.druid.interceptor.DataSourceGetConnectionInterceptor", "com.navercorp.pinpoint.plugin.druid.interceptor.DataSourceGetConnectionInterceptor"); - Assert.assertEquals("com.navercorp.pinpoint.plugin.druid.interceptor.DataSourceCloseConnectionInterceptor", "com.navercorp.pinpoint.plugin.druid.interceptor.DataSourceCloseConnectionInterceptor"); + Assertions.assertEquals("com.navercorp.pinpoint.plugin.druid.DataSourceMonitorAccessor", "com.navercorp.pinpoint.plugin.druid.DataSourceMonitorAccessor"); + Assertions.assertEquals("com.navercorp.pinpoint.plugin.druid.interceptor.DataSourceConstructorInterceptor", "com.navercorp.pinpoint.plugin.druid.interceptor.DataSourceConstructorInterceptor"); + Assertions.assertEquals("com.navercorp.pinpoint.plugin.druid.interceptor.DataSourceCloseInterceptor", "com.navercorp.pinpoint.plugin.druid.interceptor.DataSourceCloseInterceptor"); + Assertions.assertEquals("com.navercorp.pinpoint.plugin.druid.interceptor.DataSourceGetConnectionInterceptor", "com.navercorp.pinpoint.plugin.druid.interceptor.DataSourceGetConnectionInterceptor"); + Assertions.assertEquals("com.navercorp.pinpoint.plugin.druid.interceptor.DataSourceCloseConnectionInterceptor", "com.navercorp.pinpoint.plugin.druid.interceptor.DataSourceCloseConnectionInterceptor"); - Assert.assertEquals(DruidConstants.PLUGIN_ENABLE, "profiler.jdbc.druid"); - Assert.assertEquals(DruidConstants.PROFILE_CONNECTIONCLOSE_ENABLE, "profiler.jdbc.druid.connectionclose"); + Assertions.assertEquals(DruidConstants.PLUGIN_ENABLE, "profiler.jdbc.druid"); + Assertions.assertEquals(DruidConstants.PROFILE_CONNECTIONCLOSE_ENABLE, "profiler.jdbc.druid.connectionclose"); } } \ No newline at end of file diff --git a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidDataSourceMonitorTest.java b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidDataSourceMonitorTest.java index 145c532b23ef..d2bf71c8b406 100644 --- a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidDataSourceMonitorTest.java +++ b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidDataSourceMonitorTest.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.plugin.druid; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class DruidDataSourceMonitorTest extends DataSourceMonitorAccessorTest { @@ -10,17 +10,17 @@ public void test() { DruidDataSourceMonitor monitor = new DruidDataSourceMonitor(new DruidDataSourceTest()); - Assert.assertFalse(monitor.isDisabled()); + Assertions.assertFalse(monitor.isDisabled()); monitor.close(); - Assert.assertTrue(monitor.isDisabled()); + Assertions.assertTrue(monitor.isDisabled()); - Assert.assertEquals(monitor.getServiceType(), DruidConstants.SERVICE_TYPE); + Assertions.assertEquals(monitor.getServiceType(), DruidConstants.SERVICE_TYPE); - Assert.assertEquals(monitor.getUrl(), null); - Assert.assertEquals(monitor.getActiveConnectionSize(), -1); - Assert.assertEquals(monitor.getMaxConnectionSize(), -1); + Assertions.assertEquals(monitor.getUrl(), null); + Assertions.assertEquals(monitor.getActiveConnectionSize(), -1); + Assertions.assertEquals(monitor.getMaxConnectionSize(), -1); } } \ No newline at end of file diff --git a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidMetadataProviderTest.java b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidMetadataProviderTest.java index ba6591421935..e6ad801682d0 100644 --- a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidMetadataProviderTest.java +++ b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidMetadataProviderTest.java @@ -4,8 +4,8 @@ import com.navercorp.pinpoint.common.trace.AnnotationKeyMatcher; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.trace.TraceMetadataSetupContext; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class DruidMetadataProviderTest { @@ -19,7 +19,7 @@ public void test() { @Override public void addServiceType(ServiceType serviceType) { - Assert.assertEquals(serviceType, DruidConstants.SERVICE_TYPE); + Assertions.assertEquals(serviceType, DruidConstants.SERVICE_TYPE); } @Override diff --git a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidPluginTest.java b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidPluginTest.java index fe1edd40067f..6d68381ffa54 100644 --- a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidPluginTest.java +++ b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/DruidPluginTest.java @@ -4,7 +4,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentContext; import com.navercorp.pinpoint.bootstrap.instrument.transformer.TransformTemplate; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPluginSetupContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/interceptor/DataSourceCloseConnectionInterceptorTest.java b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/interceptor/DataSourceCloseConnectionInterceptorTest.java index e91ac6baadec..fa3665a50a17 100644 --- a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/interceptor/DataSourceCloseConnectionInterceptorTest.java +++ b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/interceptor/DataSourceCloseConnectionInterceptorTest.java @@ -3,12 +3,13 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class DataSourceCloseConnectionInterceptorTest { @Mock diff --git a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/interceptor/DataSourceCloseInterceptorTest.java b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/interceptor/DataSourceCloseInterceptorTest.java index e3b462d14522..f9cfca0c59fa 100644 --- a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/interceptor/DataSourceCloseInterceptorTest.java +++ b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/interceptor/DataSourceCloseInterceptorTest.java @@ -3,7 +3,7 @@ import com.navercorp.pinpoint.bootstrap.plugin.monitor.DataSourceMonitor; import com.navercorp.pinpoint.bootstrap.plugin.monitor.DataSourceMonitorRegistry; import com.navercorp.pinpoint.plugin.druid.DruidDataSourceTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DataSourceCloseInterceptorTest { diff --git a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/interceptor/DataSourceConstructorInterceptorTest.java b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/interceptor/DataSourceConstructorInterceptorTest.java index 6fc13740fda9..edd32e4fa45f 100644 --- a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/interceptor/DataSourceConstructorInterceptorTest.java +++ b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/interceptor/DataSourceConstructorInterceptorTest.java @@ -3,7 +3,7 @@ import com.navercorp.pinpoint.bootstrap.plugin.monitor.DataSourceMonitor; import com.navercorp.pinpoint.bootstrap.plugin.monitor.DataSourceMonitorRegistry; import com.navercorp.pinpoint.plugin.druid.DruidDataSourceTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class DataSourceConstructorInterceptorTest { diff --git a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/interceptor/DataSourceGetConnectionInterceptorTest.java b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/interceptor/DataSourceGetConnectionInterceptorTest.java index 15a85e0d7a7f..8b40256273f7 100644 --- a/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/interceptor/DataSourceGetConnectionInterceptorTest.java +++ b/plugins/druid/src/test/java/com/navercorp/pinpoint/plugin/druid/interceptor/DataSourceGetConnectionInterceptorTest.java @@ -3,12 +3,13 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class DataSourceGetConnectionInterceptorTest { @Mock diff --git a/plugins/dubbo/src/test/java/com/navercorp/pinpoint/plugin/dubbo/DubboConfigurationTest.java b/plugins/dubbo/src/test/java/com/navercorp/pinpoint/plugin/dubbo/DubboConfigurationTest.java index 6e396e6f41e9..703e015294e1 100644 --- a/plugins/dubbo/src/test/java/com/navercorp/pinpoint/plugin/dubbo/DubboConfigurationTest.java +++ b/plugins/dubbo/src/test/java/com/navercorp/pinpoint/plugin/dubbo/DubboConfigurationTest.java @@ -1,13 +1,13 @@ package com.navercorp.pinpoint.plugin.dubbo; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class DubboConfigurationTest { @Mock @@ -18,7 +18,7 @@ public void isDubboEnabled() { DubboConfiguration configuration = new DubboConfiguration(config); - Assert.assertFalse(configuration.isDubboEnabled()); + Assertions.assertFalse(configuration.isDubboEnabled()); } @Test @@ -26,7 +26,7 @@ public void getDubboBootstrapMains() { DubboConfiguration configuration = new DubboConfiguration(config); - Assert.assertEquals(configuration.getDubboBootstrapMains().size(),0); + Assertions.assertEquals(configuration.getDubboBootstrapMains().size(), 0); } } \ No newline at end of file diff --git a/plugins/dubbo/src/test/java/com/navercorp/pinpoint/plugin/dubbo/DubboConstantsTest.java b/plugins/dubbo/src/test/java/com/navercorp/pinpoint/plugin/dubbo/DubboConstantsTest.java index a32c2a346e11..bfdb21a09306 100644 --- a/plugins/dubbo/src/test/java/com/navercorp/pinpoint/plugin/dubbo/DubboConstantsTest.java +++ b/plugins/dubbo/src/test/java/com/navercorp/pinpoint/plugin/dubbo/DubboConstantsTest.java @@ -1,28 +1,28 @@ package com.navercorp.pinpoint.plugin.dubbo; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class DubboConstantsTest { @Test public void test() { - Assert.assertEquals(DubboConstants.DUBBO_PROVIDER_SERVICE_TYPE.getCode(), 1110); - Assert.assertEquals(DubboConstants.DUBBO_CONSUMER_SERVICE_TYPE.getCode(), 9110); - Assert.assertEquals(DubboConstants.DUBBO_PROVIDER_SERVICE_NO_STATISTICS_TYPE.getCode(), 9111); - Assert.assertEquals(DubboConstants.DUBBO_ARGS_ANNOTATION_KEY.getCode(), 90); - Assert.assertEquals(DubboConstants.DUBBO_RESULT_ANNOTATION_KEY.getCode(), 91); - Assert.assertEquals(DubboConstants.DUBBO_RPC_ANNOTATION_KEY.getCode(), 92); + Assertions.assertEquals(DubboConstants.DUBBO_PROVIDER_SERVICE_TYPE.getCode(), 1110); + Assertions.assertEquals(DubboConstants.DUBBO_CONSUMER_SERVICE_TYPE.getCode(), 9110); + Assertions.assertEquals(DubboConstants.DUBBO_PROVIDER_SERVICE_NO_STATISTICS_TYPE.getCode(), 9111); + Assertions.assertEquals(DubboConstants.DUBBO_ARGS_ANNOTATION_KEY.getCode(), 90); + Assertions.assertEquals(DubboConstants.DUBBO_RESULT_ANNOTATION_KEY.getCode(), 91); + Assertions.assertEquals(DubboConstants.DUBBO_RPC_ANNOTATION_KEY.getCode(), 92); - Assert.assertEquals(DubboConstants.META_DO_NOT_TRACE, "_DUBBO_DO_NOT_TRACE"); - Assert.assertEquals(DubboConstants.META_TRANSACTION_ID, "_DUBBO_TRASACTION_ID"); - Assert.assertEquals(DubboConstants.META_SPAN_ID, "_DUBBO_SPAN_ID"); - Assert.assertEquals(DubboConstants.META_PARENT_SPAN_ID, "_DUBBO_PARENT_SPAN_ID"); - Assert.assertEquals(DubboConstants.META_PARENT_APPLICATION_NAME, "_DUBBO_PARENT_APPLICATION_NAME"); - Assert.assertEquals(DubboConstants.META_PARENT_APPLICATION_TYPE, "_DUBBO_PARENT_APPLICATION_TYPE"); - Assert.assertEquals(DubboConstants.META_FLAGS, "_DUBBO_FLAGS"); - Assert.assertEquals(DubboConstants.MONITOR_SERVICE_FQCN, "com.alibaba.dubbo.monitor.MonitorService"); + Assertions.assertEquals(DubboConstants.META_DO_NOT_TRACE, "_DUBBO_DO_NOT_TRACE"); + Assertions.assertEquals(DubboConstants.META_TRANSACTION_ID, "_DUBBO_TRASACTION_ID"); + Assertions.assertEquals(DubboConstants.META_SPAN_ID, "_DUBBO_SPAN_ID"); + Assertions.assertEquals(DubboConstants.META_PARENT_SPAN_ID, "_DUBBO_PARENT_SPAN_ID"); + Assertions.assertEquals(DubboConstants.META_PARENT_APPLICATION_NAME, "_DUBBO_PARENT_APPLICATION_NAME"); + Assertions.assertEquals(DubboConstants.META_PARENT_APPLICATION_TYPE, "_DUBBO_PARENT_APPLICATION_TYPE"); + Assertions.assertEquals(DubboConstants.META_FLAGS, "_DUBBO_FLAGS"); + Assertions.assertEquals(DubboConstants.MONITOR_SERVICE_FQCN, "com.alibaba.dubbo.monitor.MonitorService"); } } \ No newline at end of file diff --git a/plugins/dubbo/src/test/java/com/navercorp/pinpoint/plugin/dubbo/DubboProviderMethodDescriptorTest.java b/plugins/dubbo/src/test/java/com/navercorp/pinpoint/plugin/dubbo/DubboProviderMethodDescriptorTest.java index 0a82e097c188..5679ac9a6df9 100644 --- a/plugins/dubbo/src/test/java/com/navercorp/pinpoint/plugin/dubbo/DubboProviderMethodDescriptorTest.java +++ b/plugins/dubbo/src/test/java/com/navercorp/pinpoint/plugin/dubbo/DubboProviderMethodDescriptorTest.java @@ -2,8 +2,8 @@ import com.navercorp.pinpoint.common.trace.MethodType; import com.navercorp.pinpoint.common.util.LineNumber; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class DubboProviderMethodDescriptorTest { @@ -12,19 +12,19 @@ public void test() { DubboProviderMethodDescriptor descriptor = new DubboProviderMethodDescriptor(); - Assert.assertEquals(descriptor.getApiDescriptor(), "Dubbo Provider Process"); - Assert.assertEquals(descriptor.getApiId(), 0); - Assert.assertNull(descriptor.getClassName()); - Assert.assertEquals(descriptor.getFullName(), "com.navercorp.pinpoint.plugin.dubbo.DubboProviderMethodDescriptor.invoke()"); + Assertions.assertEquals(descriptor.getApiDescriptor(), "Dubbo Provider Process"); + Assertions.assertEquals(descriptor.getApiId(), 0); + Assertions.assertNull(descriptor.getClassName()); + Assertions.assertEquals(descriptor.getFullName(), "com.navercorp.pinpoint.plugin.dubbo.DubboProviderMethodDescriptor.invoke()"); - Assert.assertEquals(descriptor.getLineNumber(), LineNumber.NO_LINE_NUMBER); - Assert.assertNull(descriptor.getMethodName()); + Assertions.assertEquals(descriptor.getLineNumber(), LineNumber.NO_LINE_NUMBER); + Assertions.assertNull(descriptor.getMethodName()); - Assert.assertNull(descriptor.getParameterDescriptor()); + Assertions.assertNull(descriptor.getParameterDescriptor()); - Assert.assertArrayEquals(descriptor.getParameterTypes(), new String[0]); + Assertions.assertArrayEquals(descriptor.getParameterTypes(), new String[0]); - Assert.assertArrayEquals(descriptor.getParameterVariableName(), new String[0]); - Assert.assertEquals(descriptor.getType(), MethodType.WEB_REQUEST); + Assertions.assertArrayEquals(descriptor.getParameterVariableName(), new String[0]); + Assertions.assertEquals(descriptor.getType(), MethodType.WEB_REQUEST); } } \ No newline at end of file diff --git a/plugins/dubbo/src/test/java/com/navercorp/pinpoint/plugin/dubbo/DubboTraceMetadataProviderTest.java b/plugins/dubbo/src/test/java/com/navercorp/pinpoint/plugin/dubbo/DubboTraceMetadataProviderTest.java index ec448d409fdb..b777ed83ba9a 100644 --- a/plugins/dubbo/src/test/java/com/navercorp/pinpoint/plugin/dubbo/DubboTraceMetadataProviderTest.java +++ b/plugins/dubbo/src/test/java/com/navercorp/pinpoint/plugin/dubbo/DubboTraceMetadataProviderTest.java @@ -1,14 +1,14 @@ package com.navercorp.pinpoint.plugin.dubbo; import com.navercorp.pinpoint.common.trace.TraceMetadataSetupContext; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class DubboTraceMetadataProviderTest { @Mock diff --git a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/FastjsonConfigTest.java b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/FastjsonConfigTest.java index 7021c584bf3f..00be939d20d0 100644 --- a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/FastjsonConfigTest.java +++ b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/FastjsonConfigTest.java @@ -2,8 +2,8 @@ import com.navercorp.pinpoint.bootstrap.config.DefaultProfilerConfig; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class FastjsonConfigTest { @Test @@ -13,7 +13,7 @@ public void isProfile() { FastjsonConfig config = new FastjsonConfig(profilerConfig); - Assert.assertFalse(config.isProfile()); + Assertions.assertFalse(config.isProfile()); } diff --git a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/FastjsonConstantsTest.java b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/FastjsonConstantsTest.java index edc28366c096..63715d8850cf 100644 --- a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/FastjsonConstantsTest.java +++ b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/FastjsonConstantsTest.java @@ -1,18 +1,18 @@ package com.navercorp.pinpoint.plugin.fastjson; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class FastjsonConstantsTest { @Test public void test() { - Assert.assertEquals(FastjsonConstants.SCOPE, "FASTJSON_SCOPE"); - Assert.assertEquals(FastjsonConstants.CONFIG, "profiler.json.fastjson"); - Assert.assertEquals(FastjsonConstants.SERVICE_TYPE.getCode(), 5013); - Assert.assertEquals(FastjsonConstants.SERVICE_TYPE.getName(), "FASTJSON"); - Assert.assertEquals(FastjsonConstants.ANNOTATION_KEY_JSON_LENGTH.getCode(), 9003); - Assert.assertEquals(FastjsonConstants.ANNOTATION_KEY_JSON_LENGTH.getName(), "fastjson.json.length"); + Assertions.assertEquals(FastjsonConstants.SCOPE, "FASTJSON_SCOPE"); + Assertions.assertEquals(FastjsonConstants.CONFIG, "profiler.json.fastjson"); + Assertions.assertEquals(FastjsonConstants.SERVICE_TYPE.getCode(), 5013); + Assertions.assertEquals(FastjsonConstants.SERVICE_TYPE.getName(), "FASTJSON"); + Assertions.assertEquals(FastjsonConstants.ANNOTATION_KEY_JSON_LENGTH.getCode(), 9003); + Assertions.assertEquals(FastjsonConstants.ANNOTATION_KEY_JSON_LENGTH.getName(), "fastjson.json.length"); } } \ No newline at end of file diff --git a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/FastjsonMetadataProviderTest.java b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/FastjsonMetadataProviderTest.java index b9f66ee08d8e..5aa5608cfb01 100644 --- a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/FastjsonMetadataProviderTest.java +++ b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/FastjsonMetadataProviderTest.java @@ -4,8 +4,8 @@ import com.navercorp.pinpoint.common.trace.AnnotationKeyMatcher; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.trace.TraceMetadataSetupContext; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class FastjsonMetadataProviderTest { @@ -18,17 +18,17 @@ public void setup() { @Override public void addServiceType(ServiceType serviceType) { - Assert.assertEquals(serviceType, FastjsonConstants.SERVICE_TYPE); + Assertions.assertEquals(serviceType, FastjsonConstants.SERVICE_TYPE); } @Override public void addServiceType(ServiceType serviceType, AnnotationKeyMatcher annotationKeyMatcher) { - Assert.assertEquals(serviceType, FastjsonConstants.SERVICE_TYPE); + Assertions.assertEquals(serviceType, FastjsonConstants.SERVICE_TYPE); } @Override public void addAnnotationKey(AnnotationKey annotationKey) { - Assert.assertEquals(annotationKey, FastjsonConstants.ANNOTATION_KEY_JSON_LENGTH); + Assertions.assertEquals(annotationKey, FastjsonConstants.ANNOTATION_KEY_JSON_LENGTH); } }); } diff --git a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/FastjsonPluginTest.java b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/FastjsonPluginTest.java index 910353c1458e..807aafa9a7a7 100644 --- a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/FastjsonPluginTest.java +++ b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/FastjsonPluginTest.java @@ -4,7 +4,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentContext; import com.navercorp.pinpoint.bootstrap.instrument.transformer.TransformTemplate; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPluginSetupContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; diff --git a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ParseArrayInterceptorTest.java b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ParseArrayInterceptorTest.java index 9149028e379c..8cfaf9f40527 100644 --- a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ParseArrayInterceptorTest.java +++ b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ParseArrayInterceptorTest.java @@ -5,15 +5,15 @@ import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.plugin.fastjson.FastjsonConstants; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ParseArrayInterceptorTest { @Mock diff --git a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ParseInterceptorTest.java b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ParseInterceptorTest.java index 6b87f6d348bd..2f69e6b8dde0 100644 --- a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ParseInterceptorTest.java +++ b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ParseInterceptorTest.java @@ -5,15 +5,15 @@ import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.plugin.fastjson.FastjsonConstants; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ParseInterceptorTest { @Mock diff --git a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ParseObjectInterceptorTest.java b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ParseObjectInterceptorTest.java index 2fc4fab03404..d1a6b842b998 100644 --- a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ParseObjectInterceptorTest.java +++ b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ParseObjectInterceptorTest.java @@ -5,10 +5,10 @@ import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.plugin.fastjson.FastjsonConstants; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.io.IOException; import java.io.InputStream; @@ -16,7 +16,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ParseObjectInterceptorTest { @Mock diff --git a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ToJavaObjectInterceptorTest.java b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ToJavaObjectInterceptorTest.java index abd45ee23ab1..8bfae57d04df 100644 --- a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ToJavaObjectInterceptorTest.java +++ b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ToJavaObjectInterceptorTest.java @@ -5,15 +5,15 @@ import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.plugin.fastjson.FastjsonConstants; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ToJavaObjectInterceptorTest { @Mock diff --git a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ToJsonBytesInterceptorTest.java b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ToJsonBytesInterceptorTest.java index 1d31d4f612ab..c6af1be1e3ed 100644 --- a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ToJsonBytesInterceptorTest.java +++ b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ToJsonBytesInterceptorTest.java @@ -5,15 +5,15 @@ import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.plugin.fastjson.FastjsonConstants; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ToJsonBytesInterceptorTest { @Mock diff --git a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ToJsonInterceptorTest.java b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ToJsonInterceptorTest.java index 149afd8a4611..731f1a93a14d 100644 --- a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ToJsonInterceptorTest.java +++ b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ToJsonInterceptorTest.java @@ -5,15 +5,15 @@ import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.plugin.fastjson.FastjsonConstants; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ToJsonInterceptorTest { @Mock diff --git a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ToJsonStringInterceptorTest.java b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ToJsonStringInterceptorTest.java index 12eeb34e5545..ad0366fe9fb4 100644 --- a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ToJsonStringInterceptorTest.java +++ b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/ToJsonStringInterceptorTest.java @@ -5,15 +5,15 @@ import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.plugin.fastjson.FastjsonConstants; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ToJsonStringInterceptorTest { @Mock diff --git a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/WriteJsonStringInterceptorTest.java b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/WriteJsonStringInterceptorTest.java index 9c4a0ff115c0..2c9fed7e9c9a 100644 --- a/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/WriteJsonStringInterceptorTest.java +++ b/plugins/fastjson/src/test/java/com/navercorp/pinpoint/plugin/fastjson/interceptor/WriteJsonStringInterceptorTest.java @@ -5,15 +5,15 @@ import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.plugin.fastjson.FastjsonConstants; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class WriteJsonStringInterceptorTest { @Mock diff --git a/plugins/grpc/src/test/java/com/navercorp/pinpoint/plugin/grpc/GrpcClientConfigTest.java b/plugins/grpc/src/test/java/com/navercorp/pinpoint/plugin/grpc/GrpcClientConfigTest.java index 71b317372b9a..e304f844c2c1 100644 --- a/plugins/grpc/src/test/java/com/navercorp/pinpoint/plugin/grpc/GrpcClientConfigTest.java +++ b/plugins/grpc/src/test/java/com/navercorp/pinpoint/plugin/grpc/GrpcClientConfigTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfigLoader; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -32,28 +32,28 @@ public class GrpcClientConfigTest { public void configTest1() throws Exception { GrpcClientConfig config = createConfig("false", "false"); - Assert.assertFalse(config.isClientEnable()); + Assertions.assertFalse(config.isClientEnable()); } @Test public void configTest2() throws Exception { GrpcClientConfig config = createConfig("false", "true"); - Assert.assertFalse(config.isClientEnable()); + Assertions.assertFalse(config.isClientEnable()); } @Test public void configTest3() throws Exception { GrpcClientConfig config = createConfig("true", "false"); - Assert.assertTrue(config.isClientEnable()); + Assertions.assertTrue(config.isClientEnable()); } @Test public void configTest4() throws Exception { GrpcClientConfig config = createConfig("true", "true"); - Assert.assertTrue(config.isClientEnable()); + Assertions.assertTrue(config.isClientEnable()); } private GrpcClientConfig createConfig(String clientEnable, String serverEnable) { diff --git a/plugins/grpc/src/test/java/com/navercorp/pinpoint/plugin/grpc/GrpcServerConfigTest.java b/plugins/grpc/src/test/java/com/navercorp/pinpoint/plugin/grpc/GrpcServerConfigTest.java index 06035efd1628..350bbb757fd5 100644 --- a/plugins/grpc/src/test/java/com/navercorp/pinpoint/plugin/grpc/GrpcServerConfigTest.java +++ b/plugins/grpc/src/test/java/com/navercorp/pinpoint/plugin/grpc/GrpcServerConfigTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfigLoader; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -32,28 +32,28 @@ public class GrpcServerConfigTest { public void configTest1() { GrpcServerConfig config = createConfig("false", "false"); - Assert.assertFalse(config.isServerEnable()); + Assertions.assertFalse(config.isServerEnable()); } @Test public void configTest2() { GrpcServerConfig config = createConfig("false", "true"); - Assert.assertTrue(config.isServerEnable()); + Assertions.assertTrue(config.isServerEnable()); } @Test public void configTest3() { GrpcServerConfig config = createConfig("true", "false"); - Assert.assertFalse(config.isServerEnable()); + Assertions.assertFalse(config.isServerEnable()); } @Test public void configTest4() { GrpcServerConfig config = createConfig("true", "true"); - Assert.assertTrue(config.isServerEnable()); + Assertions.assertTrue(config.isServerEnable()); } private GrpcServerConfig createConfig(String clientEnable, String serverEnable) { diff --git a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbasePluginConfigTest.java b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbasePluginConfigTest.java index 7313da9faf97..e528618567e8 100644 --- a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbasePluginConfigTest.java +++ b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbasePluginConfigTest.java @@ -2,10 +2,10 @@ import com.navercorp.pinpoint.bootstrap.config.DefaultProfilerConfig; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class HbasePluginConfigTest { diff --git a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbasePluginConstantsTest.java b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbasePluginConstantsTest.java index 76ece1abd6f7..6b291ce60ff0 100644 --- a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbasePluginConstantsTest.java +++ b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbasePluginConstantsTest.java @@ -1,8 +1,8 @@ package com.navercorp.pinpoint.plugin.hbase; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class HbasePluginConstantsTest { diff --git a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbasePluginMetadataProviderTest.java b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbasePluginMetadataProviderTest.java index 9e0a3bf88bbf..1ac260ac2ef1 100644 --- a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbasePluginMetadataProviderTest.java +++ b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbasePluginMetadataProviderTest.java @@ -1,14 +1,14 @@ package com.navercorp.pinpoint.plugin.hbase; import com.navercorp.pinpoint.common.trace.TraceMetadataSetupContext; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class HbasePluginMetadataProviderTest { @Mock diff --git a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbasePluginTest.java b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbasePluginTest.java index 6952d7757deb..d0c068d3e0b8 100644 --- a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbasePluginTest.java +++ b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbasePluginTest.java @@ -3,14 +3,14 @@ import com.navercorp.pinpoint.bootstrap.config.DefaultProfilerConfig; import com.navercorp.pinpoint.bootstrap.instrument.transformer.TransformTemplate; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPluginSetupContext; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.doReturn; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class HbasePluginTest { @Mock diff --git a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbaseVersionTest.java b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbaseVersionTest.java index 7487a80e60fc..b3f4849e1ca7 100644 --- a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbaseVersionTest.java +++ b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/HbaseVersionTest.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.plugin.hbase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class HbaseVersionTest { @@ -9,7 +9,7 @@ public class HbaseVersionTest { public void getVersion() { ClassLoader testCL = this.getClass().getClassLoader(); int version = HbaseVersion.getVersion(testCL); - Assert.assertEquals(HbaseVersion.HBASE_VERSION_1, version); + Assertions.assertEquals(HbaseVersion.HBASE_VERSION_1, version); } @Test @@ -26,6 +26,6 @@ protected Class loadClass(String name, boolean resolve) throws ClassNotFoundE }; int version = HbaseVersion.getVersion(childCL); - Assert.assertEquals(HbaseVersion.HBASE_VERSION_0, version); + Assertions.assertEquals(HbaseVersion.HBASE_VERSION_0, version); } } \ No newline at end of file diff --git a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseAdminMethodInterceptorTest.java b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseAdminMethodInterceptorTest.java index 2f29e9a84b09..30cb93625b30 100644 --- a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseAdminMethodInterceptorTest.java +++ b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseAdminMethodInterceptorTest.java @@ -4,14 +4,14 @@ import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.plugin.hbase.HbasePluginConstants; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class HbaseAdminMethodInterceptorTest { @Mock diff --git a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseClientConstructorInterceptorTest.java b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseClientConstructorInterceptorTest.java index 28008dc51b4c..e3c0c963ba47 100644 --- a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseClientConstructorInterceptorTest.java +++ b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseClientConstructorInterceptorTest.java @@ -2,19 +2,16 @@ import com.navercorp.pinpoint.bootstrap.async.AsyncContextAccessor; import com.navercorp.pinpoint.bootstrap.context.AsyncContext; -import com.navercorp.pinpoint.bootstrap.context.Trace; -import com.navercorp.pinpoint.bootstrap.interceptor.scope.AttachmentFactory; -import com.navercorp.pinpoint.bootstrap.interceptor.scope.ExecutionPolicy; import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScope; import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScopeInvocation; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.doReturn; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class HbaseClientConstructorInterceptorTest { @Mock diff --git a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseClientMainInterceptorTest.java b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseClientMainInterceptorTest.java index 7fb6e704cd86..b34d8f878038 100644 --- a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseClientMainInterceptorTest.java +++ b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseClientMainInterceptorTest.java @@ -1,18 +1,22 @@ package com.navercorp.pinpoint.plugin.hbase.interceptor; -import com.navercorp.pinpoint.bootstrap.context.*; +import com.navercorp.pinpoint.bootstrap.context.AsyncContext; +import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; +import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; +import com.navercorp.pinpoint.bootstrap.context.Trace; +import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScope; import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScopeInvocation; import com.navercorp.pinpoint.plugin.hbase.HbasePluginConstants; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class HbaseClientMainInterceptorTest { @Mock @@ -64,6 +68,6 @@ public void after() { Object[] args = new Object[]{"foo", "bar"}; HbaseClientMainInterceptor interceptor = new HbaseClientMainInterceptor(traceContext, descriptor, scope); - interceptor.after(target, args,null,null); + interceptor.after(target, args, null, null); } } \ No newline at end of file diff --git a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseClientMethodInterceptorTest.java b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseClientMethodInterceptorTest.java index 20999a7ab1aa..8ea8a38df84d 100644 --- a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseClientMethodInterceptorTest.java +++ b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseClientMethodInterceptorTest.java @@ -4,16 +4,16 @@ import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.plugin.hbase.HbasePluginConstants; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.net.InetSocketAddress; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class HbaseClientMethodInterceptorTest { @Mock diff --git a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseClientRunInterceptorTest.java b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseClientRunInterceptorTest.java index acf2bd5c8d2c..8f9c16a84cbd 100644 --- a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseClientRunInterceptorTest.java +++ b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseClientRunInterceptorTest.java @@ -4,14 +4,14 @@ import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.plugin.hbase.HbasePluginConstants; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class HbaseClientRunInterceptorTest { @Mock diff --git a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseTableMethodInterceptorTest.java b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseTableMethodInterceptorTest.java index f1f9a89004d1..5627b806e60c 100644 --- a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseTableMethodInterceptorTest.java +++ b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/HbaseTableMethodInterceptorTest.java @@ -3,17 +3,17 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.plugin.hbase.HbaseVersion; import com.navercorp.pinpoint.plugin.hbase.HbasePluginConstants; +import com.navercorp.pinpoint.plugin.hbase.HbaseVersion; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Table; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -22,7 +22,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class HbaseTableMethodInterceptorTest { @Mock @@ -91,9 +91,9 @@ public void getTableName() throws NoSuchMethodException, InvocationTargetExcepti method.setAccessible(true); String hTableString = (String) method.invoke(interceptor, mockHTable); - Assert.assertEquals("HTable", hTableString); + Assertions.assertEquals("HTable", hTableString); String unknownString = (String) method.invoke(interceptor, "1234"); - Assert.assertEquals("Unknown", unknownString); + Assertions.assertEquals("Unknown", unknownString); } } \ No newline at end of file diff --git a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/util/HbaseTableNameProviderFactoryTest.java b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/util/HbaseTableNameProviderFactoryTest.java index 0cebc31792a2..9e4aeedd6e73 100644 --- a/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/util/HbaseTableNameProviderFactoryTest.java +++ b/plugins/hbase/src/test/java/com/navercorp/pinpoint/plugin/hbase/interceptor/util/HbaseTableNameProviderFactoryTest.java @@ -5,8 +5,8 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HTableInterface; import org.apache.hadoop.hbase.client.Table; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -19,12 +19,12 @@ public void testNewHbaseTableProvider() { HbaseTableNameProvider nameProvider = HbaseTableNameProviderFactory.getTableNameProvider(HbaseVersion.HBASE_VERSION_1); // Select hbase 1.x Implementation - Assert.assertSame(Hbase1TableNameProvider.class, nameProvider.getClass()); + Assertions.assertSame(Hbase1TableNameProvider.class, nameProvider.getClass()); Table table = mock(Table.class); when(table.getName()).thenReturn(TableName.valueOf("testTable")); - Assert.assertEquals("testTable", nameProvider.getName(table)); + Assertions.assertEquals("testTable", nameProvider.getName(table)); } @Test @@ -34,7 +34,7 @@ public void testHbase2tableName() { Table table = mock(Table.class); when(table.getName()).thenReturn(TableName.valueOf("testTable")); - Assert.assertEquals("testTable", nameProvider.getName(table)); + Assertions.assertEquals("testTable", nameProvider.getName(table)); } @Test @@ -45,6 +45,6 @@ public void testHbase1tableName() { HTableInterface table = mock(HTableInterface.class); when(table.getTableName()).thenReturn(BytesUtils.toBytes("testTable")); - Assert.assertEquals("testTable", nameProvider.getName(table)); + Assertions.assertEquals("testTable", nameProvider.getName(table)); } } \ No newline at end of file diff --git a/plugins/hikaricp/src/test/java/com/navercorp/pinpoint/plugin/hikaricp/HikariCpConfigTest.java b/plugins/hikaricp/src/test/java/com/navercorp/pinpoint/plugin/hikaricp/HikariCpConfigTest.java index 403ff6a34de4..31550f610bd9 100644 --- a/plugins/hikaricp/src/test/java/com/navercorp/pinpoint/plugin/hikaricp/HikariCpConfigTest.java +++ b/plugins/hikaricp/src/test/java/com/navercorp/pinpoint/plugin/hikaricp/HikariCpConfigTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfigLoader; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -32,32 +32,32 @@ public class HikariCpConfigTest { public void configTest1() throws Exception { HikariCpConfig hikariCpConfig = createHikariCpConfig("false", "false"); - Assert.assertFalse(hikariCpConfig.isPluginEnable()); - Assert.assertFalse(hikariCpConfig.isProfileClose()); + Assertions.assertFalse(hikariCpConfig.isPluginEnable()); + Assertions.assertFalse(hikariCpConfig.isProfileClose()); } @Test public void configTest2() throws Exception { HikariCpConfig hikariCpConfig = createHikariCpConfig("false", "true"); - Assert.assertFalse(hikariCpConfig.isPluginEnable()); - Assert.assertTrue(hikariCpConfig.isProfileClose()); + Assertions.assertFalse(hikariCpConfig.isPluginEnable()); + Assertions.assertTrue(hikariCpConfig.isProfileClose()); } @Test public void configTest3() throws Exception { HikariCpConfig hikariCpConfig = createHikariCpConfig("true", "false"); - Assert.assertTrue(hikariCpConfig.isPluginEnable()); - Assert.assertFalse(hikariCpConfig.isProfileClose()); + Assertions.assertTrue(hikariCpConfig.isPluginEnable()); + Assertions.assertFalse(hikariCpConfig.isProfileClose()); } @Test public void configTest4() throws Exception { HikariCpConfig hikariCpConfig = createHikariCpConfig("true", "true"); - Assert.assertTrue(hikariCpConfig.isPluginEnable()); - Assert.assertTrue(hikariCpConfig.isProfileClose()); + Assertions.assertTrue(hikariCpConfig.isPluginEnable()); + Assertions.assertTrue(hikariCpConfig.isProfileClose()); } private HikariCpConfig createHikariCpConfig(String pluginEnable, String profileConnectionCloseEnable) { diff --git a/plugins/httpclient3/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClient4PluginTest.java b/plugins/httpclient3/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClient4PluginTest.java index dcca4b7e8301..8a3d7ebe82bb 100644 --- a/plugins/httpclient3/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClient4PluginTest.java +++ b/plugins/httpclient3/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClient4PluginTest.java @@ -16,19 +16,18 @@ package com.navercorp.pinpoint.plugin.httpclient4; -import static org.junit.Assert.*; - -import java.io.IOException; - import org.apache.http.impl.client.DefaultHttpRequestRetryHandler; import org.apache.http.protocol.BasicHttpContext; import org.apache.http.protocol.HttpContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import java.io.IOException; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** - * @author minwoo.jung + * @author minwoo.jung * @author jaehong.kim - * */ public class HttpClient4PluginTest { diff --git a/plugins/httpclient4/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClient4PluginTest.java b/plugins/httpclient4/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClient4PluginTest.java index dcca4b7e8301..8a3d7ebe82bb 100644 --- a/plugins/httpclient4/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClient4PluginTest.java +++ b/plugins/httpclient4/src/test/java/com/navercorp/pinpoint/plugin/httpclient4/HttpClient4PluginTest.java @@ -16,19 +16,18 @@ package com.navercorp.pinpoint.plugin.httpclient4; -import static org.junit.Assert.*; - -import java.io.IOException; - import org.apache.http.impl.client.DefaultHttpRequestRetryHandler; import org.apache.http.protocol.BasicHttpContext; import org.apache.http.protocol.HttpContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import java.io.IOException; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** - * @author minwoo.jung + * @author minwoo.jung * @author jaehong.kim - * */ public class HttpClient4PluginTest { diff --git a/plugins/informix-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/informix/InformixConnectionStringParserTest.java b/plugins/informix-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/informix/InformixConnectionStringParserTest.java index f0bd039bc775..26d11c58d994 100644 --- a/plugins/informix-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/informix/InformixConnectionStringParserTest.java +++ b/plugins/informix-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/informix/InformixConnectionStringParserTest.java @@ -19,8 +19,8 @@ import com.navercorp.pinpoint.bootstrap.context.DatabaseInfo; import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcUrlParserV2; import com.navercorp.pinpoint.common.trace.ServiceType; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -28,34 +28,34 @@ public class InformixConnectionStringParserTest { private final JdbcUrlParserV2 parser = new InformixJdbcUrlParser(); - + @Test public void testParse1() { String informix = "jdbc:informix-sqli:10.99.196.126:11000/database_name:INFORMIXSERVER=server_name"; DatabaseInfo dbInfo = parser.parse(informix); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(InformixConstants.INFORMIX, dbInfo.getType()); - Assert.assertEquals("10.99.196.126:11000", dbInfo.getHost().get(0)); - Assert.assertEquals("database_name", dbInfo.getDatabaseId()); - Assert.assertEquals(informix, dbInfo.getUrl()); + Assertions.assertEquals(InformixConstants.INFORMIX, dbInfo.getType()); + Assertions.assertEquals("10.99.196.126:11000", dbInfo.getHost().get(0)); + Assertions.assertEquals("database_name", dbInfo.getDatabaseId()); + Assertions.assertEquals(informix, dbInfo.getUrl()); } @Test public void parseFailTest1() { DatabaseInfo dbInfo = parser.parse(null); - Assert.assertFalse(dbInfo.isParsingComplete()); + Assertions.assertFalse(dbInfo.isParsingComplete()); - Assert.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); + Assertions.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); } @Test public void parseFailTest2() { String informix = "jdbc:mysql:10.99.196.126:11000/database_name:INFORMIXSERVER=server_name"; DatabaseInfo dbInfo = parser.parse(informix); - Assert.assertFalse(dbInfo.isParsingComplete()); + Assertions.assertFalse(dbInfo.isParsingComplete()); - Assert.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); + Assertions.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); } } diff --git a/plugins/jboss/src/test/java/com/navercorp/pinpoint/plugin/jboss/InvokeMethodInterceptorTest.java b/plugins/jboss/src/test/java/com/navercorp/pinpoint/plugin/jboss/InvokeMethodInterceptorTest.java index 7905adf2d82e..605d3bfda842 100644 --- a/plugins/jboss/src/test/java/com/navercorp/pinpoint/plugin/jboss/InvokeMethodInterceptorTest.java +++ b/plugins/jboss/src/test/java/com/navercorp/pinpoint/plugin/jboss/InvokeMethodInterceptorTest.java @@ -15,38 +15,42 @@ */ package com.navercorp.pinpoint.plugin.jboss; -import java.util.Enumeration; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import com.navercorp.pinpoint.bootstrap.config.DefaultProfilerConfig; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; +import com.navercorp.pinpoint.bootstrap.context.Header; +import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; +import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.context.TraceId; +import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; import com.navercorp.pinpoint.bootstrap.plugin.RequestRecorderFactory; import com.navercorp.pinpoint.bootstrap.plugin.proxy.DisableRequestRecorder; import com.navercorp.pinpoint.bootstrap.plugin.request.RequestAdaptor; +import com.navercorp.pinpoint.plugin.jboss.interceptor.StandardHostValveInvokeInterceptor; +import com.navercorp.pinpoint.profiler.context.DefaultMethodDescriptor; import com.navercorp.pinpoint.profiler.context.id.DefaultTraceId; import com.navercorp.pinpoint.profiler.context.module.DefaultApplicationContext; import com.navercorp.pinpoint.profiler.logging.Log4j2Binder; import com.navercorp.pinpoint.test.MockTraceContextFactory; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.spi.LoggerContext; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import com.navercorp.pinpoint.bootstrap.context.Header; -import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; -import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.logging.PLoggerFactory; -import com.navercorp.pinpoint.plugin.jboss.interceptor.StandardHostValveInvokeInterceptor; -import com.navercorp.pinpoint.profiler.context.DefaultMethodDescriptor; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.Enumeration; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; /** * The Class InvokeMethodInterceptorTest. @@ -55,17 +59,23 @@ */ public class InvokeMethodInterceptorTest { - /** The request. */ + /** + * The request. + */ @Mock public HttpServletRequest request; - /** The response. */ + /** + * The response. + */ @Mock public HttpServletResponse response; - /** The descriptor. */ - private final MethodDescriptor descriptor = new DefaultMethodDescriptor("org.apache.catalina.core.StandardHostValve", "invoke", new String[] { - "org.apache.catalina.connector.Request", "org.apache.catalina.connector.Response" }, new String[] { "request", "response" }, 0); + /** + * The descriptor. + */ + private final MethodDescriptor descriptor = new DefaultMethodDescriptor("org.apache.catalina.core.StandardHostValve", "invoke", new String[]{ + "org.apache.catalina.connector.Request", "org.apache.catalina.connector.Response"}, new String[]{"request", "response"}, 0); private DefaultApplicationContext applicationContext; @@ -75,7 +85,7 @@ public class InvokeMethodInterceptorTest { /** * Before. */ - @BeforeClass + @BeforeAll public static void before() { LoggerContext context = LogManager.getContext(); PLoggerFactory.initialize(new Log4j2Binder(context)); @@ -86,7 +96,7 @@ public static void before() { * * @throws Exception the exception */ - @Before + @BeforeEach public void setUp() throws Exception { MockitoAnnotations.initMocks(this); @@ -96,9 +106,9 @@ public void setUp() throws Exception { applicationContext = MockTraceContextFactory.newMockApplicationContext(profilerConfig); } - @After + @AfterEach public void tearDown() throws Exception { - if (applicationContext != null) { + if (applicationContext != null) { applicationContext.close(); } } @@ -128,13 +138,13 @@ public void testHeaderNOTExists() { TraceContext traceContext = spyTraceContext(); final StandardHostValveInvokeInterceptor interceptor = new StandardHostValveInvokeInterceptor(traceContext, descriptor, requestRecorderFactory); - interceptor.before("target", new Object[] { request, response }); - interceptor.after("target", new Object[] { request, response }, new Object(), null); + interceptor.before("target", new Object[]{request, response}); + interceptor.after("target", new Object[]{request, response}, new Object(), null); verify(traceContext, times(1)).newAsyncTraceObject(); - interceptor.before("target", new Object[] { request, response }); - interceptor.after("target", new Object[] { request, response }, new Object(), null); + interceptor.before("target", new Object[]{request, response}); + interceptor.after("target", new Object[]{request, response}, new Object(), null); verify(traceContext, times(2)).newAsyncTraceObject(); } @@ -158,16 +168,16 @@ public void testInvalidHeaderExists() { TraceContext traceContext = spyTraceContext(); final StandardHostValveInvokeInterceptor interceptor = new StandardHostValveInvokeInterceptor(traceContext, descriptor, requestRecorderFactory); - interceptor.before("target", new Object[] { request, response }); - interceptor.after("target", new Object[] { request, response }, new Object(), null); + interceptor.before("target", new Object[]{request, response}); + interceptor.after("target", new Object[]{request, response}, new Object(), null); verify(traceContext, never()).newTraceObject(); verify(traceContext, never()).disableSampling(); verify(traceContext, never()).continueTraceObject(any(TraceId.class)); - interceptor.before("target", new Object[] { request, response }); - interceptor.after("target", new Object[] { request, response }, new Object(), null); + interceptor.before("target", new Object[]{request, response}); + interceptor.after("target", new Object[]{request, response}, new Object(), null); verify(traceContext, never()).newTraceObject(); verify(traceContext, never()).disableSampling(); @@ -184,7 +194,7 @@ public void testValidHeaderExists() { when(request.getRequestURI()).thenReturn("/hellotest.nhn"); when(request.getRemoteAddr()).thenReturn("10.0.0.1"); - TraceId traceId = new DefaultTraceId("agentTest", System.currentTimeMillis(), 1); + TraceId traceId = new DefaultTraceId("agentTest", System.currentTimeMillis(), 1); when(request.getHeader(Header.HTTP_TRACE_ID.toString())).thenReturn(traceId.getTransactionId()); when(request.getHeader(Header.HTTP_PARENT_SPAN_ID.toString())).thenReturn("PARENTSPANID"); when(request.getHeader(Header.HTTP_SPAN_ID.toString())).thenReturn("SPANID"); @@ -196,13 +206,13 @@ public void testValidHeaderExists() { TraceContext traceContext = spyTraceContext(); final StandardHostValveInvokeInterceptor interceptor = new StandardHostValveInvokeInterceptor(traceContext, descriptor, requestRecorderFactory); - interceptor.before("target", new Object[] { request, response }); - interceptor.after("target", new Object[] { request, response }, new Object(), null); + interceptor.before("target", new Object[]{request, response}); + interceptor.after("target", new Object[]{request, response}, new Object(), null); verify(traceContext, times(1)).continueAsyncTraceObject((any(TraceId.class))); - interceptor.before("target", new Object[] { request, response }); - interceptor.after("target", new Object[] { request, response }, new Object(), null); + interceptor.before("target", new Object[]{request, response}); + interceptor.after("target", new Object[]{request, response}, new Object(), null); verify(traceContext, times(2)).continueAsyncTraceObject(any(TraceId.class)); } diff --git a/plugins/jsp/src/test/java/com/navercorp/pinpoint/plugin/jsp/interceptor/HttpJspBaseServiceMethodInterceptorTest.java b/plugins/jsp/src/test/java/com/navercorp/pinpoint/plugin/jsp/interceptor/HttpJspBaseServiceMethodInterceptorTest.java index 8e6e4285b63b..57df94feb089 100644 --- a/plugins/jsp/src/test/java/com/navercorp/pinpoint/plugin/jsp/interceptor/HttpJspBaseServiceMethodInterceptorTest.java +++ b/plugins/jsp/src/test/java/com/navercorp/pinpoint/plugin/jsp/interceptor/HttpJspBaseServiceMethodInterceptorTest.java @@ -17,11 +17,10 @@ import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.mockito.Mockito.*; - -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; /** * @author jaehong.kim diff --git a/plugins/jtds/src/test/java/com/navercorp/pinpoint/plugin/jdbc/jtds/JtdsJdbcUrlParserTest.java b/plugins/jtds/src/test/java/com/navercorp/pinpoint/plugin/jdbc/jtds/JtdsJdbcUrlParserTest.java index 28aabe34434e..8992e7929cf8 100644 --- a/plugins/jtds/src/test/java/com/navercorp/pinpoint/plugin/jdbc/jtds/JtdsJdbcUrlParserTest.java +++ b/plugins/jtds/src/test/java/com/navercorp/pinpoint/plugin/jdbc/jtds/JtdsJdbcUrlParserTest.java @@ -19,8 +19,8 @@ import com.navercorp.pinpoint.bootstrap.context.DatabaseInfo; import com.navercorp.pinpoint.common.trace.ServiceType; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class JtdsJdbcUrlParserTest { @@ -32,12 +32,12 @@ public void testParse1() throws Exception { // jdbc:jtds:sqlserver://server/db;user=userName;password=password String url = "jdbc:jtds:sqlserver://10.xx.xx.xx:1433;DatabaseName=CAFECHAT;sendStringParametersAsUnicode=false;useLOBs=false;loginTimeout=3"; DatabaseInfo info = parser.parse(url); - Assert.assertTrue(info.isParsingComplete()); + Assertions.assertTrue(info.isParsingComplete()); - Assert.assertEquals(info.getType(), JtdsConstants.MSSQL); - Assert.assertEquals(info.getMultipleHost(), "10.xx.xx.xx:1433"); - Assert.assertEquals(info.getDatabaseId(), "CAFECHAT"); - Assert.assertEquals(info.getUrl(), "jdbc:jtds:sqlserver://10.xx.xx.xx:1433"); + Assertions.assertEquals(info.getType(), JtdsConstants.MSSQL); + Assertions.assertEquals(info.getMultipleHost(), "10.xx.xx.xx:1433"); + Assertions.assertEquals(info.getDatabaseId(), "CAFECHAT"); + Assertions.assertEquals(info.getUrl(), "jdbc:jtds:sqlserver://10.xx.xx.xx:1433"); } @@ -45,12 +45,12 @@ public void testParse1() throws Exception { public void testParse2() throws Exception { String url = "jdbc:jtds:sqlserver://10.xx.xx.xx:1433/CAFECHAT;sendStringParametersAsUnicode=false;useLOBs=false;loginTimeout=3"; DatabaseInfo info = parser.parse(url); - Assert.assertTrue(info.isParsingComplete()); + Assertions.assertTrue(info.isParsingComplete()); - Assert.assertEquals(info.getType(), JtdsConstants.MSSQL); - Assert.assertEquals(info.getMultipleHost(), "10.xx.xx.xx:1433"); - Assert.assertEquals(info.getDatabaseId(), "CAFECHAT"); - Assert.assertEquals(info.getUrl(), "jdbc:jtds:sqlserver://10.xx.xx.xx:1433/CAFECHAT"); + Assertions.assertEquals(info.getType(), JtdsConstants.MSSQL); + Assertions.assertEquals(info.getMultipleHost(), "10.xx.xx.xx:1433"); + Assertions.assertEquals(info.getDatabaseId(), "CAFECHAT"); + Assertions.assertEquals(info.getUrl(), "jdbc:jtds:sqlserver://10.xx.xx.xx:1433/CAFECHAT"); } @@ -58,24 +58,24 @@ public void testParse2() throws Exception { public void testParse3() throws Exception { String url = "jdbc:jtds:sqlserver://10.xx.xx.xx:1433/CAFECHAT"; DatabaseInfo info = parser.parse(url); - Assert.assertTrue(info.isParsingComplete()); + Assertions.assertTrue(info.isParsingComplete()); - Assert.assertEquals(info.getType(), JtdsConstants.MSSQL); - Assert.assertEquals(info.getMultipleHost(), "10.xx.xx.xx:1433"); - Assert.assertEquals(info.getDatabaseId(), "CAFECHAT"); - Assert.assertEquals(info.getUrl(), "jdbc:jtds:sqlserver://10.xx.xx.xx:1433/CAFECHAT"); + Assertions.assertEquals(info.getType(), JtdsConstants.MSSQL); + Assertions.assertEquals(info.getMultipleHost(), "10.xx.xx.xx:1433"); + Assertions.assertEquals(info.getDatabaseId(), "CAFECHAT"); + Assertions.assertEquals(info.getUrl(), "jdbc:jtds:sqlserver://10.xx.xx.xx:1433/CAFECHAT"); } @Test public void testParse4() throws Exception { String url = "jdbc:jtds:sqlserver://10.xx.xx.xx:1433"; DatabaseInfo info = parser.parse(url); - Assert.assertTrue(info.isParsingComplete()); + Assertions.assertTrue(info.isParsingComplete()); - Assert.assertEquals(info.getType(), JtdsConstants.MSSQL); - Assert.assertEquals(info.getMultipleHost(), "10.xx.xx.xx:1433"); - Assert.assertEquals(info.getDatabaseId(), ""); - Assert.assertEquals(info.getUrl(), "jdbc:jtds:sqlserver://10.xx.xx.xx:1433"); + Assertions.assertEquals(info.getType(), JtdsConstants.MSSQL); + Assertions.assertEquals(info.getMultipleHost(), "10.xx.xx.xx:1433"); + Assertions.assertEquals(info.getDatabaseId(), ""); + Assertions.assertEquals(info.getUrl(), "jdbc:jtds:sqlserver://10.xx.xx.xx:1433"); } @@ -85,12 +85,12 @@ public void testParse5() throws Exception { // jdbc:jtds:sqlserver://server/db;user=userName;password=password String url = "jdbc:jtds:sqlserver://10.xx.xx.xx;DatabaseName=CAFECHAT"; DatabaseInfo info = parser.parse(url); - Assert.assertTrue(info.isParsingComplete()); + Assertions.assertTrue(info.isParsingComplete()); - Assert.assertEquals(info.getType(), JtdsConstants.MSSQL); - Assert.assertEquals(info.getMultipleHost(), "10.xx.xx.xx"); - Assert.assertEquals(info.getDatabaseId(), "CAFECHAT"); - Assert.assertEquals(info.getUrl(), "jdbc:jtds:sqlserver://10.xx.xx.xx"); + Assertions.assertEquals(info.getType(), JtdsConstants.MSSQL); + Assertions.assertEquals(info.getMultipleHost(), "10.xx.xx.xx"); + Assertions.assertEquals(info.getDatabaseId(), "CAFECHAT"); + Assertions.assertEquals(info.getUrl(), "jdbc:jtds:sqlserver://10.xx.xx.xx"); } @@ -100,12 +100,12 @@ public void testParse6() throws Exception { // jdbc:jtds:sqlserver://server/db;user=userName;password=password String url = "jdbc:jtds:sqlserver://10.xx.xx.xx"; DatabaseInfo info = parser.parse(url); - Assert.assertTrue(info.isParsingComplete()); + Assertions.assertTrue(info.isParsingComplete()); - Assert.assertEquals(info.getType(), JtdsConstants.MSSQL); - Assert.assertEquals(info.getMultipleHost(), "10.xx.xx.xx"); - Assert.assertEquals(info.getDatabaseId(), ""); - Assert.assertEquals(info.getUrl(), "jdbc:jtds:sqlserver://10.xx.xx.xx"); + Assertions.assertEquals(info.getType(), JtdsConstants.MSSQL); + Assertions.assertEquals(info.getMultipleHost(), "10.xx.xx.xx"); + Assertions.assertEquals(info.getDatabaseId(), ""); + Assertions.assertEquals(info.getUrl(), "jdbc:jtds:sqlserver://10.xx.xx.xx"); } @@ -114,29 +114,29 @@ public void testParse6() throws Exception { public void testParse7() throws Exception { String url = "jdbc:jtds:sqlserver://10.xx.xx.xx:1433/CAFECHAT;abc=1;bcd=2"; DatabaseInfo info = parser.parse(url); - Assert.assertTrue(info.isParsingComplete()); + Assertions.assertTrue(info.isParsingComplete()); - Assert.assertEquals(info.getType(), JtdsConstants.MSSQL); - Assert.assertEquals(info.getMultipleHost(), "10.xx.xx.xx:1433"); - Assert.assertEquals(info.getDatabaseId(), "CAFECHAT"); - Assert.assertEquals(info.getUrl(), "jdbc:jtds:sqlserver://10.xx.xx.xx:1433/CAFECHAT"); + Assertions.assertEquals(info.getType(), JtdsConstants.MSSQL); + Assertions.assertEquals(info.getMultipleHost(), "10.xx.xx.xx:1433"); + Assertions.assertEquals(info.getDatabaseId(), "CAFECHAT"); + Assertions.assertEquals(info.getUrl(), "jdbc:jtds:sqlserver://10.xx.xx.xx:1433/CAFECHAT"); } @Test public void parseFailTest1() { DatabaseInfo info = parser.parse(null); - Assert.assertFalse(info.isParsingComplete()); + Assertions.assertFalse(info.isParsingComplete()); - Assert.assertEquals(ServiceType.UNKNOWN_DB, info.getType()); + Assertions.assertEquals(ServiceType.UNKNOWN_DB, info.getType()); } @Test public void parseFailTest2() { String url = "jdbc:oracle:sqlserver://10.xx.xx.xx:1433/CAFECHAT;abc=1;bcd=2"; DatabaseInfo info = parser.parse(url); - Assert.assertFalse(info.isParsingComplete()); + Assertions.assertFalse(info.isParsingComplete()); - Assert.assertEquals(ServiceType.UNKNOWN_DB, info.getType()); + Assertions.assertEquals(ServiceType.UNKNOWN_DB, info.getType()); } } \ No newline at end of file diff --git a/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaConfigTest.java b/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaConfigTest.java index c5bbc76fa6e8..e8dcc0ec904f 100644 --- a/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaConfigTest.java +++ b/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/KafkaConfigTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfigLoader; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -32,70 +32,70 @@ public class KafkaConfigTest { public void configTest1() throws Exception { KafkaConfig config = createConfig("true", "true", "entryPoint"); - Assert.assertTrue(config.isProducerEnable()); - Assert.assertTrue(config.isConsumerEnable()); - Assert.assertEquals("entryPoint", config.getKafkaEntryPoint()); + Assertions.assertTrue(config.isProducerEnable()); + Assertions.assertTrue(config.isConsumerEnable()); + Assertions.assertEquals("entryPoint", config.getKafkaEntryPoint()); } @Test public void configTest2() throws Exception { KafkaConfig config = createConfig("true", "false"); - Assert.assertTrue(config.isProducerEnable()); - Assert.assertFalse(config.isConsumerEnable()); - Assert.assertEquals("", config.getKafkaEntryPoint()); + Assertions.assertTrue(config.isProducerEnable()); + Assertions.assertFalse(config.isConsumerEnable()); + Assertions.assertEquals("", config.getKafkaEntryPoint()); } @Test public void configTest3() throws Exception { KafkaConfig config = createConfig("false", "true"); - Assert.assertFalse(config.isProducerEnable()); - Assert.assertTrue(config.isConsumerEnable()); - Assert.assertEquals("", config.getKafkaEntryPoint()); + Assertions.assertFalse(config.isProducerEnable()); + Assertions.assertTrue(config.isConsumerEnable()); + Assertions.assertEquals("", config.getKafkaEntryPoint()); } @Test public void configTest4() throws Exception { KafkaConfig config = createConfig("false", "false"); - Assert.assertFalse(config.isProducerEnable()); - Assert.assertFalse(config.isConsumerEnable()); - Assert.assertEquals("", config.getKafkaEntryPoint()); + Assertions.assertFalse(config.isProducerEnable()); + Assertions.assertFalse(config.isConsumerEnable()); + Assertions.assertEquals("", config.getKafkaEntryPoint()); } @Test public void configTest5() throws Exception { KafkaConfig config = createConfig("true", "false", "true", "entryPoint1"); - Assert.assertTrue(config.isProducerEnable()); - Assert.assertFalse(config.isConsumerEnable()); - Assert.assertTrue(config.isHeaderEnable()); - Assert.assertEquals("entryPoint1", config.getKafkaEntryPoint()); + Assertions.assertTrue(config.isProducerEnable()); + Assertions.assertFalse(config.isConsumerEnable()); + Assertions.assertTrue(config.isHeaderEnable()); + Assertions.assertEquals("entryPoint1", config.getKafkaEntryPoint()); } @Test public void configTest6() throws Exception { KafkaConfig config = createConfig("true", "false", "false", "entryPoint2"); - Assert.assertTrue(config.isProducerEnable()); - Assert.assertFalse(config.isConsumerEnable()); - Assert.assertFalse(config.isHeaderEnable()); - Assert.assertEquals("entryPoint2", config.getKafkaEntryPoint()); + Assertions.assertTrue(config.isProducerEnable()); + Assertions.assertFalse(config.isConsumerEnable()); + Assertions.assertFalse(config.isHeaderEnable()); + Assertions.assertEquals("entryPoint2", config.getKafkaEntryPoint()); } @Test public void configTest7() throws Exception { - KafkaConfig config = createConfig("false", "true", "false","entryPoint3"); + KafkaConfig config = createConfig("false", "true", "false", "entryPoint3"); - Assert.assertFalse(config.isProducerEnable()); - Assert.assertTrue(config.isConsumerEnable()); - Assert.assertFalse(config.isHeaderEnable()); - Assert.assertEquals("entryPoint3", config.getKafkaEntryPoint()); + Assertions.assertFalse(config.isProducerEnable()); + Assertions.assertTrue(config.isConsumerEnable()); + Assertions.assertFalse(config.isHeaderEnable()); + Assertions.assertEquals("entryPoint3", config.getKafkaEntryPoint()); } private KafkaConfig createConfig(String producerEnable, String consumerEnable) { - return createConfig(producerEnable, consumerEnable, "true",""); + return createConfig(producerEnable, consumerEnable, "true", ""); } private KafkaConfig createConfig(String producerEnable, String consumerEnable, String consumerEntryPoint) { diff --git a/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ConsumerConstructorInterceptorTest.java b/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ConsumerConstructorInterceptorTest.java index 6176a5e30c8f..6240bc377b13 100644 --- a/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ConsumerConstructorInterceptorTest.java +++ b/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ConsumerConstructorInterceptorTest.java @@ -2,17 +2,17 @@ import com.navercorp.pinpoint.plugin.kafka.field.accessor.RemoteAddressFieldAccessor; import org.apache.kafka.clients.consumer.ConsumerConfig; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Collections; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ConsumerConstructorInterceptorTest { @Mock diff --git a/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ConsumerMultiRecordEntryPointInterceptorTest.java b/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ConsumerMultiRecordEntryPointInterceptorTest.java index 2ab33ff8e06c..e75abef4f5fe 100644 --- a/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ConsumerMultiRecordEntryPointInterceptorTest.java +++ b/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ConsumerMultiRecordEntryPointInterceptorTest.java @@ -8,19 +8,18 @@ import com.navercorp.pinpoint.plugin.kafka.KafkaConstants; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.clients.consumer.ConsumerRecords; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ConsumerMultiRecordEntryPointInterceptorTest { @Mock diff --git a/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ConsumerPollInterceptorTest.java b/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ConsumerPollInterceptorTest.java index be0930862f18..7fa9109a9817 100644 --- a/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ConsumerPollInterceptorTest.java +++ b/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ConsumerPollInterceptorTest.java @@ -2,17 +2,17 @@ import com.navercorp.pinpoint.plugin.kafka.field.accessor.RemoteAddressFieldAccessor; import org.apache.kafka.clients.consumer.ConsumerRecords; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Iterator; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ConsumerPollInterceptorTest { @Mock diff --git a/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ConsumerRecordEntryPointInterceptorTest.java b/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ConsumerRecordEntryPointInterceptorTest.java index dc68692f4d70..1538b817a77d 100644 --- a/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ConsumerRecordEntryPointInterceptorTest.java +++ b/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ConsumerRecordEntryPointInterceptorTest.java @@ -1,22 +1,24 @@ package com.navercorp.pinpoint.plugin.kafka.interceptor; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; -import com.navercorp.pinpoint.bootstrap.context.*; +import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; +import com.navercorp.pinpoint.bootstrap.context.SpanEventRecorder; +import com.navercorp.pinpoint.bootstrap.context.SpanRecorder; +import com.navercorp.pinpoint.bootstrap.context.Trace; +import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.plugin.kafka.KafkaConstants; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.Headers; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; - -import java.util.Collections; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ConsumerRecordEntryPointInterceptorTest { @Mock diff --git a/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ProducerAddHeaderInterceptorTest.java b/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ProducerAddHeaderInterceptorTest.java index 33e5f3e682dc..cbd1a92de619 100644 --- a/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ProducerAddHeaderInterceptorTest.java +++ b/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ProducerAddHeaderInterceptorTest.java @@ -23,23 +23,25 @@ import com.navercorp.pinpoint.bootstrap.context.TraceId; import com.navercorp.pinpoint.plugin.kafka.KafkaConfig; import com.navercorp.pinpoint.plugin.kafka.field.getter.ApiVersionsGetter; - import org.apache.kafka.clients.ApiVersions; import org.apache.kafka.common.header.Header; import org.apache.kafka.common.header.internals.RecordHeaders; import org.apache.kafka.common.record.RecordBatch; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import static org.mockito.Mockito.doReturn; /** * @author Taejin Koo */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class ProducerAddHeaderInterceptorTest { @Mock @@ -71,7 +73,7 @@ public void beforeWhenSampled() { doReturn(profilerConfig).when(traceContext).getProfilerConfig(); doReturn(true).when(profilerConfig).readBoolean(KafkaConfig.HEADER_ENABLE, true); Header[] headers = getHeadersWhenSampled(); - Assert.assertEquals(6, headers.length); + Assertions.assertEquals(6, headers.length); } @Test @@ -80,7 +82,7 @@ public void beforeWhenSampledNoHeader() { doReturn(false).when(profilerConfig).readBoolean(KafkaConfig.HEADER_ENABLE, true); Header[] headers = getHeadersWhenSampled(); - Assert.assertEquals(0, headers.length); + Assertions.assertEquals(0, headers.length); } private Header[] getHeadersWhenSampled() { @@ -127,7 +129,7 @@ public void beforeWhenUnsampled() { interceptor.before(apiVersionsGetter, args); Header[] headers = recordHeader.toArray(); - Assert.assertEquals(1, headers.length); + Assertions.assertEquals(1, headers.length); } @Test @@ -146,7 +148,7 @@ public void beforeWhenV1() { interceptor.before(apiVersionsGetter, args); Header[] headers = recordHeader.toArray(); - Assert.assertEquals(0, headers.length); + Assertions.assertEquals(0, headers.length); } } diff --git a/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ProducerConstructorInterceptorTest.java b/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ProducerConstructorInterceptorTest.java index 19d8c2693be5..045c8712d002 100644 --- a/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ProducerConstructorInterceptorTest.java +++ b/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ProducerConstructorInterceptorTest.java @@ -2,17 +2,17 @@ import com.navercorp.pinpoint.plugin.kafka.field.accessor.RemoteAddressFieldAccessor; import org.apache.kafka.clients.producer.ProducerConfig; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Collections; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ProducerConstructorInterceptorTest { @Mock diff --git a/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ProducerSendInterceptorTest.java b/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ProducerSendInterceptorTest.java index be44e7d81569..05c93d4b550b 100644 --- a/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ProducerSendInterceptorTest.java +++ b/plugins/kafka/src/test/java/com/navercorp/pinpoint/plugin/kafka/interceptor/ProducerSendInterceptorTest.java @@ -23,17 +23,16 @@ import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.plugin.kafka.KafkaConstants; import com.navercorp.pinpoint.plugin.kafka.field.accessor.RemoteAddressFieldAccessor; - import org.apache.kafka.clients.producer.ProducerRecord; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.verify; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class ProducerSendInterceptorTest { @Mock diff --git a/plugins/log4j2/src/test/java/com/navercorp/pinpoint/plugin/log4j2/Log4j2ConfigTest.java b/plugins/log4j2/src/test/java/com/navercorp/pinpoint/plugin/log4j2/Log4j2ConfigTest.java index 194080c8ccd1..b2405450985c 100644 --- a/plugins/log4j2/src/test/java/com/navercorp/pinpoint/plugin/log4j2/Log4j2ConfigTest.java +++ b/plugins/log4j2/src/test/java/com/navercorp/pinpoint/plugin/log4j2/Log4j2ConfigTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; import com.navercorp.pinpoint.common.util.StringUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; @@ -32,8 +32,8 @@ public class Log4j2ConfigTest { public void testLog4j2Config() { ProfilerConfig profilerConfig = mock(ProfilerConfig.class); Log4j2Config log4j2Config = new Log4j2Config(profilerConfig); - Assert.assertTrue(StringUtils.hasLength(log4j2Config.toString())); - Assert.assertFalse(log4j2Config.isLog4j2LoggingTransactionInfo()); + Assertions.assertTrue(StringUtils.hasLength(log4j2Config.toString())); + Assertions.assertFalse(log4j2Config.isLog4j2LoggingTransactionInfo()); } } \ No newline at end of file diff --git a/plugins/log4j2/src/test/java/com/navercorp/pinpoint/plugin/log4j2/Log4j2PluginTest.java b/plugins/log4j2/src/test/java/com/navercorp/pinpoint/plugin/log4j2/Log4j2PluginTest.java index acceae8b174c..24d89d3456dc 100644 --- a/plugins/log4j2/src/test/java/com/navercorp/pinpoint/plugin/log4j2/Log4j2PluginTest.java +++ b/plugins/log4j2/src/test/java/com/navercorp/pinpoint/plugin/log4j2/Log4j2PluginTest.java @@ -20,7 +20,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentContext; import com.navercorp.pinpoint.bootstrap.instrument.transformer.TransformTemplate; import com.navercorp.pinpoint.bootstrap.plugin.ProfilerPluginSetupContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; diff --git a/plugins/log4j2/src/test/java/com/navercorp/pinpoint/plugin/log4j2/interceptor/LogEventFactoryInterceptorTest.java b/plugins/log4j2/src/test/java/com/navercorp/pinpoint/plugin/log4j2/interceptor/LogEventFactoryInterceptorTest.java index 8e485eecad12..9217d01de41b 100644 --- a/plugins/log4j2/src/test/java/com/navercorp/pinpoint/plugin/log4j2/interceptor/LogEventFactoryInterceptorTest.java +++ b/plugins/log4j2/src/test/java/com/navercorp/pinpoint/plugin/log4j2/interceptor/LogEventFactoryInterceptorTest.java @@ -20,10 +20,10 @@ import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.context.TraceId; import org.apache.logging.log4j.ThreadContext; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; diff --git a/plugins/mariadb-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mariadb/MariaDBJdbcUrlParserTest.java b/plugins/mariadb-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mariadb/MariaDBJdbcUrlParserTest.java index b6ba49f16fa1..431f52110916 100644 --- a/plugins/mariadb-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mariadb/MariaDBJdbcUrlParserTest.java +++ b/plugins/mariadb-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mariadb/MariaDBJdbcUrlParserTest.java @@ -18,10 +18,10 @@ import com.navercorp.pinpoint.bootstrap.context.DatabaseInfo; import com.navercorp.pinpoint.common.trace.ServiceType; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author dawidmalina @@ -54,35 +54,35 @@ public class MariaDBJdbcUrlParserTest { public void mariadbParse1() { final String jdbcUrl = CONNECTION_STRING + "?useUnicode=yes&characterEncoding=UTF-8"; DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), SERVICE_TYPE); - Assert.assertEquals(dbInfo.getHost().get(0), (IP_PORT)); - Assert.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); - Assert.assertEquals(dbInfo.getUrl(), CONNECTION_STRING); + Assertions.assertEquals(dbInfo.getType(), SERVICE_TYPE); + Assertions.assertEquals(dbInfo.getHost().get(0), (IP_PORT)); + Assertions.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); + Assertions.assertEquals(dbInfo.getUrl(), CONNECTION_STRING); } @Test public void mariadbParse_mysql() { final String jdbcUrl = CONNECTION_STRING_MYSQL + "?useUnicode=yes&characterEncoding=UTF-8"; DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), SERVICE_TYPE); - Assert.assertEquals(dbInfo.getHost().get(0), (IP_PORT)); - Assert.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); - Assert.assertEquals(dbInfo.getUrl(), CONNECTION_STRING_MYSQL); + Assertions.assertEquals(dbInfo.getType(), SERVICE_TYPE); + Assertions.assertEquals(dbInfo.getHost().get(0), (IP_PORT)); + Assertions.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); + Assertions.assertEquals(dbInfo.getUrl(), CONNECTION_STRING_MYSQL); } @Test public void mariadbParse2() { DatabaseInfo dbInfo = jdbcUrlParser.parse(CONNECTION_STRING); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), SERVICE_TYPE); - Assert.assertEquals(dbInfo.getHost().get(0), IP_PORT); - Assert.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); - Assert.assertEquals(dbInfo.getUrl(), CONNECTION_STRING); + Assertions.assertEquals(dbInfo.getType(), SERVICE_TYPE); + Assertions.assertEquals(dbInfo.getHost().get(0), IP_PORT); + Assertions.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); + Assertions.assertEquals(dbInfo.getUrl(), CONNECTION_STRING); logger.debug(dbInfo); logger.debug(dbInfo.getMultipleHost()); } @@ -91,12 +91,12 @@ public void mariadbParse2() { public void mariadbParse3() { final String jdbcUrl = CONNECTION_STRING_NO_PORT + "?useUnicode=yes&characterEncoding=UTF-8"; DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), SERVICE_TYPE); - Assert.assertEquals(dbInfo.getHost().get(0), IP); - Assert.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); - Assert.assertEquals(dbInfo.getUrl(), CONNECTION_STRING_NO_PORT); + Assertions.assertEquals(dbInfo.getType(), SERVICE_TYPE); + Assertions.assertEquals(dbInfo.getHost().get(0), IP); + Assertions.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); + Assertions.assertEquals(dbInfo.getUrl(), CONNECTION_STRING_NO_PORT); logger.debug(dbInfo); } @@ -105,12 +105,12 @@ public void mariadbParse4() { final String jdbcUrl = CONNECTION_STRING + "?useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Seoul"; DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), SERVICE_TYPE); - Assert.assertEquals(dbInfo.getHost().get(0), IP_PORT); - Assert.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); - Assert.assertEquals(dbInfo.getUrl(), CONNECTION_STRING); + Assertions.assertEquals(dbInfo.getType(), SERVICE_TYPE); + Assertions.assertEquals(dbInfo.getHost().get(0), IP_PORT); + Assertions.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); + Assertions.assertEquals(dbInfo.getUrl(), CONNECTION_STRING); logger.debug(dbInfo); } @@ -119,12 +119,12 @@ public void mariadbParse5() { final String jdbcUrl = LOADBALANCE_CONNECTION_STRING + "?characterEncoding=UTF-8&serverTimezone=Asia/Seoul"; DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), SERVICE_TYPE); - Assert.assertEquals(dbInfo.getHost().get(0), IP_PORT); - Assert.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); - Assert.assertEquals(dbInfo.getUrl(), LOADBALANCE_CONNECTION_STRING); + Assertions.assertEquals(dbInfo.getType(), SERVICE_TYPE); + Assertions.assertEquals(dbInfo.getHost().get(0), IP_PORT); + Assertions.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); + Assertions.assertEquals(dbInfo.getUrl(), LOADBALANCE_CONNECTION_STRING); logger.debug(dbInfo); } @@ -132,12 +132,12 @@ public void mariadbParse5() { public void mariadbParseCookierunMaster() { final String jdbcUrl = CONNECTION_STRING + "?useUnicode=true&characterEncoding=UTF-8&noAccessToProcedureBodies=true&autoDeserialize=true&elideSetAutoCommits=true&sessionVariables=time_zone='%2B09:00',tx_isolation='READ-COMMITTED'"; DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), SERVICE_TYPE); - Assert.assertEquals(dbInfo.getHost().get(0), IP_PORT); - Assert.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); - Assert.assertEquals(dbInfo.getUrl(), CONNECTION_STRING); + Assertions.assertEquals(dbInfo.getType(), SERVICE_TYPE); + Assertions.assertEquals(dbInfo.getHost().get(0), IP_PORT); + Assertions.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); + Assertions.assertEquals(dbInfo.getUrl(), CONNECTION_STRING); logger.debug(dbInfo); } @@ -145,12 +145,12 @@ public void mariadbParseCookierunMaster() { public void mariadbParseCookierunSlave() { final String jdbcUrl = LOADBALANCE_CONNECTION_STRING + "?useUnicode=true&characterEncoding=UTF-8&noAccessToProcedureBodies=true&autoDeserialize=true&elideSetAutoCommits=true&sessionVariables=time_zone='%2B09:00',tx_isolation='READ-UNCOMMITTED'"; DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), SERVICE_TYPE); - Assert.assertEquals(dbInfo.getHost().get(0), IP_PORT); - Assert.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); - Assert.assertEquals(dbInfo.getUrl(), LOADBALANCE_CONNECTION_STRING); + Assertions.assertEquals(dbInfo.getType(), SERVICE_TYPE); + Assertions.assertEquals(dbInfo.getHost().get(0), IP_PORT); + Assertions.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); + Assertions.assertEquals(dbInfo.getUrl(), LOADBALANCE_CONNECTION_STRING); logger.debug(dbInfo); } @@ -158,31 +158,31 @@ public void mariadbParseCookierunSlave() { public void mariadbParseCookierunSlave2() { final String jdbcUrl = LOADBALANCE_CONNECTION_STRING2 + "?useUnicode=true&characterEncoding=UTF-8&noAccessToProcedureBodies=true&autoDeserialize=true&elideSetAutoCommits=true&sessionVariables=time_zone='%2B09:00',tx_isolation='READ-UNCOMMITTED'"; DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), SERVICE_TYPE); - Assert.assertEquals(dbInfo.getHost().get(0), IP_PORT); - Assert.assertEquals(dbInfo.getHost().get(1), IP_PORT2); - Assert.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); - Assert.assertEquals(dbInfo.getUrl(), LOADBALANCE_CONNECTION_STRING2); + Assertions.assertEquals(dbInfo.getType(), SERVICE_TYPE); + Assertions.assertEquals(dbInfo.getHost().get(0), IP_PORT); + Assertions.assertEquals(dbInfo.getHost().get(1), IP_PORT2); + Assertions.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); + Assertions.assertEquals(dbInfo.getUrl(), LOADBALANCE_CONNECTION_STRING2); logger.debug(dbInfo); } @Test public void parseFailTest1() { DatabaseInfo dbInfo = jdbcUrlParser.parse(null); - Assert.assertFalse(dbInfo.isParsingComplete()); + Assertions.assertFalse(dbInfo.isParsingComplete()); - Assert.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); + Assertions.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); } @Test public void parseFailTest2() { final String jdbcUrl = "jdbc:oracle:loadbalance://1.2.3.4:3306"; DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl); - Assert.assertFalse(dbInfo.isParsingComplete()); + Assertions.assertFalse(dbInfo.isParsingComplete()); - Assert.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); + Assertions.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); } } diff --git a/plugins/mongodb/src/test/java/com/navercorp/pinpoint/plugin/mongo/WritecontextTest.java b/plugins/mongodb/src/test/java/com/navercorp/pinpoint/plugin/mongo/WritecontextTest.java index 8d5c7c8f00cc..77a473e76a4d 100644 --- a/plugins/mongodb/src/test/java/com/navercorp/pinpoint/plugin/mongo/WritecontextTest.java +++ b/plugins/mongodb/src/test/java/com/navercorp/pinpoint/plugin/mongo/WritecontextTest.java @@ -18,35 +18,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.mongodb.BasicDBObject; -import com.navercorp.pinpoint.common.util.StringStringValue; -import org.bson.BsonArray; -import org.bson.BsonBinary; -import org.bson.BsonBinarySubType; -import org.bson.BsonBoolean; -import org.bson.BsonDateTime; -import org.bson.BsonDbPointer; -import org.bson.BsonDecimal128; -import org.bson.BsonDocument; -import org.bson.BsonDouble; -import org.bson.BsonInt32; -import org.bson.BsonInt64; -import org.bson.BsonJavaScript; -import org.bson.BsonJavaScriptWithScope; -import org.bson.BsonNull; -import org.bson.BsonObjectId; -import org.bson.BsonRegularExpression; -import org.bson.BsonString; -import org.bson.BsonSymbol; -import org.bson.BsonTimestamp; -import org.bson.BsonUndefined; -import org.bson.BsonValue; -import org.bson.conversions.Bson; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.bson.*; import org.bson.types.Decimal128; import org.bson.types.ObjectId; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Arrays; @@ -54,8 +32,6 @@ import java.util.List; import java.util.Map; -import static com.mongodb.client.model.Filters.eq; - /** * @author Woonduk Kang(emeroad) @@ -76,7 +52,7 @@ public void parseBsonNestedClass() throws IOException { logger.debug("parsedStringStringValue:{}", stringStringValue); List list = objectMapper.readValue("[" + stringStringValue.getNormalizedBson() + "]", List.class); - Assert.assertEquals(1, list.size()); + Assertions.assertEquals(1, list.size()); Map query1Map = (Map) list.get(0); Map query2Map = (Map) query1Map.get("specialchar"); @@ -94,7 +70,7 @@ public void parseArray() throws IOException { logger.debug("parsedStringStringValue:{}", stringStringValue); List list = objectMapper.readValue("[" + stringStringValue.getNormalizedBson() + "]", List.class); - Assert.assertEquals(1, list.size()); + Assertions.assertEquals(1, list.size()); Map query1Map = (Map) list.get(0); List objectArray = (List) query1Map.get("stringArray"); @@ -139,7 +115,7 @@ public void parseBsonArrayWithValues() throws IOException { logger.debug("val:{}", stringStringValue); List list = objectMapper.readValue("[" + stringStringValue.getNormalizedBson() + "]", List.class); - Assert.assertEquals(1, list.size()); + Assertions.assertEquals(1, list.size()); Map query1Map = (Map) list.get(0); checkValue(query1Map); @@ -158,7 +134,7 @@ public void parsePrimitiveIntArray() throws IOException { logger.debug("parsedStringStringValue:{}", stringStringValue); List list = objectMapper.readValue("[" + stringStringValue.getNormalizedBson() + "]", List.class); - Assert.assertEquals(objArray.length, list.size()); + Assertions.assertEquals(objArray.length, list.size()); Map> query1Map = (Map>) list.get(0); List objectArray = query1Map.get("intArray"); @@ -176,7 +152,7 @@ public void parsePrimitiveDoubleArray() throws IOException { logger.debug("parsedStringStringValue:{}", stringStringValue); List list = objectMapper.readValue("[" + stringStringValue.getNormalizedBson() + "]", List.class); - Assert.assertEquals(1, list.size()); + Assertions.assertEquals(1, list.size()); Map query1Map = (Map) list.get(0); List objectArray = (List) query1Map.get("doubleArray"); @@ -194,7 +170,7 @@ public void parseCollection() throws IOException { logger.debug("parsedStringStringValue:{}", stringStringValue); List list = objectMapper.readValue("[" + stringStringValue.getNormalizedBson() + "]", List.class); - Assert.assertEquals(1, list.size()); + Assertions.assertEquals(1, list.size()); Map query1Map = (Map) list.get(0); List objectArray = (List) query1Map.get("collection"); @@ -211,7 +187,7 @@ public void parseWithDoubleQuoteInKey() throws IOException { logger.debug("parsedStringStringValue:{}", stringStringValue); List list = objectMapper.readValue("[" + stringStringValue.getNormalizedBson() + "]", List.class); - Assert.assertEquals(1, list.size()); + Assertions.assertEquals(1, list.size()); Map query1Map = (Map) list.get(0); Map query2Map = (Map) query1Map.get("\"query"); @@ -256,7 +232,7 @@ public void parseTestAbbreviation_BsonValueArray() throws IOException { logger.debug("val:{}", stringStringValue); List list = objectMapper.readValue("[" + stringStringValue.getNormalizedBson() + "]", List.class); - Assert.assertEquals(1, list.size()); + Assertions.assertEquals(1, list.size()); Map query1Map = (Map) list.get(0); @@ -281,7 +257,7 @@ public void parseTestAbbreviation_Collection() throws IOException { logger.debug("parsedStringStringValue:{}", stringStringValue); List list = objectMapper.readValue("[" + stringStringValue.getNormalizedBson() + "]", List.class); - Assert.assertEquals(objArray.length, list.size()); + Assertions.assertEquals(objArray.length, list.size()); Map query1Map = (Map) list.get(0); List objectArray = (List) query1Map.get("intArray"); @@ -303,7 +279,7 @@ public void parseTestAbbreviation_PrimitiveArray() throws IOException { logger.debug("parsedStringStringValue:{}", stringStringValue); List list = objectMapper.readValue("[" + stringStringValue.getNormalizedBson() + "]", List.class); - Assert.assertEquals(objArray.length, list.size()); + Assertions.assertEquals(objArray.length, list.size()); Map query1Map = (Map) list.get(0); List objectArray = (List) query1Map.get("intArray"); @@ -328,7 +304,7 @@ public void parseTestAbbreviation_Array() throws IOException { logger.debug("val:{}", stringStringValue); List list = objectMapper.readValue("[" + stringStringValue.getNormalizedBson() + "]", List.class); - Assert.assertEquals(1, list.size()); + Assertions.assertEquals(1, list.size()); Map query1Map = (Map) list.get(0); @@ -345,7 +321,7 @@ private void checkValue(Object object) { checkValue(value); } } else { - Assert.assertEquals("?", object); + Assertions.assertEquals("?", object); } } } \ No newline at end of file diff --git a/plugins/mongodb/src/test/java/com/navercorp/pinpoint/plugin/mongo/interceptor/DatabaseInfoUtilsTest.java b/plugins/mongodb/src/test/java/com/navercorp/pinpoint/plugin/mongo/interceptor/DatabaseInfoUtilsTest.java index 1bb1639046b5..497cce2e3139 100644 --- a/plugins/mongodb/src/test/java/com/navercorp/pinpoint/plugin/mongo/interceptor/DatabaseInfoUtilsTest.java +++ b/plugins/mongodb/src/test/java/com/navercorp/pinpoint/plugin/mongo/interceptor/DatabaseInfoUtilsTest.java @@ -19,11 +19,9 @@ import com.navercorp.pinpoint.bootstrap.context.DatabaseInfo; import com.navercorp.pinpoint.bootstrap.plugin.jdbc.DatabaseInfoAccessor; import com.navercorp.pinpoint.bootstrap.plugin.jdbc.UnKnownDatabaseInfo; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import org.junit.Assert; -import org.junit.Test; - -import static org.junit.Assert.*; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -40,7 +38,7 @@ public void getDatabaseInfo() { DatabaseInfo databaseInfo = DatabaseInfoUtils.getDatabaseInfo(databaseInfoAccessor, UnKnownDatabaseInfo.MONGO_INSTANCE); - Assert.assertEquals(databaseInfo, defaultDatabaseInfo); + Assertions.assertEquals(databaseInfo, defaultDatabaseInfo); } @Test @@ -49,14 +47,14 @@ public void getDatabaseInfo_return_null() { when(databaseInfoAccessor._$PINPOINT$_getDatabaseInfo()).thenReturn(null); DatabaseInfo databaseInfo = DatabaseInfoUtils.getDatabaseInfo(databaseInfoAccessor, UnKnownDatabaseInfo.MONGO_INSTANCE); - Assert.assertEquals(databaseInfo, UnKnownDatabaseInfo.MONGO_INSTANCE); + Assertions.assertEquals(databaseInfo, UnKnownDatabaseInfo.MONGO_INSTANCE); } @Test public void getDatabaseInfo_unknown() { DatabaseInfo databaseInfo = DatabaseInfoUtils.getDatabaseInfo(new Object(), UnKnownDatabaseInfo.MONGO_INSTANCE); - Assert.assertEquals(databaseInfo, UnKnownDatabaseInfo.MONGO_INSTANCE); + Assertions.assertEquals(databaseInfo, UnKnownDatabaseInfo.MONGO_INSTANCE); } } \ No newline at end of file diff --git a/plugins/mssql-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mssql/MssqlJdbcUrlParserTest.java b/plugins/mssql-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mssql/MssqlJdbcUrlParserTest.java index 2e98bece018d..a2716048318a 100644 --- a/plugins/mssql-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mssql/MssqlJdbcUrlParserTest.java +++ b/plugins/mssql-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mssql/MssqlJdbcUrlParserTest.java @@ -4,11 +4,11 @@ import com.navercorp.pinpoint.common.profiler.trace.TraceMetadataRegistrar; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.trace.ServiceTypeLocator; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -28,7 +28,7 @@ public class MssqlJdbcUrlParserTest { private MssqlJdbcUrlParser jdbcUrlParser = new MssqlJdbcUrlParser(); - @BeforeClass + @BeforeAll public static void beforeClass() throws Exception { ServiceTypeLocator serviceTypeLocator = mock(ServiceTypeLocator.class); ServiceType type = newServiceType(TYPE_CODE, TYPE_MSSQL_JDBC); @@ -49,24 +49,24 @@ private static ServiceType newServiceType(short code, String name) { public void mssql_jdbc_string_should_be_parsed_1() { DatabaseInfo dbInfo = jdbcUrlParser .parse("jdbc:sqlserver://ip_address;databaseName=database_name;integratedSecurity=true"); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(MssqlConstants.MSSQL_JDBC, dbInfo.getType()); - Assert.assertEquals(("ip_address"), dbInfo.getHost().get(0)); - Assert.assertEquals("database_name", dbInfo.getDatabaseId()); - Assert.assertEquals("jdbc:sqlserver://ip_address;databaseName=database_name", dbInfo.getUrl()); + Assertions.assertEquals(MssqlConstants.MSSQL_JDBC, dbInfo.getType()); + Assertions.assertEquals(("ip_address"), dbInfo.getHost().get(0)); + Assertions.assertEquals("database_name", dbInfo.getDatabaseId()); + Assertions.assertEquals("jdbc:sqlserver://ip_address;databaseName=database_name", dbInfo.getUrl()); } @Test public void mssql_jdbc_string_should_be_parsed_2() { DatabaseInfo dbInfo = jdbcUrlParser .parse("jdbc:sqlserver://localhost:1433;databaseName=AdventureWorks;integratedSecurity=true;applicationName=MyApp"); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(MssqlConstants.MSSQL_JDBC, dbInfo.getType()); - Assert.assertEquals(("localhost:1433"), dbInfo.getHost().get(0)); - Assert.assertEquals("AdventureWorks", dbInfo.getDatabaseId()); - Assert.assertEquals("jdbc:sqlserver://localhost:1433;databaseName=AdventureWorks", + Assertions.assertEquals(MssqlConstants.MSSQL_JDBC, dbInfo.getType()); + Assertions.assertEquals(("localhost:1433"), dbInfo.getHost().get(0)); + Assertions.assertEquals("AdventureWorks", dbInfo.getDatabaseId()); + Assertions.assertEquals("jdbc:sqlserver://localhost:1433;databaseName=AdventureWorks", dbInfo.getUrl()); } @@ -74,12 +74,12 @@ public void mssql_jdbc_string_should_be_parsed_2() { public void mssql_jdbc_string_should_be_parsed_3() { DatabaseInfo dbInfo = jdbcUrlParser .parse("jdbc:sqlserver://localhost:1433;DatabaseName=AdventureWorks;integratedSecurity=true;applicationName=MyApp"); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(MssqlConstants.MSSQL_JDBC, dbInfo.getType()); - Assert.assertEquals(("localhost:1433"), dbInfo.getHost().get(0)); - Assert.assertEquals("AdventureWorks", dbInfo.getDatabaseId()); - Assert.assertEquals("jdbc:sqlserver://localhost:1433;databaseName=AdventureWorks", + Assertions.assertEquals(MssqlConstants.MSSQL_JDBC, dbInfo.getType()); + Assertions.assertEquals(("localhost:1433"), dbInfo.getHost().get(0)); + Assertions.assertEquals("AdventureWorks", dbInfo.getDatabaseId()); + Assertions.assertEquals("jdbc:sqlserver://localhost:1433;databaseName=AdventureWorks", dbInfo.getUrl()); } diff --git a/plugins/mysql-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlJdbcUrlParserTest.java b/plugins/mysql-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlJdbcUrlParserTest.java index 07d16a2c48ab..d7c68a6e6861 100644 --- a/plugins/mysql-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlJdbcUrlParserTest.java +++ b/plugins/mysql-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/mysql/MySqlJdbcUrlParserTest.java @@ -18,10 +18,10 @@ import com.navercorp.pinpoint.bootstrap.context.DatabaseInfo; import com.navercorp.pinpoint.common.trace.ServiceType; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -52,23 +52,23 @@ public class MySqlJdbcUrlParserTest { public void mysqlParse1() { final String jdbcUrl = CONNECTION_STRING + "?useUnicode=yes&characterEncoding=UTF-8"; DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), SERVICE_TYPE); - Assert.assertEquals(dbInfo.getHost().get(0), (IP_PORT)); - Assert.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); - Assert.assertEquals(dbInfo.getUrl(), CONNECTION_STRING); + Assertions.assertEquals(dbInfo.getType(), SERVICE_TYPE); + Assertions.assertEquals(dbInfo.getHost().get(0), (IP_PORT)); + Assertions.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); + Assertions.assertEquals(dbInfo.getUrl(), CONNECTION_STRING); } @Test public void mysqlParse2() { DatabaseInfo dbInfo = jdbcUrlParser.parse(CONNECTION_STRING); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), SERVICE_TYPE); - Assert.assertEquals(dbInfo.getHost().get(0), IP_PORT); - Assert.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); - Assert.assertEquals(dbInfo.getUrl(), CONNECTION_STRING); + Assertions.assertEquals(dbInfo.getType(), SERVICE_TYPE); + Assertions.assertEquals(dbInfo.getHost().get(0), IP_PORT); + Assertions.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); + Assertions.assertEquals(dbInfo.getUrl(), CONNECTION_STRING); logger.debug(dbInfo); logger.debug(dbInfo.getMultipleHost()); } @@ -77,12 +77,12 @@ public void mysqlParse2() { public void mysqlParse3() { final String jdbcUrl = CONNECTION_STRING_NO_PORT + "?useUnicode=yes&characterEncoding=UTF-8"; DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), SERVICE_TYPE); - Assert.assertEquals(dbInfo.getHost().get(0), IP); - Assert.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); - Assert.assertEquals(dbInfo.getUrl(), CONNECTION_STRING_NO_PORT); + Assertions.assertEquals(dbInfo.getType(), SERVICE_TYPE); + Assertions.assertEquals(dbInfo.getHost().get(0), IP); + Assertions.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); + Assertions.assertEquals(dbInfo.getUrl(), CONNECTION_STRING_NO_PORT); logger.debug(dbInfo); } @@ -91,12 +91,12 @@ public void mysqlParse4() { final String jdbcUrl = CONNECTION_STRING + "?useUnicode=yes&characterEncoding=UTF-8&serverTimezone=Asia/Seoul"; DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), SERVICE_TYPE); - Assert.assertEquals(dbInfo.getHost().get(0), IP_PORT); - Assert.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); - Assert.assertEquals(dbInfo.getUrl(), CONNECTION_STRING); + Assertions.assertEquals(dbInfo.getType(), SERVICE_TYPE); + Assertions.assertEquals(dbInfo.getHost().get(0), IP_PORT); + Assertions.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); + Assertions.assertEquals(dbInfo.getUrl(), CONNECTION_STRING); logger.debug(dbInfo); } @@ -105,12 +105,12 @@ public void mysqlParse5() { final String jdbcUrl = LOADBALANCE_CONNECTION_STRING + "?characterEncoding=UTF-8&serverTimezone=Asia/Seoul"; DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), SERVICE_TYPE); - Assert.assertEquals(dbInfo.getHost().get(0), IP_PORT); - Assert.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); - Assert.assertEquals(dbInfo.getUrl(), LOADBALANCE_CONNECTION_STRING); + Assertions.assertEquals(dbInfo.getType(), SERVICE_TYPE); + Assertions.assertEquals(dbInfo.getHost().get(0), IP_PORT); + Assertions.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); + Assertions.assertEquals(dbInfo.getUrl(), LOADBALANCE_CONNECTION_STRING); logger.debug(dbInfo); } @@ -118,12 +118,12 @@ public void mysqlParse5() { public void mysqlParse6() { final String jdbcUrl = CONNECTION_STRING + "?useUnicode=true&characterEncoding=UTF-8&noAccessToProcedureBodies=true&autoDeserialize=true&elideSetAutoCommits=true&sessionVariables=time_zone='%2B09:00',tx_isolation='READ-COMMITTED'"; DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), SERVICE_TYPE); - Assert.assertEquals(dbInfo.getHost().get(0), IP_PORT); - Assert.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); - Assert.assertEquals(dbInfo.getUrl(), CONNECTION_STRING); + Assertions.assertEquals(dbInfo.getType(), SERVICE_TYPE); + Assertions.assertEquals(dbInfo.getHost().get(0), IP_PORT); + Assertions.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); + Assertions.assertEquals(dbInfo.getUrl(), CONNECTION_STRING); logger.debug(dbInfo); } @@ -131,12 +131,12 @@ public void mysqlParse6() { public void mysqlParse_loadbalance1() { final String jdbcUrl = LOADBALANCE_CONNECTION_STRING + "?useUnicode=true&characterEncoding=UTF-8&noAccessToProcedureBodies=true&autoDeserialize=true&elideSetAutoCommits=true&sessionVariables=time_zone='%2B09:00',tx_isolation='READ-UNCOMMITTED'"; DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), SERVICE_TYPE); - Assert.assertEquals(dbInfo.getHost().get(0), IP_PORT); - Assert.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); - Assert.assertEquals(dbInfo.getUrl(), LOADBALANCE_CONNECTION_STRING); + Assertions.assertEquals(dbInfo.getType(), SERVICE_TYPE); + Assertions.assertEquals(dbInfo.getHost().get(0), IP_PORT); + Assertions.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); + Assertions.assertEquals(dbInfo.getUrl(), LOADBALANCE_CONNECTION_STRING); logger.debug(dbInfo); } @@ -144,41 +144,41 @@ public void mysqlParse_loadbalance1() { public void mysqlParse_loadbalance2() { final String jdbcUrl = LOADBALANCE_CONNECTION_STRING2 + "?useUnicode=true&characterEncoding=UTF-8&noAccessToProcedureBodies=true&autoDeserialize=true&elideSetAutoCommits=true&sessionVariables=time_zone='%2B09:00',tx_isolation='READ-UNCOMMITTED'"; DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), SERVICE_TYPE); - Assert.assertEquals(dbInfo.getHost().get(0), IP_PORT); - Assert.assertEquals(dbInfo.getHost().get(1), IP_PORT2); - Assert.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); - Assert.assertEquals(dbInfo.getUrl(), LOADBALANCE_CONNECTION_STRING2); + Assertions.assertEquals(dbInfo.getType(), SERVICE_TYPE); + Assertions.assertEquals(dbInfo.getHost().get(0), IP_PORT); + Assertions.assertEquals(dbInfo.getHost().get(1), IP_PORT2); + Assertions.assertEquals(dbInfo.getDatabaseId(), DATABASE_ID); + Assertions.assertEquals(dbInfo.getUrl(), LOADBALANCE_CONNECTION_STRING2); logger.debug(dbInfo); } @Test public void parseFailTest1() { DatabaseInfo dbInfo = jdbcUrlParser.parse(null); - Assert.assertFalse(dbInfo.isParsingComplete()); + Assertions.assertFalse(dbInfo.isParsingComplete()); - Assert.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); + Assertions.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); } @Test public void parseFailTest2() { final String jdbcUrl = "jdbc:oracle:loadbalance://1.2.3.4:3306"; DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl); - Assert.assertFalse(dbInfo.isParsingComplete()); + Assertions.assertFalse(dbInfo.isParsingComplete()); - Assert.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); + Assertions.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); } @Test public void emptyDataBase() { final String jdbcUrl = "jdbc:mysql://1.2.3.4:3306"; DatabaseInfo dbInfo = jdbcUrlParser.parse(jdbcUrl); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(SERVICE_TYPE, dbInfo.getType()); - Assert.assertEquals(MySqlJdbcUrlParser.EMPTY_DATABASE, dbInfo.getDatabaseId()); + Assertions.assertEquals(SERVICE_TYPE, dbInfo.getType()); + Assertions.assertEquals(MySqlJdbcUrlParser.EMPTY_DATABASE, dbInfo.getDatabaseId()); } } diff --git a/plugins/netty/src/test/java/com/navercorp/pinpoint/plugin/netty/NettyConfigTest.java b/plugins/netty/src/test/java/com/navercorp/pinpoint/plugin/netty/NettyConfigTest.java index 771c3c7cc28d..2c77cf42415a 100644 --- a/plugins/netty/src/test/java/com/navercorp/pinpoint/plugin/netty/NettyConfigTest.java +++ b/plugins/netty/src/test/java/com/navercorp/pinpoint/plugin/netty/NettyConfigTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfigLoader; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -32,32 +32,32 @@ public class NettyConfigTest { public void configTest1() throws Exception { NettyConfig config = createConfig("true", "true"); - Assert.assertTrue(config.isPluginEnable()); - Assert.assertTrue(config.isHttpCodecEnable()); + Assertions.assertTrue(config.isPluginEnable()); + Assertions.assertTrue(config.isHttpCodecEnable()); } @Test public void configTest2() throws Exception { NettyConfig config = createConfig("true", "false"); - Assert.assertTrue(config.isPluginEnable()); - Assert.assertFalse(config.isHttpCodecEnable()); + Assertions.assertTrue(config.isPluginEnable()); + Assertions.assertFalse(config.isHttpCodecEnable()); } @Test public void configTest3() throws Exception { NettyConfig config = createConfig("false", "true"); - Assert.assertFalse(config.isPluginEnable()); - Assert.assertTrue(config.isHttpCodecEnable()); + Assertions.assertFalse(config.isPluginEnable()); + Assertions.assertTrue(config.isHttpCodecEnable()); } @Test public void configTest4() throws Exception { NettyConfig config = createConfig("false", "false"); - Assert.assertFalse(config.isPluginEnable()); - Assert.assertFalse(config.isHttpCodecEnable()); + Assertions.assertFalse(config.isPluginEnable()); + Assertions.assertFalse(config.isHttpCodecEnable()); } private NettyConfig createConfig(String pluginEnable, String httpEnable) { diff --git a/plugins/ning-asynchttpclient/src/test/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/EndPointUtilsTest.java b/plugins/ning-asynchttpclient/src/test/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/EndPointUtilsTest.java index 30fcc6581d17..0556809cc05d 100644 --- a/plugins/ning-asynchttpclient/src/test/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/EndPointUtilsTest.java +++ b/plugins/ning-asynchttpclient/src/test/java/com/navercorp/pinpoint/plugin/ning/asynchttpclient/EndPointUtilsTest.java @@ -16,9 +16,9 @@ package com.navercorp.pinpoint.plugin.ning.asynchttpclient; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author jaehong.kim diff --git a/plugins/okhttp/src/test/java/com/navercorp/pinpoint/plugin/okhttp/EndPointUtilsTest.java b/plugins/okhttp/src/test/java/com/navercorp/pinpoint/plugin/okhttp/EndPointUtilsTest.java index 4ba019e98876..15f0a1ef2469 100644 --- a/plugins/okhttp/src/test/java/com/navercorp/pinpoint/plugin/okhttp/EndPointUtilsTest.java +++ b/plugins/okhttp/src/test/java/com/navercorp/pinpoint/plugin/okhttp/EndPointUtilsTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.plugin.okhttp; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -25,9 +25,9 @@ public class EndPointUtilsTest { @Test public void getPort() throws Exception { - Assert.assertEquals(EndPointUtils.getPort(-1, 80), -1); - Assert.assertEquals(EndPointUtils.getPort(80, 80), -1); - Assert.assertEquals(EndPointUtils.getPort(80, 8080), 80); + Assertions.assertEquals(EndPointUtils.getPort(-1, 80), -1); + Assertions.assertEquals(EndPointUtils.getPort(80, 80), -1); + Assertions.assertEquals(EndPointUtils.getPort(80, 8080), 80); } } \ No newline at end of file diff --git a/plugins/oracle-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/JDBCUrlParserTest.java b/plugins/oracle-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/JDBCUrlParserTest.java index 1a416092995c..fd94af53402a 100644 --- a/plugins/oracle-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/JDBCUrlParserTest.java +++ b/plugins/oracle-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/JDBCUrlParserTest.java @@ -18,12 +18,10 @@ import com.navercorp.pinpoint.bootstrap.context.DatabaseInfo; import com.navercorp.pinpoint.common.trace.ServiceType; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; - -import java.net.URI; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -39,12 +37,12 @@ public void oracleParser1() { // jdbc:oracle:thin:@hostname:port:SID // "jdbc:oracle:thin:MYWORKSPACE/qwerty@localhost:1521:XE"; DatabaseInfo dbInfo = jdbcUrlParser.parse("jdbc:oracle:thin:@hostname:port:SID"); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), OracleConstants.ORACLE); - Assert.assertEquals(dbInfo.getHost().get(0), "hostname:port"); - Assert.assertEquals(dbInfo.getDatabaseId(), "SID"); - Assert.assertEquals(dbInfo.getUrl(), "jdbc:oracle:thin:@hostname:port:SID"); + Assertions.assertEquals(dbInfo.getType(), OracleConstants.ORACLE); + Assertions.assertEquals(dbInfo.getHost().get(0), "hostname:port"); + Assertions.assertEquals(dbInfo.getDatabaseId(), "SID"); + Assertions.assertEquals(dbInfo.getUrl(), "jdbc:oracle:thin:@hostname:port:SID"); logger.info(dbInfo); } @@ -53,12 +51,12 @@ public void oracleParser2() { // jdbc:oracle:thin:@hostname:port:SID // "jdbc:oracle:thin:MYWORKSPACE/qwerty@localhost:1521:XE"; DatabaseInfo dbInfo = jdbcUrlParser.parse("jdbc:oracle:thin:MYWORKSPACE/qwerty@localhost:1521:XE"); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), OracleConstants.ORACLE); - Assert.assertEquals(dbInfo.getHost().get(0), "localhost:1521"); - Assert.assertEquals(dbInfo.getDatabaseId(), "XE"); - Assert.assertEquals(dbInfo.getUrl(), "jdbc:oracle:thin:MYWORKSPACE/qwerty@localhost:1521:XE"); + Assertions.assertEquals(dbInfo.getType(), OracleConstants.ORACLE); + Assertions.assertEquals(dbInfo.getHost().get(0), "localhost:1521"); + Assertions.assertEquals(dbInfo.getDatabaseId(), "XE"); + Assertions.assertEquals(dbInfo.getUrl(), "jdbc:oracle:thin:MYWORKSPACE/qwerty@localhost:1521:XE"); logger.info(dbInfo); } @@ -67,12 +65,12 @@ public void oracleParserServiceName() { // jdbc:oracle:thin:@hostname:port:SID // "jdbc:oracle:thin:MYWORKSPACE/qwerty@localhost:1521:XE"; DatabaseInfo dbInfo = jdbcUrlParser.parse("jdbc:oracle:thin:@hostname:port/serviceName"); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), OracleConstants.ORACLE); - Assert.assertEquals(dbInfo.getHost().get(0), "hostname:port"); - Assert.assertEquals(dbInfo.getDatabaseId(), "serviceName"); - Assert.assertEquals(dbInfo.getUrl(), "jdbc:oracle:thin:@hostname:port/serviceName"); + Assertions.assertEquals(dbInfo.getType(), OracleConstants.ORACLE); + Assertions.assertEquals(dbInfo.getHost().get(0), "hostname:port"); + Assertions.assertEquals(dbInfo.getDatabaseId(), "serviceName"); + Assertions.assertEquals(dbInfo.getUrl(), "jdbc:oracle:thin:@hostname:port/serviceName"); logger.info(dbInfo); } @@ -87,14 +85,14 @@ public void oracleRacParser1() { "(ADDRESS=(PROTOCOL=TCP)(HOST=1.2.3.5) (PORT=1522))" + "(CONNECT_DATA=(SERVICE_NAME=service)))"; DatabaseInfo dbInfo = jdbcUrlParser.parse(rac); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), OracleConstants.ORACLE); - Assert.assertEquals(dbInfo.getHost().get(0), "1.2.3.4:1521"); - Assert.assertEquals(dbInfo.getHost().get(1), "1.2.3.5:1522"); + Assertions.assertEquals(dbInfo.getType(), OracleConstants.ORACLE); + Assertions.assertEquals(dbInfo.getHost().get(0), "1.2.3.4:1521"); + Assertions.assertEquals(dbInfo.getHost().get(1), "1.2.3.5:1522"); - Assert.assertEquals(dbInfo.getDatabaseId(), "service"); - Assert.assertEquals(dbInfo.getUrl(), rac); + Assertions.assertEquals(dbInfo.getDatabaseId(), "service"); + Assertions.assertEquals(dbInfo.getUrl(), rac); logger.info(dbInfo); } @@ -113,33 +111,33 @@ public void oracleDescriptionListParser1() { "(ADDRESS=(PROTOCOL=tcp)(HOST=2.3.4.6)(PORT=1521))" + "(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=service_test))))"; DatabaseInfo dbInfo = jdbcUrlParser.parse(url); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(OracleConstants.ORACLE, dbInfo.getType()); - Assert.assertEquals("1.2.3.4:1521", dbInfo.getHost().get(0)); - Assert.assertEquals("1.2.3.5:1521", dbInfo.getHost().get(1)); - Assert.assertEquals("2.3.4.5:1521", dbInfo.getHost().get(2)); - Assert.assertEquals("2.3.4.6:1521", dbInfo.getHost().get(3)); + Assertions.assertEquals(OracleConstants.ORACLE, dbInfo.getType()); + Assertions.assertEquals("1.2.3.4:1521", dbInfo.getHost().get(0)); + Assertions.assertEquals("1.2.3.5:1521", dbInfo.getHost().get(1)); + Assertions.assertEquals("2.3.4.5:1521", dbInfo.getHost().get(2)); + Assertions.assertEquals("2.3.4.6:1521", dbInfo.getHost().get(3)); - Assert.assertEquals("service_test", dbInfo.getDatabaseId()); - Assert.assertEquals(url, dbInfo.getUrl()); + Assertions.assertEquals("service_test", dbInfo.getDatabaseId()); + Assertions.assertEquals(url, dbInfo.getUrl()); logger.info(dbInfo); } @Test public void parseFailTest1() { DatabaseInfo dbInfo = jdbcUrlParser.parse(null); - Assert.assertFalse(dbInfo.isParsingComplete()); + Assertions.assertFalse(dbInfo.isParsingComplete()); - Assert.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); + Assertions.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); } @Test public void parseFailTest2() { DatabaseInfo dbInfo = jdbcUrlParser.parse("jdbc:mysql:thin:@hostname:port:SID"); - Assert.assertFalse(dbInfo.isParsingComplete()); + Assertions.assertFalse(dbInfo.isParsingComplete()); - Assert.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); + Assertions.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); } diff --git a/plugins/oracle-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/parser/OracleNetConnectionDescriptorParserTest.java b/plugins/oracle-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/parser/OracleNetConnectionDescriptorParserTest.java index 88ae1b76179d..d99caea5b938 100644 --- a/plugins/oracle-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/parser/OracleNetConnectionDescriptorParserTest.java +++ b/plugins/oracle-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/parser/OracleNetConnectionDescriptorParserTest.java @@ -16,12 +16,10 @@ package com.navercorp.pinpoint.plugin.jdbc.oracle.parser; -import org.junit.Assert; -import org.junit.Test; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; - - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -41,7 +39,7 @@ public void simple() { logger.info(keyValue.toString()); Description des = new Description(keyValue); - Assert.assertEquals(des.getServiceName(), "service"); + Assertions.assertEquals(des.getServiceName(), "service"); } @Test @@ -54,7 +52,7 @@ public void emptyValue() { logger.info(keyValue.toString()); Description des = new Description(keyValue); - Assert.assertEquals(des.getServiceName(), null); + Assertions.assertEquals(des.getServiceName(), null); } @@ -73,7 +71,7 @@ public void parse() { value.setServiceName("service"); value.addAddress("tcp", "1.2.3.4", "1521"); value.addAddress("tcp", "1.2.3.5", "1522"); - Assert.assertEquals(description, value); + Assertions.assertEquals(description, value); } @@ -92,7 +90,7 @@ public void parse2() { value.setServiceName("service"); value.addAddress("tcp", "1.2.3.4", "1521"); value.addAddress("tcp", "1.2.3.5", "1522"); - Assert.assertEquals(description, value); + Assertions.assertEquals(description, value); } @@ -113,7 +111,7 @@ public void parse3() { value.addAddress("tcp", "1.2.3.4", "1521"); value.addAddress("tcp", "1.2.3.5", "1522"); value.addAddress("tcp", "1.2.3.6", "1523"); - Assert.assertEquals(description, value); + Assertions.assertEquals(description, value); } @@ -130,7 +128,7 @@ public void parse4() { Description value = new Description(); value.setSid("sid"); value.addAddress("tcp", "1.2.3.4", "1521"); - Assert.assertEquals(description, value); + Assertions.assertEquals(description, value); } @@ -157,13 +155,13 @@ public void parse_description_list() { desc1.setServiceName("service_test"); desc1.addAddress("tcp", "1.2.3.4", "1521"); desc1.addAddress("tcp", "1.2.3.5", "1521"); - Assert.assertEquals(desc1, descriptionList.getDescriptionList().get(0)); + Assertions.assertEquals(desc1, descriptionList.getDescriptionList().get(0)); Description desc2 = new Description(); desc2.setServiceName("service_test"); desc2.addAddress("tcp", "2.3.4.5", "1521"); desc2.addAddress("tcp", "2.3.4.6", "1521"); - Assert.assertEquals(desc2, descriptionList.getDescriptionList().get(1)); + Assertions.assertEquals(desc2, descriptionList.getDescriptionList().get(1)); } @@ -177,7 +175,7 @@ public void parseEofError() { OracleNetConnectionDescriptorParser parser = new OracleNetConnectionDescriptorParser(rac); try { KeyValue keyValue = parser.parse(); - Assert.fail(); + Assertions.fail(); } catch (OracleConnectionStringException e) { logger.info("Expected error", e); } @@ -195,7 +193,7 @@ public void parseSyntaxError() { OracleNetConnectionDescriptorParser parser = new OracleNetConnectionDescriptorParser(rac); try { KeyValue keyValue = parser.parse(); - Assert.fail(); + Assertions.fail(); } catch (OracleConnectionStringException e) { logger.info("Expected error", e); } @@ -211,7 +209,7 @@ public void parseSyntaxError2() { OracleNetConnectionDescriptorParser parser = new OracleNetConnectionDescriptorParser(rac); try { KeyValue keyValue = parser.parse(); - Assert.fail(); + Assertions.fail(); } catch (OracleConnectionStringException e) { logger.info("Expected error", e); } diff --git a/plugins/oracle-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/parser/OracleNetConnectionDescriptorTokenizerTest.java b/plugins/oracle-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/parser/OracleNetConnectionDescriptorTokenizerTest.java index fa9ec9e27895..d246d77fd65e 100644 --- a/plugins/oracle-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/parser/OracleNetConnectionDescriptorTokenizerTest.java +++ b/plugins/oracle-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/oracle/parser/OracleNetConnectionDescriptorTokenizerTest.java @@ -16,12 +16,8 @@ package com.navercorp.pinpoint.plugin.jdbc.oracle.parser; - -import org.junit.Assert; -import org.junit.Test; - -import com.navercorp.pinpoint.plugin.jdbc.oracle.parser.OracleNetConnectionDescriptorTokenizer; -import com.navercorp.pinpoint.plugin.jdbc.oracle.parser.Token; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -47,15 +43,13 @@ public void trimLeft() { } - private void assertTrimLeft(String token, String result) { OracleNetConnectionDescriptorTokenizer tokenizer = new OracleNetConnectionDescriptorTokenizer(token); int leftTrimIndex = tokenizer.trimLeft(); - Assert.assertEquals(wrap(result), wrap(token.substring(leftTrimIndex))); + Assertions.assertEquals(wrap(result), wrap(token.substring(leftTrimIndex))); } - @Test public void trimRight() { assertTrimRight("123", "123"); @@ -72,7 +66,7 @@ public void trimRight() { private void assertTrimRight(String token, String result) { OracleNetConnectionDescriptorTokenizer tokenizer = new OracleNetConnectionDescriptorTokenizer(token); int rightTrimIndex = tokenizer.trimRight(token.length()); - Assert.assertEquals(wrap(result), wrap(token.substring(0, rightTrimIndex))); + Assertions.assertEquals(wrap(result), wrap(token.substring(0, rightTrimIndex))); } @Test @@ -105,7 +99,7 @@ private void assertCompareToken(String token, String... parsedTokens) { tokenizer.parse(); int index = 0; - while(true) { + while (true) { Token t = tokenizer.nextToken(); // EOF makes test broken. if (t == OracleNetConnectionDescriptorTokenizer.TOKEN_EOF_OBJECT) { @@ -115,14 +109,14 @@ private void assertCompareToken(String token, String... parsedTokens) { if (t == null) { break; } - Assert.assertEquals(t.getToken(), parsedTokens[index++]); + Assertions.assertEquals(t.getToken(), parsedTokens[index++]); } } private void AssertParseLiteral(String token, String result) { OracleNetConnectionDescriptorTokenizer tokenizer = new OracleNetConnectionDescriptorTokenizer(token); String literal = tokenizer.parseLiteral(); - Assert.assertEquals(wrap(result), wrap(literal)); + Assertions.assertEquals(wrap(result), wrap(literal)); } private String wrap(String str) { diff --git a/plugins/postgresql-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/postgresql/PostgreSqlJdbcUrlParserTest.java b/plugins/postgresql-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/postgresql/PostgreSqlJdbcUrlParserTest.java index b6e8c110f941..eb51c3dc6177 100644 --- a/plugins/postgresql-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/postgresql/PostgreSqlJdbcUrlParserTest.java +++ b/plugins/postgresql-jdbc/src/test/java/com/navercorp/pinpoint/plugin/jdbc/postgresql/PostgreSqlJdbcUrlParserTest.java @@ -18,10 +18,10 @@ import com.navercorp.pinpoint.bootstrap.context.DatabaseInfo; import com.navercorp.pinpoint.common.trace.ServiceType; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * https://jdbc.postgresql.org/documentation/head/connect.html @@ -35,24 +35,24 @@ public class PostgreSqlJdbcUrlParserTest { @Test public void postgresqlParse1() { DatabaseInfo dbInfo = jdbcUrlParser.parse("jdbc:postgresql://host1:5432/database_name?user=fred"); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), PostgreSqlConstants.POSTGRESQL); - Assert.assertEquals(dbInfo.getHost().get(0), ("host1:5432")); - Assert.assertEquals(dbInfo.getDatabaseId(), "database_name"); - Assert.assertEquals(dbInfo.getUrl(), "jdbc:postgresql://host1:5432/database_name"); + Assertions.assertEquals(dbInfo.getType(), PostgreSqlConstants.POSTGRESQL); + Assertions.assertEquals(dbInfo.getHost().get(0), ("host1:5432")); + Assertions.assertEquals(dbInfo.getDatabaseId(), "database_name"); + Assertions.assertEquals(dbInfo.getUrl(), "jdbc:postgresql://host1:5432/database_name"); } @Test public void postgresqlParse2() { DatabaseInfo dbInfo = jdbcUrlParser.parse("jdbc:postgresql://host1:5432/databaseName"); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), PostgreSqlConstants.POSTGRESQL); - Assert.assertEquals(dbInfo.getHost().get(0), "host1:5432"); + Assertions.assertEquals(dbInfo.getType(), PostgreSqlConstants.POSTGRESQL); + Assertions.assertEquals(dbInfo.getHost().get(0), "host1:5432"); - Assert.assertEquals(dbInfo.getDatabaseId(), "databaseName"); - Assert.assertEquals(dbInfo.getUrl(), "jdbc:postgresql://host1:5432/databaseName"); + Assertions.assertEquals(dbInfo.getDatabaseId(), "databaseName"); + Assertions.assertEquals(dbInfo.getUrl(), "jdbc:postgresql://host1:5432/databaseName"); logger.info(dbInfo.toString()); logger.info(dbInfo.getMultipleHost()); } @@ -60,24 +60,24 @@ public void postgresqlParse2() { @Test public void postgresqlParse3() { DatabaseInfo dbInfo = jdbcUrlParser.parse("jdbc:postgresql://host1/databaseName?user=fred"); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), PostgreSqlConstants.POSTGRESQL); - Assert.assertEquals(dbInfo.getHost().get(0), "host1"); - Assert.assertEquals(dbInfo.getDatabaseId(), "databaseName"); - Assert.assertEquals(dbInfo.getUrl(), "jdbc:postgresql://host1/databaseName"); + Assertions.assertEquals(dbInfo.getType(), PostgreSqlConstants.POSTGRESQL); + Assertions.assertEquals(dbInfo.getHost().get(0), "host1"); + Assertions.assertEquals(dbInfo.getDatabaseId(), "databaseName"); + Assertions.assertEquals(dbInfo.getUrl(), "jdbc:postgresql://host1/databaseName"); logger.info(dbInfo.toString()); } @Test public void postgresqlParseFailover1() { DatabaseInfo dbInfo = jdbcUrlParser.parse("jdbc:postgresql://host1:5432/databaseName?user=fred"); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), PostgreSqlConstants.POSTGRESQL); - Assert.assertEquals(dbInfo.getHost().get(0), "host1:5432"); - Assert.assertEquals(dbInfo.getDatabaseId(), "databaseName"); - Assert.assertEquals(dbInfo.getUrl(), "jdbc:postgresql://host1:5432/databaseName"); + Assertions.assertEquals(dbInfo.getType(), PostgreSqlConstants.POSTGRESQL); + Assertions.assertEquals(dbInfo.getHost().get(0), "host1:5432"); + Assertions.assertEquals(dbInfo.getDatabaseId(), "databaseName"); + Assertions.assertEquals(dbInfo.getUrl(), "jdbc:postgresql://host1:5432/databaseName"); logger.info(dbInfo.toString()); } @@ -85,13 +85,13 @@ public void postgresqlParseFailover1() { @Test public void postgresqlParseFailover2() { DatabaseInfo dbInfo = jdbcUrlParser.parse("jdbc:postgresql://host1:5432,host2:5432/databaseName?user=fred"); - Assert.assertTrue(dbInfo.isParsingComplete()); + Assertions.assertTrue(dbInfo.isParsingComplete()); - Assert.assertEquals(dbInfo.getType(), PostgreSqlConstants.POSTGRESQL); - Assert.assertEquals(dbInfo.getHost().get(0), "host1:5432"); - Assert.assertEquals(dbInfo.getHost().get(1), "host2:5432"); - Assert.assertEquals(dbInfo.getDatabaseId(), "databaseName"); - Assert.assertEquals(dbInfo.getUrl(), "jdbc:postgresql://host1:5432,host2:5432/databaseName"); + Assertions.assertEquals(dbInfo.getType(), PostgreSqlConstants.POSTGRESQL); + Assertions.assertEquals(dbInfo.getHost().get(0), "host1:5432"); + Assertions.assertEquals(dbInfo.getHost().get(1), "host2:5432"); + Assertions.assertEquals(dbInfo.getDatabaseId(), "databaseName"); + Assertions.assertEquals(dbInfo.getUrl(), "jdbc:postgresql://host1:5432,host2:5432/databaseName"); logger.info(dbInfo.toString()); } @@ -99,17 +99,17 @@ public void postgresqlParseFailover2() { @Test public void parseFailTest1() { DatabaseInfo dbInfo = jdbcUrlParser.parse(null); - Assert.assertFalse(dbInfo.isParsingComplete()); + Assertions.assertFalse(dbInfo.isParsingComplete()); - Assert.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); + Assertions.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); } @Test public void parseFailTest2() { DatabaseInfo dbInfo = jdbcUrlParser.parse("jdbc:mysql://host1:5432/databaseName?user=fred"); - Assert.assertFalse(dbInfo.isParsingComplete()); + Assertions.assertFalse(dbInfo.isParsingComplete()); - Assert.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); + Assertions.assertEquals(ServiceType.UNKNOWN_DB, dbInfo.getType()); } } diff --git a/plugins/process/src/test/java/com/navercorp/pinpoint/plugin/process/interceptor/PidProviderFactoryTest.java b/plugins/process/src/test/java/com/navercorp/pinpoint/plugin/process/interceptor/PidProviderFactoryTest.java index 2d45d0e5cf5c..b19c212cffa8 100644 --- a/plugins/process/src/test/java/com/navercorp/pinpoint/plugin/process/interceptor/PidProviderFactoryTest.java +++ b/plugins/process/src/test/java/com/navercorp/pinpoint/plugin/process/interceptor/PidProviderFactoryTest.java @@ -18,14 +18,11 @@ import com.navercorp.pinpoint.common.util.OsType; import com.navercorp.pinpoint.common.util.OsUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; -import static org.mockito.Mockito.mock; - - /** * @author Woonduk Kang(emeroad) */ @@ -42,7 +39,7 @@ public void newProvider() throws IOException { ProcessBuilder pb = new ProcessBuilder("echo"); Process start = pb.start(); - Assert.assertNotEquals(pidProvider.getPid(start), null); + Assertions.assertNotEquals(pidProvider.getPid(start), null); } diff --git a/plugins/process/src/test/java/com/navercorp/pinpoint/plugin/process/interceptor/UNIXProcessPidProviderTest.java b/plugins/process/src/test/java/com/navercorp/pinpoint/plugin/process/interceptor/UNIXProcessPidProviderTest.java index a5e3e4146786..a28327028da6 100644 --- a/plugins/process/src/test/java/com/navercorp/pinpoint/plugin/process/interceptor/UNIXProcessPidProviderTest.java +++ b/plugins/process/src/test/java/com/navercorp/pinpoint/plugin/process/interceptor/UNIXProcessPidProviderTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.plugin.process.interceptor; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.lang.reflect.Field; @@ -31,7 +31,7 @@ public void getPid_private_hack() throws NoSuchFieldException, IllegalAccessExce MockProcess mockProcess = new MockProcess(); Field pidField = UNIXProcessPidProvider.getPidField(MockProcess.class); long pid = pidField.getLong(mockProcess); - Assert.assertEquals(pid, MockProcess.DEFAULT_PID); + Assertions.assertEquals(pid, MockProcess.DEFAULT_PID); } diff --git a/plugins/process/src/test/java/com/navercorp/pinpoint/plugin/process/interceptor/UnsupportPidProviderTest.java b/plugins/process/src/test/java/com/navercorp/pinpoint/plugin/process/interceptor/UnsupportPidProviderTest.java index 0598ad865099..c1e12defd590 100644 --- a/plugins/process/src/test/java/com/navercorp/pinpoint/plugin/process/interceptor/UnsupportPidProviderTest.java +++ b/plugins/process/src/test/java/com/navercorp/pinpoint/plugin/process/interceptor/UnsupportPidProviderTest.java @@ -16,9 +16,7 @@ package com.navercorp.pinpoint.plugin.process.interceptor; -import org.junit.Test; - -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) diff --git a/plugins/redis/src/test/java/com/navercorp/pinpoint/plugin/redis/jedis/JedisPluginConfigTest.java b/plugins/redis/src/test/java/com/navercorp/pinpoint/plugin/redis/jedis/JedisPluginConfigTest.java index 57b915b283f8..ae2a87cf4272 100644 --- a/plugins/redis/src/test/java/com/navercorp/pinpoint/plugin/redis/jedis/JedisPluginConfigTest.java +++ b/plugins/redis/src/test/java/com/navercorp/pinpoint/plugin/redis/jedis/JedisPluginConfigTest.java @@ -22,7 +22,8 @@ import java.util.Properties; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; public class JedisPluginConfigTest { diff --git a/plugins/resttemplate/src/test/java/com/navercorp/pinpoint/plugin/resttemplate/RestTemplateConfigTest.java b/plugins/resttemplate/src/test/java/com/navercorp/pinpoint/plugin/resttemplate/RestTemplateConfigTest.java index b71fe5c7378a..c49accecf7d8 100644 --- a/plugins/resttemplate/src/test/java/com/navercorp/pinpoint/plugin/resttemplate/RestTemplateConfigTest.java +++ b/plugins/resttemplate/src/test/java/com/navercorp/pinpoint/plugin/resttemplate/RestTemplateConfigTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfigLoader; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -32,14 +32,14 @@ public class RestTemplateConfigTest { public void configTest1() { RestTemplateConfig config = createRestTemplateConfig("true"); - Assert.assertTrue(config.isPluginEnable()); + Assertions.assertTrue(config.isPluginEnable()); } @Test public void configTest2() { RestTemplateConfig config = createRestTemplateConfig("false"); - Assert.assertFalse(config.isPluginEnable()); + Assertions.assertFalse(config.isPluginEnable()); } private RestTemplateConfig createRestTemplateConfig(String pluginEnable) { diff --git a/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansConfigTest.java b/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansConfigTest.java index 50288fd443ed..3b3988f41730 100644 --- a/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansConfigTest.java +++ b/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansConfigTest.java @@ -16,11 +16,11 @@ import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfigLoader; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Properties; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author jaehong.kim diff --git a/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansTargetTest.java b/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansTargetTest.java index 8d76e685a8d9..ed15ffb5879c 100644 --- a/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansTargetTest.java +++ b/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/SpringBeansTargetTest.java @@ -15,12 +15,12 @@ package com.navercorp.pinpoint.plugin.spring.beans; import com.navercorp.pinpoint.bootstrap.util.PathMatcher; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author jaehong.kim diff --git a/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/BeanMethodInterceptorTest.java b/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/BeanMethodInterceptorTest.java index ab1684ecf7f8..9bc2de82e832 100644 --- a/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/BeanMethodInterceptorTest.java +++ b/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/BeanMethodInterceptorTest.java @@ -20,7 +20,7 @@ import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.context.TraceId; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import static org.mockito.Mockito.mock; diff --git a/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/TargetBeanFilterTest.java b/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/TargetBeanFilterTest.java index 0c5a9e185a9b..0225cfd9b13a 100644 --- a/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/TargetBeanFilterTest.java +++ b/plugins/spring/src/test/java/com/navercorp/pinpoint/plugin/spring/beans/interceptor/TargetBeanFilterTest.java @@ -14,21 +14,22 @@ */ package com.navercorp.pinpoint.plugin.spring.beans.interceptor; -import static org.junit.Assert.*; - -import java.util.Properties; - -import com.navercorp.pinpoint.bootstrap.config.ProfilerConfigLoader; -import com.navercorp.pinpoint.plugin.spring.beans.SpringBeansTargetScope; -import org.junit.Test; - import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; +import com.navercorp.pinpoint.bootstrap.config.ProfilerConfigLoader; import com.navercorp.pinpoint.plugin.spring.beans.SpringBeansConfig; -import org.apache.logging.log4j.Logger; +import com.navercorp.pinpoint.plugin.spring.beans.SpringBeansTargetScope; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.RootBeanDefinition; +import java.util.Properties; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * @author Jongho Moon * @author jaehong.kim diff --git a/plugins/tomcat/src/test/java/com/navercorp/pinpoint/plugin/tomcat/DependencyVerifierTest.java b/plugins/tomcat/src/test/java/com/navercorp/pinpoint/plugin/tomcat/DependencyVerifierTest.java index 633c076a9783..7e1e4afe767b 100644 --- a/plugins/tomcat/src/test/java/com/navercorp/pinpoint/plugin/tomcat/DependencyVerifierTest.java +++ b/plugins/tomcat/src/test/java/com/navercorp/pinpoint/plugin/tomcat/DependencyVerifierTest.java @@ -19,8 +19,7 @@ import com.navercorp.pinpoint.plugin.jboss.JbossConfig; import com.navercorp.pinpoint.plugin.jboss.JbossConstants; import com.navercorp.pinpoint.plugin.jboss.JbossDetector; - -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Taejin Koo diff --git a/plugins/tomcat/src/test/java/com/navercorp/pinpoint/plugin/tomcat/aspect/RequestFacadeAspectTest.java b/plugins/tomcat/src/test/java/com/navercorp/pinpoint/plugin/tomcat/aspect/RequestFacadeAspectTest.java index 40d66279e691..1bbe166971b8 100644 --- a/plugins/tomcat/src/test/java/com/navercorp/pinpoint/plugin/tomcat/aspect/RequestFacadeAspectTest.java +++ b/plugins/tomcat/src/test/java/com/navercorp/pinpoint/plugin/tomcat/aspect/RequestFacadeAspectTest.java @@ -16,17 +16,15 @@ package com.navercorp.pinpoint.plugin.tomcat.aspect; +import com.navercorp.pinpoint.bootstrap.context.Header; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + import java.util.ArrayList; import java.util.Collections; import java.util.Enumeration; import java.util.Hashtable; -import org.junit.Assert; -import org.junit.Test; - -import com.navercorp.pinpoint.bootstrap.context.Header; -import com.navercorp.pinpoint.plugin.tomcat.aspect.RequestFacadeAspect; - /** * @author jaehong.kim */ @@ -48,7 +46,7 @@ public void getHeaderNames() { Enumeration isNull = mock.getHeaderNames(); ArrayList list = Collections.list(isNull); - Assert.assertEquals(list.size(), 2); + Assertions.assertEquals(list.size(), 2); } } \ No newline at end of file diff --git a/plugins/user/src/test/java/com/navercorp/pinpoint/plugin/user/UserPluginTest.java b/plugins/user/src/test/java/com/navercorp/pinpoint/plugin/user/UserPluginTest.java index f594eb527473..9f4cfd616b8c 100644 --- a/plugins/user/src/test/java/com/navercorp/pinpoint/plugin/user/UserPluginTest.java +++ b/plugins/user/src/test/java/com/navercorp/pinpoint/plugin/user/UserPluginTest.java @@ -1,8 +1,8 @@ package com.navercorp.pinpoint.plugin.user; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; public class UserPluginTest { diff --git a/plugins/vertx/src/test/java/com/navercorp/pinpoint/plugin/vertx/VertxConfigTest.java b/plugins/vertx/src/test/java/com/navercorp/pinpoint/plugin/vertx/VertxConfigTest.java index 4a275d9a56d2..c15b7f3e60d4 100644 --- a/plugins/vertx/src/test/java/com/navercorp/pinpoint/plugin/vertx/VertxConfigTest.java +++ b/plugins/vertx/src/test/java/com/navercorp/pinpoint/plugin/vertx/VertxConfigTest.java @@ -17,11 +17,11 @@ import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfigLoader; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Properties; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author jaehong.kim diff --git a/plugins/vertx/src/test/java/com/navercorp/pinpoint/plugin/vertx/VertxDetectorTest.java b/plugins/vertx/src/test/java/com/navercorp/pinpoint/plugin/vertx/VertxDetectorTest.java index 8f9d94fa663f..e7c4fa0d3734 100644 --- a/plugins/vertx/src/test/java/com/navercorp/pinpoint/plugin/vertx/VertxDetectorTest.java +++ b/plugins/vertx/src/test/java/com/navercorp/pinpoint/plugin/vertx/VertxDetectorTest.java @@ -15,9 +15,9 @@ */ package com.navercorp.pinpoint.plugin.vertx; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertFalse; /** * @author jaehong.kim diff --git a/plugins/vertx/src/test/java/com/navercorp/pinpoint/plugin/vertx/VertxHttpClientConfigTest.java b/plugins/vertx/src/test/java/com/navercorp/pinpoint/plugin/vertx/VertxHttpClientConfigTest.java index 6a24a05dbb1f..228804bc4ae0 100644 --- a/plugins/vertx/src/test/java/com/navercorp/pinpoint/plugin/vertx/VertxHttpClientConfigTest.java +++ b/plugins/vertx/src/test/java/com/navercorp/pinpoint/plugin/vertx/VertxHttpClientConfigTest.java @@ -15,14 +15,13 @@ */ package com.navercorp.pinpoint.plugin.vertx; -import com.navercorp.pinpoint.bootstrap.config.DumpType; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfigLoader; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Properties; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author jaehong.kim diff --git a/plugins/vertx/src/test/java/com/navercorp/pinpoint/plugin/vertx/VertxHttpServerConfigTest.java b/plugins/vertx/src/test/java/com/navercorp/pinpoint/plugin/vertx/VertxHttpServerConfigTest.java index 23b120710276..f02608e75a48 100644 --- a/plugins/vertx/src/test/java/com/navercorp/pinpoint/plugin/vertx/VertxHttpServerConfigTest.java +++ b/plugins/vertx/src/test/java/com/navercorp/pinpoint/plugin/vertx/VertxHttpServerConfigTest.java @@ -17,11 +17,11 @@ import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfigLoader; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Properties; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author jaehong.kim diff --git a/plugins/weblogic/src/test/java/com/navercorp/pinpoint/plugin/weblogic/ServletRequestImplParameterExtractorTest.java b/plugins/weblogic/src/test/java/com/navercorp/pinpoint/plugin/weblogic/ServletRequestImplParameterExtractorTest.java index 2c07f91c99c7..a38fb0012803 100644 --- a/plugins/weblogic/src/test/java/com/navercorp/pinpoint/plugin/weblogic/ServletRequestImplParameterExtractorTest.java +++ b/plugins/weblogic/src/test/java/com/navercorp/pinpoint/plugin/weblogic/ServletRequestImplParameterExtractorTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.plugin.weblogic; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import weblogic.servlet.internal.ServletRequestImpl; import static org.mockito.Mockito.mock; @@ -34,6 +34,6 @@ public void extractParameter() { when(servletRequest.getQueryString()).thenReturn(queryString); ServletRequestImplParameterExtractor extractor = new ServletRequestImplParameterExtractor(100, 100); String normalizedString = extractor.extractParameter(servletRequest); - Assert.assertEquals(queryString, normalizedString); + Assertions.assertEquals(queryString, normalizedString); } } \ No newline at end of file diff --git a/pom.xml b/pom.xml index c2447f1d3a04..a04aa25fc8ec 100644 --- a/pom.xml +++ b/pom.xml @@ -241,6 +241,16 @@ mockito-core test + + org.junit.jupiter + junit-jupiter-engine + test + + + org.mockito + mockito-junit-jupiter + test + @@ -1002,12 +1012,24 @@ 2.2 test + + org.junit.jupiter + junit-jupiter-engine + 5.7.2 + test + org.mockito mockito-core 2.28.2 test + + org.mockito + mockito-junit-jupiter + 2.28.2 + test + org.dbunit dbunit diff --git a/profiler-logging/src/test/java/com/navercorp/pinpoint/profiler/logging/Log4j2LoggingSystemTest.java b/profiler-logging/src/test/java/com/navercorp/pinpoint/profiler/logging/Log4j2LoggingSystemTest.java index fea3c35820ab..157c4efeb650 100644 --- a/profiler-logging/src/test/java/com/navercorp/pinpoint/profiler/logging/Log4j2LoggingSystemTest.java +++ b/profiler-logging/src/test/java/com/navercorp/pinpoint/profiler/logging/Log4j2LoggingSystemTest.java @@ -1,8 +1,8 @@ package com.navercorp.pinpoint.profiler.logging; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; import java.net.URISyntaxException; import java.net.URL; @@ -20,7 +20,7 @@ public void start() throws URISyntaxException { Logger test = LogManager.getLogger("test"); test.debug("test"); - + loggingSystem.stop(); } diff --git a/profiler-logging/src/test/java/com/navercorp/pinpoint/profiler/logging/Log4j2PLoggerAdapterTest.java b/profiler-logging/src/test/java/com/navercorp/pinpoint/profiler/logging/Log4j2PLoggerAdapterTest.java index 1146de32d29b..f33be762e9e3 100644 --- a/profiler-logging/src/test/java/com/navercorp/pinpoint/profiler/logging/Log4j2PLoggerAdapterTest.java +++ b/profiler-logging/src/test/java/com/navercorp/pinpoint/profiler/logging/Log4j2PLoggerAdapterTest.java @@ -16,11 +16,11 @@ package com.navercorp.pinpoint.profiler.logging; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/profiler-logging/src/test/java/com/navercorp/pinpoint/profiler/logging/jul/JulAdaptorHandlerTest.java b/profiler-logging/src/test/java/com/navercorp/pinpoint/profiler/logging/jul/JulAdaptorHandlerTest.java index bd45e1d999d2..8a6f0cc240d1 100644 --- a/profiler-logging/src/test/java/com/navercorp/pinpoint/profiler/logging/jul/JulAdaptorHandlerTest.java +++ b/profiler-logging/src/test/java/com/navercorp/pinpoint/profiler/logging/jul/JulAdaptorHandlerTest.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.profiler.logging.jul; import org.apache.logging.log4j.core.LoggerContext; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.logging.Level; import java.util.logging.LogRecord; diff --git a/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/pinpoint/profiler/instrument/lambda/LambdaFactoryClassAdaptorTest.java b/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/pinpoint/profiler/instrument/lambda/LambdaFactoryClassAdaptorTest.java index 1a74e358641c..4ed86371cc1b 100644 --- a/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/pinpoint/profiler/instrument/lambda/LambdaFactoryClassAdaptorTest.java +++ b/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/pinpoint/profiler/instrument/lambda/LambdaFactoryClassAdaptorTest.java @@ -17,9 +17,9 @@ package com.navercorp.pinpoint.profiler.instrument.lambda; import com.navercorp.pinpoint.common.util.IOUtils; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.InputStream; diff --git a/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/pinpoint/profiler/instrument/lambda/LambdaFactoryTest.java b/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/pinpoint/profiler/instrument/lambda/LambdaFactoryTest.java index 045974f50965..16a59a12945b 100644 --- a/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/pinpoint/profiler/instrument/lambda/LambdaFactoryTest.java +++ b/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/pinpoint/profiler/instrument/lambda/LambdaFactoryTest.java @@ -23,8 +23,10 @@ import com.navercorp.pinpoint.profiler.instrument.lambda.mock.DefineAnonymousClassDelegator; import com.navercorp.pinpoint.profiler.instrument.lambda.mock.UnsafeClassMock; import com.navercorp.pinpoint.profiler.util.JavaAssistUtils; -import org.junit.Assert; -import org.junit.Test; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.ClassWriter; @@ -32,8 +34,6 @@ import org.objectweb.asm.commons.Remapper; import org.objectweb.asm.commons.SimpleRemapper; import org.objectweb.asm.tree.ClassNode; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; import java.io.IOException; import java.io.InputStream; @@ -98,7 +98,7 @@ public void transformTest() throws IOException, NoSuchMethodException, IllegalAc Method test = o.getClass().getMethod("test"); Object invoke = test.invoke(o); - Assert.assertEquals(DefineAnonymousClassDelegator.count, 1); + Assertions.assertEquals(DefineAnonymousClassDelegator.count, 1); } diff --git a/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/test/pinpoint/jdk8/interfaces/MethodInterfaceTest.java b/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/test/pinpoint/jdk8/interfaces/MethodInterfaceTest.java index 21954492f51e..4beb77a7062b 100644 --- a/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/test/pinpoint/jdk8/interfaces/MethodInterfaceTest.java +++ b/profiler-optional/profiler-optional-jdk8/src/test/java/com/navercorp/test/pinpoint/jdk8/interfaces/MethodInterfaceTest.java @@ -28,10 +28,12 @@ import com.navercorp.pinpoint.profiler.interceptor.registry.DefaultInterceptorRegistryBinder; import com.navercorp.pinpoint.profiler.interceptor.registry.InterceptorRegistryBinder; import com.navercorp.pinpoint.profiler.util.JavaAssistUtils; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Type; @@ -39,8 +41,6 @@ import org.objectweb.asm.tree.MethodNode; import org.objectweb.asm.util.CheckClassAdapter; import org.objectweb.asm.util.TraceClassVisitor; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; import java.io.PrintWriter; import java.lang.reflect.Method; @@ -48,7 +48,7 @@ import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; /** @@ -60,12 +60,12 @@ public class MethodInterfaceTest { private final Logger logger = LogManager.getLogger(this.getClass()); - @BeforeClass + @BeforeAll public static void beforeClass() { interceptorRegistryBinder.bind(); } - @AfterClass + @AfterAll public static void afterClass() { interceptorRegistryBinder.unbind(); } @@ -109,7 +109,7 @@ public void handle(ClassNode classNode) { }); // static method - Assert.assertFalse(SimpleInterceptor.before); + Assertions.assertFalse(SimpleInterceptor.before); logger.debug("Interface static method"); Class clazz = classLoader.loadClass(targetInterfaceName); Method method = clazz.getDeclaredMethod("currentTimeMillis"); @@ -120,7 +120,7 @@ public void handle(ClassNode classNode) { SimpleInterceptor.before = false; // default method - Assert.assertFalse(SimpleInterceptor.before); + Assertions.assertFalse(SimpleInterceptor.before); logger.debug("Interface default method"); clazz = classLoader.loadClass(targetClassName); method = clazz.getDeclaredMethod("bar"); @@ -128,31 +128,33 @@ public void handle(ClassNode classNode) { assertTrue(SimpleInterceptor.before); } - @Test(expected = ClassFormatError.class) + @Test public void addField() throws Exception { - final String targetInterfaceName = "com.navercorp.test.pinpoint.jdk8.interfaces.MethodInterface"; - final String targetClassName = "com.navercorp.test.pinpoint.jdk8.interfaces.MethodInterfaceClass"; - final String accessorClassName = "com.navercorp.test.pinpoint.jdk8.interfaces.SimpleAccessor"; - TestClassLoader classLoader = new TestClassLoader(); - classLoader.addTargetClassName(targetClassName); - classLoader.addTargetClassName(targetInterfaceName); - classLoader.setTrace(false); - classLoader.setCallbackHandler(new CallbackHandler() { - @Override - public void handle(ClassNode classNode) { - logger.debug("Add field class={}", classNode.name); - ASMClassNodeAdapter classNodeAdapter = new ASMClassNodeAdapter(pluginContext, null, null, classNode); - classNodeAdapter.addField("_$PINPOINT$_" + JavaAssistUtils.javaClassNameToVariableName(accessorClassName), Type.getDescriptor(int.class)); - classNodeAdapter.addInterface(accessorClassName); - ASMFieldNodeAdapter fieldNodeAdapter = classNodeAdapter.getField("_$PINPOINT$_" + JavaAssistUtils.javaClassNameToVariableName(accessorClassName), null); - classNodeAdapter.addGetterMethod("_$PINPOINT$_getTraceInt", fieldNodeAdapter); - classNodeAdapter.addSetterMethod("_$PINPOINT$_setTraceInt", fieldNodeAdapter); - } + Assertions.assertThrows(ClassFormatError.class, () -> { + final String targetInterfaceName = "com.navercorp.test.pinpoint.jdk8.interfaces.MethodInterface"; + final String targetClassName = "com.navercorp.test.pinpoint.jdk8.interfaces.MethodInterfaceClass"; + final String accessorClassName = "com.navercorp.test.pinpoint.jdk8.interfaces.SimpleAccessor"; + TestClassLoader classLoader = new TestClassLoader(); + classLoader.addTargetClassName(targetClassName); + classLoader.addTargetClassName(targetInterfaceName); + classLoader.setTrace(false); + classLoader.setCallbackHandler(new CallbackHandler() { + @Override + public void handle(ClassNode classNode) { + logger.debug("Add field class={}", classNode.name); + ASMClassNodeAdapter classNodeAdapter = new ASMClassNodeAdapter(pluginContext, null, null, classNode); + classNodeAdapter.addField("_$PINPOINT$_" + JavaAssistUtils.javaClassNameToVariableName(accessorClassName), Type.getDescriptor(int.class)); + classNodeAdapter.addInterface(accessorClassName); + ASMFieldNodeAdapter fieldNodeAdapter = classNodeAdapter.getField("_$PINPOINT$_" + JavaAssistUtils.javaClassNameToVariableName(accessorClassName), null); + classNodeAdapter.addGetterMethod("_$PINPOINT$_getTraceInt", fieldNodeAdapter); + classNodeAdapter.addSetterMethod("_$PINPOINT$_setTraceInt", fieldNodeAdapter); + } + }); + logger.debug("Interface static method"); + Class clazz = classLoader.loadClass(targetInterfaceName); + Method method = clazz.getDeclaredMethod("currentTimeMillis"); + method.invoke(null); }); - logger.debug("Interface static method"); - Class clazz = classLoader.loadClass(targetInterfaceName); - Method method = clazz.getDeclaredMethod("currentTimeMillis"); - method.invoke(null); } @Test diff --git a/profiler-optional/profiler-optional-jdk9/src/test/java/com/navercorp/pinpoint/profiler/instrument/classloading/Java9DefineClassTest.java b/profiler-optional/profiler-optional-jdk9/src/test/java/com/navercorp/pinpoint/profiler/instrument/classloading/Java9DefineClassTest.java index b7b76023b06e..292ff022982d 100644 --- a/profiler-optional/profiler-optional-jdk9/src/test/java/com/navercorp/pinpoint/profiler/instrument/classloading/Java9DefineClassTest.java +++ b/profiler-optional/profiler-optional-jdk9/src/test/java/com/navercorp/pinpoint/profiler/instrument/classloading/Java9DefineClassTest.java @@ -19,13 +19,12 @@ import com.navercorp.pinpoint.common.util.CodeSourceUtils; import com.navercorp.pinpoint.common.util.JvmUtils; import com.navercorp.pinpoint.common.util.JvmVersion; -import com.navercorp.pinpoint.common.util.OsUtils; import com.navercorp.pinpoint.profiler.util.JavaAssistUtils; import org.apache.commons.io.IOUtils; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.InputStream; @@ -48,13 +47,13 @@ public void defineClass() throws ClassNotFoundException, IOException { URLClassLoader classLoader = new URLClassLoader(empty, null); try { classLoader.loadClass(Logger.class.getName()); - Assert.fail(); + Assertions.fail(); } catch (ClassNotFoundException ignored) { } String className = JavaAssistUtils.javaClassNameToJvmResourceName(Logger.class.getName()); InputStream classStream = Logger.class.getClassLoader().getResourceAsStream(className); - Assert.assertNotNull("className not found", className); + Assertions.assertNotNull("className not found", className); byte[] bytes = IOUtils.toByteArray(classStream); @@ -62,10 +61,10 @@ public void defineClass() throws ClassNotFoundException, IOException { Class defineClassSlf4jLogger = defineClass.defineClass(classLoader, Logger.class.getName(), bytes); Class slf4jLogger = classLoader.loadClass(Logger.class.getName()); - Assert.assertSame(defineClassSlf4jLogger, slf4jLogger); - Assert.assertSame(slf4jLogger.getClassLoader(), classLoader); + Assertions.assertSame(defineClassSlf4jLogger, slf4jLogger); + Assertions.assertSame(slf4jLogger.getClassLoader(), classLoader); - Assert.assertNotSame(slf4jLogger.getClassLoader(), Logger.class.getClassLoader()); + Assertions.assertNotSame(slf4jLogger.getClassLoader(), Logger.class.getClassLoader()); } diff --git a/profiler-optional/profiler-optional-jdk9/src/test/java/com/navercorp/pinpoint/profiler/instrument/classloading/JavaLangAccessHelperTest.java b/profiler-optional/profiler-optional-jdk9/src/test/java/com/navercorp/pinpoint/profiler/instrument/classloading/JavaLangAccessHelperTest.java index d87adbefa79f..eabf2a4749e3 100644 --- a/profiler-optional/profiler-optional-jdk9/src/test/java/com/navercorp/pinpoint/profiler/instrument/classloading/JavaLangAccessHelperTest.java +++ b/profiler-optional/profiler-optional-jdk9/src/test/java/com/navercorp/pinpoint/profiler/instrument/classloading/JavaLangAccessHelperTest.java @@ -16,11 +16,9 @@ package com.navercorp.pinpoint.profiler.instrument.classloading; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import java.lang.invoke.MethodHandle; - -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author jaehong.kim diff --git a/profiler-optional/profiler-optional-jdk9/src/test/java/com/navercorp/pinpoint/profiler/shutdown/Java9ShutdownHookRegisterTest.java b/profiler-optional/profiler-optional-jdk9/src/test/java/com/navercorp/pinpoint/profiler/shutdown/Java9ShutdownHookRegisterTest.java index 774f3ae36db1..361c975a6b0d 100644 --- a/profiler-optional/profiler-optional-jdk9/src/test/java/com/navercorp/pinpoint/profiler/shutdown/Java9ShutdownHookRegisterTest.java +++ b/profiler-optional/profiler-optional-jdk9/src/test/java/com/navercorp/pinpoint/profiler/shutdown/Java9ShutdownHookRegisterTest.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.profiler.shutdown; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author jaehong.kim diff --git a/profiler-test/src/test/java/com/navercorp/pinpoint/test/MethodDescriptionUtilsTest.java b/profiler-test/src/test/java/com/navercorp/pinpoint/test/MethodDescriptionUtilsTest.java index 6aa925547a4f..d4c85d07f219 100644 --- a/profiler-test/src/test/java/com/navercorp/pinpoint/test/MethodDescriptionUtilsTest.java +++ b/profiler-test/src/test/java/com/navercorp/pinpoint/test/MethodDescriptionUtilsTest.java @@ -17,15 +17,13 @@ package com.navercorp.pinpoint.test; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; import java.lang.reflect.Constructor; - -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Woonduk Kang(emeroad) @@ -70,13 +68,13 @@ public void testGetConstructorSimpleName() throws Exception { Constructor constructor = stringClass.getConstructor(); logger.debug("{}", constructor.getName()); - Assert.assertEquals(MethodDescriptionUtils.getConstructorSimpleName(constructor), "String"); + assertEquals(MethodDescriptionUtils.getConstructorSimpleName(constructor), "String"); } @Test public void testGetConstructorSimpleName_no_package() { - Assert.assertEquals(MethodDescriptionUtils.getConstructorSimpleName("String"), "String"); + assertEquals(MethodDescriptionUtils.getConstructorSimpleName("String"), "String"); } } \ No newline at end of file diff --git a/profiler-test/src/test/java/com/navercorp/pinpoint/test/MockApplicationContextModuleTest.java b/profiler-test/src/test/java/com/navercorp/pinpoint/test/MockApplicationContextModuleTest.java index 55e01f5f3731..68449f883c4c 100644 --- a/profiler-test/src/test/java/com/navercorp/pinpoint/test/MockApplicationContextModuleTest.java +++ b/profiler-test/src/test/java/com/navercorp/pinpoint/test/MockApplicationContextModuleTest.java @@ -27,8 +27,8 @@ import com.navercorp.pinpoint.profiler.context.module.DefaultApplicationContext; import com.navercorp.pinpoint.profiler.context.module.ModuleFactory; import com.navercorp.pinpoint.profiler.interceptor.registry.InterceptorRegistryBinder; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.lang.instrument.ClassFileTransformer; @@ -85,7 +85,7 @@ public void testMockApplicationContext() { // singleton check AgentInfoSender instance1 = injector.getInstance(AgentInfoSender.class); AgentInfoSender instance2 = injector.getInstance(AgentInfoSender.class); - Assert.assertSame(instance1, instance2); + Assertions.assertSame(instance1, instance2); ClassFileTransformer instance4 = injector.getInstance(ClassFileTransformer.class); @@ -93,5 +93,4 @@ public void testMockApplicationContext() { } - } \ No newline at end of file diff --git a/profiler-test/src/test/java/com/navercorp/pinpoint/test/OrderedSpanRecorderTest.java b/profiler-test/src/test/java/com/navercorp/pinpoint/test/OrderedSpanRecorderTest.java index f5655ebbdbaa..9efafc0e16b1 100644 --- a/profiler-test/src/test/java/com/navercorp/pinpoint/test/OrderedSpanRecorderTest.java +++ b/profiler-test/src/test/java/com/navercorp/pinpoint/test/OrderedSpanRecorderTest.java @@ -16,16 +16,7 @@ package com.navercorp.pinpoint.test; -import static org.junit.Assert.*; - -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; - import com.navercorp.pinpoint.bootstrap.context.TraceId; -import java.util.Objects; import com.navercorp.pinpoint.profiler.context.DefaultAsyncSpanChunk; import com.navercorp.pinpoint.profiler.context.DefaultLocalAsyncId; import com.navercorp.pinpoint.profiler.context.DefaultSpanChunk; @@ -34,14 +25,23 @@ import com.navercorp.pinpoint.profiler.context.SpanChunk; import com.navercorp.pinpoint.profiler.context.SpanEvent; import com.navercorp.pinpoint.profiler.context.SpanType; -import com.navercorp.pinpoint.profiler.context.id.DefaultTraceRoot; import com.navercorp.pinpoint.profiler.context.id.DefaultTraceId; +import com.navercorp.pinpoint.profiler.context.id.DefaultTraceRoot; import com.navercorp.pinpoint.profiler.context.id.TraceRoot; -import org.junit.After; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.Objects; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; /** * @author HyunGil Jeong @@ -57,7 +57,7 @@ public class OrderedSpanRecorderTest { private final String agentId = "agentId"; - @After + @AfterEach public void tearDown() { this.recorder.clear(); } @@ -68,7 +68,7 @@ public void testOrderingWithSameEventTime() { final long startTime = 100; final long spanId = 1L; - TraceId traceId = new DefaultTraceId(agentId, startTime, 0,-1L, spanId, (short)0); + TraceId traceId = new DefaultTraceId(agentId, startTime, 0, -1L, spanId, (short) 0); final TraceRoot traceRoot = new DefaultTraceRoot(traceId, agentId, startTime, 0); Span span = createSpan(traceRoot, startTime); @@ -112,13 +112,13 @@ public void testMultipleAsyncSpanEvents() { // given final long startTime1 = 100; final long spanId = 1L; - TraceId traceId1 = new DefaultTraceId(agentId, startTime1, 0,-1L, spanId, (short)0); + TraceId traceId1 = new DefaultTraceId(agentId, startTime1, 0, -1L, spanId, (short) 0); final TraceRoot traceRoot1 = new DefaultTraceRoot(traceId1, agentId, startTime1, 0); final long startTime2 = startTime1 + 10L; final long spanId2 = 2L; - final TraceId traceId2 = new DefaultTraceId(agentId, startTime2, 0,-1L, spanId2, (short)0); + final TraceId traceId2 = new DefaultTraceId(agentId, startTime2, 0, -1L, spanId2, (short) 0); final TraceRoot traceRoot2 = new DefaultTraceRoot(traceId2, agentId, startTime2, 0); @@ -165,17 +165,17 @@ public void testMultipleSpanOrdering() { // given final long startTime1 = 100; final long spanId1 = 1L; - final TraceId traceId1 = new DefaultTraceId(agentId, startTime1, 0,-1L, spanId1, (short)0); + final TraceId traceId1 = new DefaultTraceId(agentId, startTime1, 0, -1L, spanId1, (short) 0); final TraceRoot traceRoot1 = new DefaultTraceRoot(traceId1, agentId, startTime1, 0); final long startTime2 = startTime1 + 10L; final long spanId2 = 2L; - final TraceId traceId2 = new DefaultTraceId(agentId, startTime2, 0,-1L, spanId2, (short)0); + final TraceId traceId2 = new DefaultTraceId(agentId, startTime2, 0, -1L, spanId2, (short) 0); final TraceRoot traceRoot2 = new DefaultTraceRoot(traceId2, agentId, startTime2, 0); Span span1 = createSpan(traceRoot1, startTime1); SpanChunk event1_0 = wrapSpanChunk(traceRoot1, createSpanEvent(traceRoot1, 1, 0)); - SpanChunk event1_1 = wrapSpanChunk(traceRoot1, createSpanEvent(traceRoot1,2, 1)); + SpanChunk event1_1 = wrapSpanChunk(traceRoot1, createSpanEvent(traceRoot1, 2, 1)); SpanChunk asyncEvent1_0 = wrapSpanChunk(traceRoot1, createAsyncSpanEvent(traceRoot1, 1, 0), new DefaultLocalAsyncId(1, (short) 1)); SpanChunk asyncEvent1_1 = wrapSpanChunk(traceRoot1, createAsyncSpanEvent(traceRoot1, 2, 1), new DefaultLocalAsyncId(1, (short) 1)); diff --git a/profiler-test/src/test/java/com/navercorp/pinpoint/test/javasssit/TestBootstrapClass.java b/profiler-test/src/test/java/com/navercorp/pinpoint/test/javasssit/TestBootstrapClass.java index ef114f48613d..3fea87698b73 100644 --- a/profiler-test/src/test/java/com/navercorp/pinpoint/test/javasssit/TestBootstrapClass.java +++ b/profiler-test/src/test/java/com/navercorp/pinpoint/test/javasssit/TestBootstrapClass.java @@ -18,9 +18,9 @@ import java.lang.reflect.Method; -import org.junit.Test; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.junit.jupiter.api.Test; /** diff --git a/profiler-test/src/test/java/com/navercorp/pinpoint/test/javasssit/accessor/AccessorInjectionTest.java b/profiler-test/src/test/java/com/navercorp/pinpoint/test/javasssit/accessor/AccessorInjectionTest.java index 3aa86bcf7c07..00b9489c3cd5 100644 --- a/profiler-test/src/test/java/com/navercorp/pinpoint/test/javasssit/accessor/AccessorInjectionTest.java +++ b/profiler-test/src/test/java/com/navercorp/pinpoint/test/javasssit/accessor/AccessorInjectionTest.java @@ -30,12 +30,12 @@ import com.navercorp.pinpoint.test.MockApplicationContextFactory; import com.navercorp.pinpoint.test.classloader.TestClassLoader; import com.navercorp.pinpoint.test.javasssit.TestBeforeInterceptor; -import org.apache.logging.log4j.spi.LoggerContext; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.spi.LoggerContext; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.lang.reflect.Method; import java.security.ProtectionDomain; @@ -65,7 +65,7 @@ private TestClassLoader getTestClassLoader() { return testClassLoader; } - @After + @AfterEach public void tearDown() { if (applicationContext != null) { applicationContext.close(); @@ -111,38 +111,38 @@ public byte[] doInTransform(Instrumentor instrumentor, ClassLoader loader, Strin callA.invoke(testObject); Class objectTraceValue = loader.loadClass(ObjectTraceValue.class.getName()); - Assert.assertTrue("ObjectTraceValue implements fail", objectTraceValue.isInstance(testObject)); + Assertions.assertTrue(objectTraceValue.isInstance(testObject), "ObjectTraceValue implements fail"); objectTraceValue.getMethod("_$PINPOINT$_setTraceObject", Object.class).invoke(testObject, "a"); Object get = objectTraceValue.getMethod("_$PINPOINT$_getTraceObject").invoke(testObject); - Assert.assertEquals("a", get); + Assertions.assertEquals("a", get); Class intTraceValue = loader.loadClass(IntTraceValue.class.getName()); - Assert.assertTrue("IntTraceValue implements fail", intTraceValue.isInstance(testObject)); + Assertions.assertTrue(intTraceValue.isInstance(testObject), "IntTraceValue implements fail"); intTraceValue.getMethod("_$PINPOINT$_setTraceInt", int.class).invoke(testObject, 1); int a = (Integer) intTraceValue.getMethod("_$PINPOINT$_getTraceInt").invoke(testObject); - Assert.assertEquals(1, a); + Assertions.assertEquals(1, a); Class intArrayTraceValue = loader.loadClass(IntArrayTraceValue.class.getName()); - Assert.assertTrue("IntArrayTraceValue implements fail", intArrayTraceValue.isInstance(testObject)); + Assertions.assertTrue(intArrayTraceValue.isInstance(testObject), "IntArrayTraceValue implements fail"); int[] expectedInts = {1, 2, 3}; intArrayTraceValue.getMethod("_$PINPOINT$_setTraceIntArray", int[].class).invoke(testObject, expectedInts); int[] ints = (int[]) intArrayTraceValue.getMethod("_$PINPOINT$_getTraceIntArray").invoke(testObject); - Assert.assertEquals(expectedInts, ints); + Assertions.assertEquals(expectedInts, ints); Class integerArrayTraceValue = loader.loadClass(IntegerArrayTraceValue.class.getName()); - Assert.assertTrue("IntegerArrayTraceValue implements fail", integerArrayTraceValue.isInstance(testObject)); + Assertions.assertTrue(integerArrayTraceValue.isInstance(testObject), "IntegerArrayTraceValue implements fail"); Integer[] expectedIntegers = {1, 2}; // wrap due to vararg expansion Object[] wrappedExpectedIntegers = new Object[]{expectedIntegers}; integerArrayTraceValue.getMethod("_$PINPOINT$_setTraceIntegerArray", Integer[].class).invoke(testObject, wrappedExpectedIntegers); Integer[] integers = (Integer[]) integerArrayTraceValue.getMethod("_$PINPOINT$_getTraceIntegerArray").invoke(testObject); - Assert.assertArrayEquals(expectedIntegers, integers); + Assertions.assertArrayEquals(expectedIntegers, integers); Class databaseTraceValue = loader.loadClass(DatabaseInfoTraceValue.class.getName()); - Assert.assertTrue("DatabaseInfoTraceValue implements fail", databaseTraceValue.isInstance(testObject)); + Assertions.assertTrue(databaseTraceValue.isInstance(testObject), "DatabaseInfoTraceValue implements fail"); databaseTraceValue.getMethod("_$PINPOINT$_setTraceDatabaseInfo", DatabaseInfo.class).invoke(testObject, UnKnownDatabaseInfo.INSTANCE); Object databaseInfo = databaseTraceValue.getMethod("_$PINPOINT$_getTraceDatabaseInfo").invoke(testObject); - Assert.assertSame(UnKnownDatabaseInfo.INSTANCE, databaseInfo); + Assertions.assertSame(UnKnownDatabaseInfo.INSTANCE, databaseInfo); } @Test @@ -179,10 +179,10 @@ public byte[] doInTransform(Instrumentor instrumentor, ClassLoader classLoader, Class intsGetter = loader.loadClass(IntArrayGetter.class.getName()); Class integersGetter = loader.loadClass(IntegerArrayGetter.class.getName()); - Assert.assertTrue(stringGetter.isInstance(testObject)); - Assert.assertTrue(intGetter.isInstance(testObject)); - Assert.assertTrue(intsGetter.isInstance(testObject)); - Assert.assertTrue(integersGetter.isInstance(testObject)); + Assertions.assertTrue(stringGetter.isInstance(testObject)); + Assertions.assertTrue(intGetter.isInstance(testObject)); + Assertions.assertTrue(intsGetter.isInstance(testObject)); + Assertions.assertTrue(integersGetter.isInstance(testObject)); String value = "hehe"; int intValue = 99; @@ -193,19 +193,19 @@ public byte[] doInTransform(Instrumentor instrumentor, ClassLoader classLoader, method.invoke(testObject, value); Method getString = stringGetter.getMethod("_$PINPOINT$_getString"); - Assert.assertEquals(value, getString.invoke(testObject)); + Assertions.assertEquals(value, getString.invoke(testObject)); Method setIntValue = testObject.getClass().getMethod("setIntValue", int.class); setIntValue.invoke(testObject, intValue); Method getInt = intGetter.getMethod("_$PINPOINT$_getInt"); - Assert.assertEquals(intValue, getInt.invoke(testObject)); + Assertions.assertEquals(intValue, getInt.invoke(testObject)); Method setIntValues = testObject.getClass().getMethod("setIntValues", int[].class); setIntValues.invoke(testObject, intValues); Method getIntValues = intsGetter.getMethod("_$PINPOINT$_getIntArray"); - Assert.assertEquals(intValues, getIntValues.invoke(testObject)); + Assertions.assertEquals(intValues, getIntValues.invoke(testObject)); Method setIntegerValues = testObject.getClass().getMethod("setIntegerValues", Integer[].class); // wrap due to vararg expansion @@ -213,7 +213,7 @@ public byte[] doInTransform(Instrumentor instrumentor, ClassLoader classLoader, setIntegerValues.invoke(testObject, wrappedIntegerValues); Method getIntegerValues = integersGetter.getMethod("_$PINPOINT$_getIntegerArray"); - Assert.assertEquals(integerValues, getIntegerValues.invoke(testObject)); + Assertions.assertEquals(integerValues, getIntegerValues.invoke(testObject)); } @@ -247,9 +247,9 @@ public byte[] doInTransform(Instrumentor instrumentor, ClassLoader classLoader, Class intsSetter = loader.loadClass(IntArraySetter.class.getName()); Class integersSetter = loader.loadClass(IntegerArraySetter.class.getName()); - Assert.assertTrue(intSetter.isInstance(testObject)); - Assert.assertTrue(intsSetter.isInstance(testObject)); - Assert.assertTrue(integersSetter.isInstance(testObject)); + Assertions.assertTrue(intSetter.isInstance(testObject)); + Assertions.assertTrue(intsSetter.isInstance(testObject)); + Assertions.assertTrue(integersSetter.isInstance(testObject)); int intValue = 99; int[] intValues = {99, 100}; @@ -258,19 +258,19 @@ public byte[] doInTransform(Instrumentor instrumentor, ClassLoader classLoader, Method setInt = intSetter.getMethod("_$PINPOINT$_setInt", int.class); setInt.invoke(testObject, intValue); Method getInt = testObject.getClass().getMethod("getIntValue"); - Assert.assertEquals(intValue, getInt.invoke(testObject)); + Assertions.assertEquals(intValue, getInt.invoke(testObject)); Method setInts = intsSetter.getMethod("_$PINPOINT$_setIntArray", int[].class); setInts.invoke(testObject, intValues); Method getInts = testObject.getClass().getMethod("getIntValues"); - Assert.assertEquals(intValues, getInts.invoke(testObject)); + Assertions.assertEquals(intValues, getInts.invoke(testObject)); Method setIntegers = integersSetter.getMethod("_$PINPOINT$_setIntegerArray", Integer[].class); // wrap due to vararg expansion Object[] wrappedIntegerValues = new Object[]{integerValues}; setIntegers.invoke(testObject, wrappedIntegerValues); Method getIntegers = testObject.getClass().getMethod("getIntegerValues"); - Assert.assertEquals(integerValues, getIntegers.invoke(testObject)); + Assertions.assertEquals(integerValues, getIntegers.invoke(testObject)); } } diff --git a/profiler-test/src/test/java/com/navercorp/pinpoint/test/monitor/AgentStatMonitorTest.java b/profiler-test/src/test/java/com/navercorp/pinpoint/test/monitor/AgentStatMonitorTest.java index 1613be428786..4e7847630eb4 100644 --- a/profiler-test/src/test/java/com/navercorp/pinpoint/test/monitor/AgentStatMonitorTest.java +++ b/profiler-test/src/test/java/com/navercorp/pinpoint/test/monitor/AgentStatMonitorTest.java @@ -28,16 +28,15 @@ import com.navercorp.pinpoint.test.ListenableDataSender; import com.navercorp.pinpoint.test.TBaseRecorder; import com.navercorp.pinpoint.test.TBaseRecorderAdaptor; - -import org.junit.Before; -import org.junit.Test; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.when; /** @@ -53,7 +52,7 @@ public class AgentStatMonitorTest { @Mock private AgentStatMetricCollector agentStatCollector; - @Before + @BeforeEach public void setUp() { MockitoAnnotations.initMocks(this); when(agentStatCollector.collect()).thenReturn(new AgentStatMetricSnapshot()); diff --git a/profiler-test/src/test/java/com/navercorp/pinpoint/test/util/BiHashMapTest.java b/profiler-test/src/test/java/com/navercorp/pinpoint/test/util/BiHashMapTest.java index 271f93c18fed..f2af8c754c78 100644 --- a/profiler-test/src/test/java/com/navercorp/pinpoint/test/util/BiHashMapTest.java +++ b/profiler-test/src/test/java/com/navercorp/pinpoint/test/util/BiHashMapTest.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.test.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class BiHashMapTest { @Test @@ -9,9 +9,9 @@ public void put() { BiHashMap map = new BiHashMap<>(); map.put(1, "a"); map.put(1, "b"); - Assert.assertEquals("b", map.get(1)); + Assertions.assertEquals("b", map.get(1)); map.put(2, "b"); - Assert.assertEquals(2, map.reverseGet("b").intValue()); + Assertions.assertEquals(2, map.reverseGet("b").intValue()); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/AgentInfoSenderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/AgentInfoSenderTest.java index c3aebdf1ecc4..446f52eba4dc 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/AgentInfoSenderTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/AgentInfoSenderTest.java @@ -60,8 +60,8 @@ import org.apache.thrift.TException; import org.awaitility.Awaitility; import org.awaitility.core.ConditionFactory; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.Map; @@ -76,8 +76,8 @@ import java.util.concurrent.atomic.AtomicInteger; import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class AgentInfoSenderTest { @@ -96,7 +96,7 @@ private ConditionFactory awaitility() { private AgentInfoFactory agentInfoFactory; private MessageConverter resultResponseMessageConverter; - @Before + @BeforeEach public void init() { agentInformation = createAgentInformation(); serverMetaDataRegistryService = new ServerMetaDataRegistryServiceProvider().get(); @@ -467,7 +467,7 @@ public void run() { testPinpointServerAcceptor.close(); } // Then - assertTrue("Failed with exceptions : " + exceptions, exceptions.isEmpty()); + assertTrue(exceptions.isEmpty(), "Failed with exceptions : " + exceptions); assertEquals(threadCount, messageListener.getRequestCount()); assertEquals(threadCount, messageListener.getSuccessCount()); } @@ -631,7 +631,7 @@ private PinpointClientFactory createPinpointClientFactory() { PinpointClientFactory clientFactory = new DefaultPinpointClientFactory(); clientFactory.setWriteTimeoutMillis(1000 * 3); clientFactory.setRequestTimeoutMillis(1000 * 5); - clientFactory.setProperties(Collections. emptyMap()); + clientFactory.setProperties(Collections.emptyMap()); return clientFactory; } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/cache/LRUCacheTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/cache/LRUCacheTest.java index f187ffb1e9fa..19ed5ad6a605 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/cache/LRUCacheTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/cache/LRUCacheTest.java @@ -18,8 +18,8 @@ import org.awaitility.Awaitility; import org.awaitility.core.ConditionFactory; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Random; @@ -44,16 +44,16 @@ public void testPut() { @Test public void testGetSize() { LRUCache cache = new LRUCache<>(2); - Assert.assertEquals(cache.getSize(), 0); + Assertions.assertEquals(cache.getSize(), 0); String sqlObject = "test"; boolean hit = cache.put(sqlObject); - Assert.assertTrue(hit); - Assert.assertEquals(cache.getSize(), 1); + Assertions.assertTrue(hit); + Assertions.assertEquals(cache.getSize(), 1); boolean hit2 = cache.put(sqlObject); - Assert.assertFalse(hit2); + Assertions.assertFalse(hit2); ConditionFactory await = Awaitility.await(); await.until(cache::getSize, is(1L)); // "23 123"; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/cache/SimpleCacheTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/cache/SimpleCacheTest.java index 07530d867e08..f030798d4550 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/cache/SimpleCacheTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/cache/SimpleCacheTest.java @@ -16,9 +16,8 @@ package com.navercorp.pinpoint.profiler.cache; -import org.junit.Assert; -import org.junit.Test; - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -29,30 +28,30 @@ public class SimpleCacheTest { public void startKey0() { SimpleCache cache = new SimpleCache<>(new IdAllocator.ZigZagAllocator(0), 1024); Result test = cache.put("test"); - Assert.assertEquals(0, test.getId()); + Assertions.assertEquals(0, test.getId()); } @Test public void startKey1() { SimpleCache cache = new SimpleCache<>(new IdAllocator.ZigZagAllocator(), 1); Result test = cache.put("test"); - Assert.assertEquals(-1, test.getId()); + Assertions.assertEquals(-1, test.getId()); } @Test public void put() { SimpleCache cache = new SimpleCache<>(new IdAllocator.ZigZagAllocator()); Result test = cache.put("test"); - Assert.assertEquals(-1, test.getId()); - Assert.assertTrue(test.isNewValue()); + Assertions.assertEquals(-1, test.getId()); + Assertions.assertTrue(test.isNewValue()); Result recheck = cache.put("test"); - Assert.assertEquals(test.getId(), recheck.getId()); - Assert.assertFalse(recheck.isNewValue()); + Assertions.assertEquals(test.getId(), recheck.getId()); + Assertions.assertFalse(recheck.isNewValue()); Result newValue = cache.put("new"); - Assert.assertEquals(1, newValue.getId()); - Assert.assertTrue(newValue.isNewValue()); + Assertions.assertEquals(1, newValue.getId()); + Assertions.assertTrue(newValue.isNewValue()); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/AsyncContextTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/AsyncContextTest.java index 68fb7a78a0a8..f5e84060cf10 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/AsyncContextTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/AsyncContextTest.java @@ -4,21 +4,26 @@ import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.profiler.context.id.TraceRoot; import com.navercorp.pinpoint.profiler.context.provider.BaseTraceFactoryProvider; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.mockito.stubbing.Answer; -import static org.junit.Assert.*; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public abstract class AsyncContextTest { @Mock protected TraceRoot traceRoot; @@ -32,33 +37,34 @@ protected AsyncTraceContext newAsyncTraceContext() { BaseTraceFactoryProvider baseTraceFactoryProvider = mock(BaseTraceFactoryProvider.class); when(baseTraceFactory.continueAsyncContextTraceObject(any(TraceRoot.class), any(LocalAsyncId.class), eq(true))) - .thenAnswer(new Answer() { - @Override - public Trace answer(InvocationOnMock invocationOnMock) { - Trace trace = mock(AsyncChildTrace.class); - when(trace.canSampled()).thenReturn(true); - return trace; - } - }); + .thenAnswer(new Answer() { + @Override + public Trace answer(InvocationOnMock invocationOnMock) { + Trace trace = mock(AsyncChildTrace.class); + when(trace.canSampled()).thenReturn(true); + return trace; + } + }); when(baseTraceFactory.continueAsyncContextTraceObject(any(TraceRoot.class), any(LocalAsyncId.class), eq(false))) - .thenAnswer(new Answer() { - @Override - public Trace answer(InvocationOnMock invocationOnMock) { - return mock(DisableAsyncChildTrace.class); - } - }); + .thenAnswer(new Answer() { + @Override + public Trace answer(InvocationOnMock invocationOnMock) { + return mock(DisableAsyncChildTrace.class); + } + }); when(baseTraceFactoryProvider.get()).thenReturn(baseTraceFactory); return new DefaultAsyncTraceContext(baseTraceFactoryProvider, new ThreadLocalBinder()); } - @Before + @BeforeEach public void setUp() { LocalAsyncId localAsyncId = new DefaultLocalAsyncId(0, 0); when(asyncId.nextLocalAsyncId()).thenReturn(localAsyncId); } @Test + @MockitoSettings(strictness = Strictness.LENIENT) public void testAsyncTraceObject() { AsyncContext enabledAsyncContext = newAsyncContext(true); AsyncContext disabledAsyncContext = newAsyncContext(false); @@ -83,6 +89,7 @@ public void testAsyncTraceObject() { } @Test + @MockitoSettings(strictness = Strictness.LENIENT) public void testClose() { AsyncContext asyncContext = newAsyncContext(true); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/CallStackTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/CallStackTest.java index cc846c5b264f..10e6fc9409f4 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/CallStackTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/CallStackTest.java @@ -16,13 +16,15 @@ package com.navercorp.pinpoint.profiler.context; -import static org.junit.Assert.*; - -import org.junit.Assert; -import org.junit.Test; - -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author emeroad @@ -35,7 +37,9 @@ public abstract class CallStackTest { protected CallStack.Factory factory = new SpanEventFactory(); abstract CallStack newCallStack(); + abstract CallStack newCallStack(int depth); + abstract CallStack newCallStack(int depth, int sequence); public SpanEvent getSpanEvent() { @@ -46,10 +50,10 @@ public SpanEvent getSpanEvent() { public void testPush() { CallStack callStack = newCallStack(); int initialIndex = callStack.getIndex(); - assertEquals("initial index", initialIndex, 0); + assertEquals(initialIndex, 0, "initial index"); SpanEvent spanEvent = factory.newInstance(); int index = callStack.push(spanEvent); - assertEquals("initial index", index, 1); + assertEquals(index, 1, "initial index"); callStack.pop(); } @@ -58,14 +62,14 @@ public void testPush() { public void testLargePush() { CallStack callStack = newCallStack(); int initialIndex = callStack.getIndex(); - Assert.assertEquals("initial index", initialIndex, 0); + assertEquals(initialIndex, 0, "initial index"); final int pushCount = 32; for (int i = 0; i < pushCount; i++) { int push = callStack.push(getSpanEvent()); - Assert.assertEquals("push index", i + 1, push); + assertEquals(i + 1, push, "push index"); int index = callStack.getIndex(); - Assert.assertEquals("index", i + 1, index); + assertEquals(i + 1, index, "index"); } for (int i = 0; i < pushCount - 1; i++) { callStack.pop(); @@ -111,7 +115,7 @@ public void newInstance() { callStack.push(spanEvent1); SpanEvent spanEvent2 = callStack.newInstance(); - Assert.assertTrue(callStack.getFactory().isDisable(spanEvent2)); + assertTrue(callStack.getFactory().isDisable(spanEvent2)); } @Test @@ -121,7 +125,7 @@ public void overflow() { DefaultCallStack callStack = (DefaultCallStack) newCallStack(maxDepth); assertEquals(maxDepth, callStack.getMaxDepth()); - for(int i = 0; i < maxDepth; i++) { + for (int i = 0; i < maxDepth; i++) { assertEquals(i + 1, callStack.push(getSpanEvent())); } // overflow @@ -138,7 +142,7 @@ public void overflow() { assertEquals(maxDepth, callStack.getIndex()); // normal - for(int i = maxDepth; i > 0; i--) { + for (int i = maxDepth; i > 0; i--) { assertNotNull(callStack.peek()); assertNotNull(callStack.pop()); assertEquals(i - 1, callStack.getIndex()); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DefaultAsyncTraceContextTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DefaultAsyncTraceContextTest.java index 83bbdda74f08..89f6360da8d7 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DefaultAsyncTraceContextTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DefaultAsyncTraceContextTest.java @@ -4,20 +4,25 @@ import com.navercorp.pinpoint.exception.PinpointException; import com.navercorp.pinpoint.profiler.context.id.TraceRoot; import com.navercorp.pinpoint.profiler.context.provider.BaseTraceFactoryProvider; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.mockito.stubbing.Answer; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class DefaultAsyncTraceContextTest { private static final Reference EMPTY = DefaultReference.emptyReference(); @@ -31,26 +36,27 @@ protected AsyncTraceContext newAsyncTraceContext() { BaseTraceFactoryProvider baseTraceFactoryProvider = mock(BaseTraceFactoryProvider.class); when(baseTraceFactory.continueAsyncContextTraceObject(any(TraceRoot.class), any(LocalAsyncId.class), eq(true))) - .thenAnswer(new Answer() { - @Override - public Trace answer(InvocationOnMock invocationOnMock) { - Trace trace = mock(AsyncChildTrace.class); - when(trace.canSampled()).thenReturn(true); - return trace; - } - }); + .thenAnswer(new Answer() { + @Override + public Trace answer(InvocationOnMock invocationOnMock) { + Trace trace = mock(AsyncChildTrace.class); + when(trace.canSampled()).thenReturn(true); + return trace; + } + }); when(baseTraceFactory.continueAsyncContextTraceObject(any(TraceRoot.class), any(LocalAsyncId.class), eq(false))) - .thenAnswer(new Answer() { - @Override - public Trace answer(InvocationOnMock invocationOnMock) { - return mock(DisableAsyncChildTrace.class); - } - }); + .thenAnswer(new Answer() { + @Override + public Trace answer(InvocationOnMock invocationOnMock) { + return mock(DisableAsyncChildTrace.class); + } + }); when(baseTraceFactoryProvider.get()).thenReturn(baseTraceFactory); return new DefaultAsyncTraceContext(baseTraceFactoryProvider, new ThreadLocalBinder()); } + @MockitoSettings(strictness = Strictness.LENIENT) @Test public void testNewAsyncTraceObject() { AsyncTraceContext asyncTraceContext = newAsyncTraceContext(); @@ -86,11 +92,14 @@ public void testAsyncTraceContext() { assertEquals(EMPTY, asyncTraceContext.currentTraceObject()); } - @Test(expected = PinpointException.class) + @MockitoSettings(strictness = Strictness.LENIENT) + @Test public void testOverrideTrace() { - AsyncTraceContext asyncTraceContext = newAsyncTraceContext(); + Assertions.assertThrows(PinpointException.class, () -> { + AsyncTraceContext asyncTraceContext = newAsyncTraceContext(); - asyncTraceContext.continueAsyncContextTraceObject(traceRoot, localAsyncId, true); - asyncTraceContext.continueAsyncContextTraceObject(traceRoot, localAsyncId, false); + asyncTraceContext.continueAsyncContextTraceObject(traceRoot, localAsyncId, true); + asyncTraceContext.continueAsyncContextTraceObject(traceRoot, localAsyncId, false); + }); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DefaultServerMetaDataRegistryServiceTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DefaultServerMetaDataRegistryServiceTest.java index 4fdbc9dc8797..70beca2f0bd2 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DefaultServerMetaDataRegistryServiceTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DefaultServerMetaDataRegistryServiceTest.java @@ -16,7 +16,11 @@ package com.navercorp.pinpoint.profiler.context; -import static org.junit.Assert.*; +import com.navercorp.pinpoint.bootstrap.context.ServerMetaData; +import com.navercorp.pinpoint.bootstrap.context.ServiceInfo; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; @@ -28,11 +32,8 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import com.navercorp.pinpoint.bootstrap.context.ServerMetaData; -import com.navercorp.pinpoint.bootstrap.context.ServiceInfo; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author hyungil.jeong @@ -45,13 +46,13 @@ public class DefaultServerMetaDataRegistryServiceTest { private static final List VM_ARGS = Arrays.asList("testVmArgs"); private ExecutorService executorService; - - @Before + + @BeforeEach public void setUp() { this.executorService = Executors.newFixedThreadPool(THREAD_COUNT); } - @After + @AfterEach public void cleanUp() { this.executorService.shutdown(); } @@ -91,7 +92,7 @@ public void run() { startLatch.countDown(); endLatch.await(); // Then - assertTrue("Failed with errors : " + exceptions, exceptions.isEmpty()); + assertTrue(exceptions.isEmpty(), "Failed with errors : " + exceptions); ServerMetaData serverMetaData = serverMetaDataRegistryService.getServerMetaData(); assertEquals(SERVER_INFO, serverMetaData.getServerInfo()); assertEquals(VM_ARGS, serverMetaData.getVmArgs()); @@ -111,7 +112,7 @@ public void testRaceConditionWhenAddingServiceInfo() throws InterruptedException final CountDownLatch startLatch = new CountDownLatch(1); final CountDownLatch endLatch = new CountDownLatch(THREAD_COUNT); final Queue exceptions = new ConcurrentLinkedQueue<>(); - + final String serviceName = "/test"; final ServerMetaDataRegistryService serverMetaDataRegistryService = new DefaultServerMetaDataRegistryService(VM_ARGS); serverMetaDataRegistryService.setServerName(SERVER_INFO); @@ -138,7 +139,7 @@ public void run() { startLatch.countDown(); endLatch.await(); // Then - assertTrue("Failed with exceptions : " + exceptions, exceptions.isEmpty()); + assertTrue(exceptions.isEmpty(), "Failed with exceptions : " + exceptions); ServerMetaData serverMetaData = serverMetaDataRegistryService.getServerMetaData(); assertEquals(SERVER_INFO, serverMetaData.getServerInfo()); assertEquals(VM_ARGS, serverMetaData.getVmArgs()); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DefaultTraceContextTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DefaultTraceContextTest.java index 141888581427..0af10b51c80a 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DefaultTraceContextTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DefaultTraceContextTest.java @@ -30,13 +30,13 @@ import com.navercorp.pinpoint.profiler.context.module.DefaultApplicationContext; import com.navercorp.pinpoint.profiler.context.provider.sampler.SamplerConfig; import com.navercorp.pinpoint.profiler.sampler.CountingSamplerFactory; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mockito; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; import static org.mockito.Mockito.spy; @@ -49,7 +49,7 @@ public class DefaultTraceContextTest { private DefaultApplicationContext applicationContext; - @Before + @BeforeEach public void setUp() throws Exception { ProfilerConfig profilerConfig = getProfilerConfig(); @@ -57,7 +57,7 @@ public void setUp() throws Exception { applicationContext.start(); } - @After + @AfterEach public void tearDown() throws Exception { if (applicationContext != null) { applicationContext.close(); @@ -66,7 +66,7 @@ public void tearDown() throws Exception { @Test public void parseTest() { - String agent= "test"; + String agent = "test"; long agentStartTime = System.currentTimeMillis(); long agentTransactionCount = 10; TraceId traceId = new DefaultTraceId(agent, agentStartTime, agentTransactionCount); @@ -76,9 +76,9 @@ public void parseTest() { TransactionId transactionid = TransactionIdUtils.parseTransactionId(id); - Assert.assertEquals(transactionid.getAgentId(), agent); - Assert.assertEquals(transactionid.getAgentStartTime(), agentStartTime); - Assert.assertEquals(transactionid.getTransactionSequence(), agentTransactionCount); + Assertions.assertEquals(transactionid.getAgentId(), agent); + Assertions.assertEquals(transactionid.getAgentStartTime(), agentStartTime); + Assertions.assertEquals(transactionid.getTransactionSequence(), agentTransactionCount); } @Test @@ -86,8 +86,8 @@ public void disableTrace() { TraceContext traceContext = applicationContext.getTraceContext(); Trace trace = traceContext.disableSampling(); - Assert.assertNotNull(trace); - Assert.assertFalse(trace.canSampled()); + Assertions.assertNotNull(trace); + Assertions.assertFalse(trace.canSampled()); traceContext.removeTraceObject(); } @@ -96,7 +96,7 @@ public void disableTrace() { public void threadLocalBindTest() { TraceContext traceContext = applicationContext.getTraceContext(); - Assert.assertNotNull(traceContext.newTraceObject()); + Assertions.assertNotNull(traceContext.newTraceObject()); ProfilerConfig profilerConfig = getProfilerConfig(); @@ -107,13 +107,13 @@ public void threadLocalBindTest() { Trace notExist = traceContext2.currentRawTraceObject(); applicationContext2.close(); - Assert.assertNull(notExist); + Assertions.assertNull(notExist); - Assert.assertNotNull(traceContext.currentRawTraceObject()); + Assertions.assertNotNull(traceContext.currentRawTraceObject()); traceContext.removeTraceObject(); - Assert.assertNull(traceContext.currentRawTraceObject()); + Assertions.assertNull(traceContext.currentRawTraceObject()); } - + @Test public void transactionCountTest() { final int samplingRate = 5; @@ -132,20 +132,19 @@ public void transactionCountTest() { final long newTransactionCount = 22L; - @SuppressWarnings("unused") - final long expectedSampledNewCount = newTransactionCount / samplingRate + (newTransactionCount % samplingRate > 0 ? 1 : 0); + @SuppressWarnings("unused") final long expectedSampledNewCount = newTransactionCount / samplingRate + (newTransactionCount % samplingRate > 0 ? 1 : 0); final long expectedUnsampledNewCount = newTransactionCount - expectedSampledNewCount; for (int i = 0; i < newTransactionCount; i++) { traceContext.newTraceObject(); traceContext.removeTraceObject(); } - + final long expectedSampledContinuationCount = 5L; for (int i = 0; i < expectedSampledContinuationCount; i++) { traceContext.continueTraceObject(new DefaultTraceId("agentId", 0L, i)); traceContext.removeTraceObject(); } - + final long expectedUnsampledContinuationCount = 10L; for (int i = 0; i < expectedUnsampledContinuationCount; i++) { traceContext.disableSampling(); @@ -156,11 +155,11 @@ public void transactionCountTest() { final long expectedTotalTransactionCount = expectedSampledNewCount + expectedUnsampledNewCount + expectedSampledContinuationCount + expectedUnsampledContinuationCount; - Assert.assertEquals(expectedSampledNewCount, transactionCounter.getSampledNewCount()); - Assert.assertEquals(expectedUnsampledNewCount, transactionCounter.getUnSampledNewCount()); - Assert.assertEquals(expectedSampledContinuationCount, transactionCounter.getSampledContinuationCount()); - Assert.assertEquals(expectedUnsampledContinuationCount, transactionCounter.getUnSampledContinuationCount()); - Assert.assertEquals(expectedTotalTransactionCount, transactionCounter.getTotalTransactionCount()); + Assertions.assertEquals(expectedSampledNewCount, transactionCounter.getSampledNewCount()); + Assertions.assertEquals(expectedUnsampledNewCount, transactionCounter.getUnSampledNewCount()); + Assertions.assertEquals(expectedSampledContinuationCount, transactionCounter.getSampledContinuationCount()); + Assertions.assertEquals(expectedUnsampledContinuationCount, transactionCounter.getUnSampledContinuationCount()); + Assertions.assertEquals(expectedTotalTransactionCount, transactionCounter.getTotalTransactionCount()); } public ProfilerConfig getProfilerConfig() { diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DefaultTraceTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DefaultTraceTest.java index 88eaa93db9c8..74ff3ee02c43 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DefaultTraceTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DefaultTraceTest.java @@ -32,10 +32,13 @@ import com.navercorp.pinpoint.profiler.logging.Log4j2LoggerBinderInitializer; import com.navercorp.pinpoint.profiler.metadata.SqlMetaDataService; import com.navercorp.pinpoint.profiler.metadata.StringMetaDataService; - -import org.junit.*; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -43,7 +46,7 @@ /** * @author emeroad */ -@RunWith(org.mockito.junit.MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class DefaultTraceTest { private final String agentId = "agentId"; @@ -62,13 +65,13 @@ public class DefaultTraceTest { private final IgnoreErrorHandler errorHandler = new BypassErrorHandler(); - @BeforeClass + @BeforeAll public static void before() throws Exception { Log4j2LoggerBinderInitializer.beforeClass(); } - @AfterClass - public static void after() throws Exception { + @AfterAll + public static void after() throws Exception { Log4j2LoggerBinderInitializer.afterClass(); } @@ -92,7 +95,7 @@ public void testPreviousSpanEvent() { recorder2.attachFrameObject("2"); trace.traceBlockEnd(); // access the previous SpanEvent - Assert.assertEquals(recorder1.getFrameObject(), "1"); + Assertions.assertEquals(recorder1.getFrameObject(), "1"); trace.traceBlockEnd(); trace.close(); } @@ -116,11 +119,11 @@ public void overflow() { @Test public void overflowUnlimit() { Trace trace = newTrace(-1); - for(int i = 0; i < 256; i++) { + for (int i = 0; i < 256; i++) { trace.traceBlockBegin(); } - for(int i = 0; i < 256; i++) { + for (int i = 0; i < 256; i++) { trace.traceBlockEnd(); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DisableTraceTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DisableTraceTest.java index 37ff628f3e1a..405556d23f9d 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DisableTraceTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DisableTraceTest.java @@ -5,8 +5,8 @@ import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.profiler.context.active.ActiveTraceHandle; import com.navercorp.pinpoint.profiler.context.id.TraceRoot; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; @@ -15,8 +15,8 @@ public class DisableTraceTest { public void testGetScope() { Trace trace = newTrace(); Trace childTrace = newChildTrace(); - Assert.assertNull(trace.addScope("empty")); - Assert.assertNull(childTrace.addScope("empty")); + Assertions.assertNull(trace.addScope("empty")); + Assertions.assertNull(childTrace.addScope("empty")); } @Test @@ -26,8 +26,8 @@ public void testAddScope() { trace.addScope("aaa"); childTrace.addScope("bbb"); - Assert.assertNotNull(trace.getScope("aaa")); - Assert.assertNotNull(childTrace.getScope("bbb")); + Assertions.assertNotNull(trace.getScope("aaa")); + Assertions.assertNotNull(childTrace.getScope("bbb")); } @Test @@ -35,8 +35,8 @@ public void testSampled() { Trace trace = newTrace(); Trace childTrace = newChildTrace(); - Assert.assertFalse(trace.canSampled()); - Assert.assertFalse(childTrace.canSampled()); + Assertions.assertFalse(trace.canSampled()); + Assertions.assertFalse(childTrace.canSampled()); } @Test @@ -46,8 +46,8 @@ public void testSpanRecorder() { SpanRecorder spanRecorder = trace.getSpanRecorder(); SpanRecorder childSpanRecorder = childTrace.getSpanRecorder(); - Assert.assertNull(spanRecorder); - Assert.assertNull(childSpanRecorder); + Assertions.assertNull(spanRecorder); + Assertions.assertNull(childSpanRecorder); } @Test @@ -57,8 +57,8 @@ public void testCurrentSpanEventRecorder() { SpanEventRecorder spanEventRecorder = trace.currentSpanEventRecorder(); SpanEventRecorder childSpanEventRecorder = childTrace.currentSpanEventRecorder(); - Assert.assertNull(spanEventRecorder); - Assert.assertNull(childSpanEventRecorder); + Assertions.assertNull(spanEventRecorder); + Assertions.assertNull(childSpanEventRecorder); } private Trace newTrace() { diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/ListenableAsyncStateTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/ListenableAsyncStateTest.java index 1da4f8971360..ca67be455f77 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/ListenableAsyncStateTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/ListenableAsyncStateTest.java @@ -18,9 +18,12 @@ import com.navercorp.pinpoint.profiler.context.active.ActiveTraceHandle; import com.navercorp.pinpoint.profiler.context.id.ListenableAsyncState; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; /** * @author Woonduk Kang(emeroad) diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/SpanAsyncStateListenerTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/SpanAsyncStateListenerTest.java index f8477b920d37..cc7c35053b1b 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/SpanAsyncStateListenerTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/SpanAsyncStateListenerTest.java @@ -20,10 +20,10 @@ import com.navercorp.pinpoint.profiler.context.id.TraceRoot; import com.navercorp.pinpoint.profiler.context.storage.Storage; import com.navercorp.pinpoint.profiler.context.storage.StorageFactory; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; - +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.AdditionalMatchers.or; import static org.mockito.ArgumentMatchers.any; @@ -34,7 +34,7 @@ /** * @author Woonduk Kang(emeroad) */ -@RunWith(org.mockito.junit.MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class SpanAsyncStateListenerTest { @Mock diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/SpanEventFactoryTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/SpanEventFactoryTest.java index 874f6f6a8fa6..0ace60b5b233 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/SpanEventFactoryTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/SpanEventFactoryTest.java @@ -16,9 +16,12 @@ package com.navercorp.pinpoint.profiler.context; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/SpanEventTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/SpanEventTest.java index 6c147167d3d2..8c267dd928f5 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/SpanEventTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/SpanEventTest.java @@ -18,18 +18,16 @@ import com.navercorp.pinpoint.profiler.context.compress.SpanProcessor; import com.navercorp.pinpoint.profiler.context.compress.SpanProcessorV1; +import com.navercorp.pinpoint.profiler.context.id.DefaultTraceId; import com.navercorp.pinpoint.profiler.context.id.DefaultTraceRoot; import com.navercorp.pinpoint.profiler.context.id.TraceRoot; import com.navercorp.pinpoint.thrift.dto.TSpan; import com.navercorp.pinpoint.thrift.dto.TSpanChunk; import com.navercorp.pinpoint.thrift.dto.TSpanEvent; -import org.junit.Assert; - -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; - -import com.navercorp.pinpoint.profiler.context.id.DefaultTraceId; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -43,7 +41,7 @@ public class SpanEventTest { @Test public void testMarkStartTime() { final DefaultTraceId traceId = new DefaultTraceId("agentId", 0, 0); - TraceRoot traceRoot = new DefaultTraceRoot(traceId, "agentId", System.currentTimeMillis(),0); + TraceRoot traceRoot = new DefaultTraceRoot(traceId, "agentId", System.currentTimeMillis(), 0); Span span = new Span(traceRoot); span.markBeforeTime(); @@ -65,8 +63,8 @@ public void testMarkStartTime() { compressorV1.preProcess(span, tSpan); compressorV1.postProcess(span, tSpan); - Assert.assertEquals("startTime", span.getStartTime() + tSpanEvent.getStartElapsed(), spanEvent.getStartTime()); - Assert.assertEquals("endTime", span.getStartTime() + tSpanEvent.getStartElapsed() + spanEvent.getElapsedTime(), spanEvent.getAfterTime()); + Assertions.assertEquals(span.getStartTime() + tSpanEvent.getStartElapsed(), spanEvent.getStartTime(), "startTime"); + Assertions.assertEquals(span.getStartTime() + tSpanEvent.getStartElapsed() + spanEvent.getElapsedTime(), spanEvent.getAfterTime(), "endTime"); } @Test diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/StatefulAsyncContextTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/StatefulAsyncContextTest.java index fc5a54282a5b..5bfdfeee1bf4 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/StatefulAsyncContextTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/StatefulAsyncContextTest.java @@ -2,11 +2,12 @@ import com.navercorp.pinpoint.bootstrap.context.AsyncContext; import com.navercorp.pinpoint.bootstrap.context.AsyncState; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; -import static org.junit.Assert.assertEquals; - +import static org.junit.jupiter.api.Assertions.assertEquals; public class StatefulAsyncContextTest extends AsyncContextTest { @Mock @@ -19,6 +20,7 @@ AsyncContext newAsyncContext(boolean canSampled) { } @Test + @MockitoSettings(strictness = Strictness.LENIENT) public void testGetAsyncState() { StatefulAsyncContext asyncContext = (StatefulAsyncContext) newAsyncContext(true); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/ThreadLocalFactoryTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/ThreadLocalFactoryTest.java index 12eb4a780b54..422751f0f15e 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/ThreadLocalFactoryTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/ThreadLocalFactoryTest.java @@ -18,11 +18,11 @@ import com.navercorp.pinpoint.bootstrap.context.Trace; import com.navercorp.pinpoint.exception.PinpointException; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -56,7 +56,7 @@ public TraceFactory newTraceFactory(boolean sampled) { return traceFactory; } - @After + @AfterEach public void tearDown() throws Exception { sampledTraceFactory.removeTraceObject(); unsampledTraceFactory.removeTraceObject(); @@ -67,13 +67,13 @@ public void nullTraceObject() { TraceFactory traceFactory = sampledTraceFactory; Trace currentTraceObject = traceFactory.currentTraceObject(); - Assert.assertNull(currentTraceObject); + Assertions.assertNull(currentTraceObject); Trace rawTraceObject = traceFactory.currentRawTraceObject(); - Assert.assertNull(rawTraceObject); + Assertions.assertNull(rawTraceObject); traceFactory.newTraceObject(); - Assert.assertNotNull(traceFactory.currentRawTraceObject()); + Assertions.assertNotNull(traceFactory.currentRawTraceObject()); } @@ -84,8 +84,8 @@ public void testCurrentTraceObject() { Trace newTrace = traceFactory.newTraceObject(); Trace currentTrace = traceFactory.currentTraceObject(); - Assert.assertNotNull(currentTrace); - Assert.assertSame(newTrace, currentTrace); + Assertions.assertNotNull(currentTrace); + Assertions.assertSame(newTrace, currentTrace); } @Test @@ -95,8 +95,8 @@ public void testCurrentTraceObject_unsampled() { Trace newTrace = traceFactory.newTraceObject(); Trace currentTrace = traceFactory.currentTraceObject(); - Assert.assertNull(currentTrace); - Assert.assertNotEquals(newTrace, currentTrace); + Assertions.assertNull(currentTrace); + Assertions.assertNotEquals(newTrace, currentTrace); } @@ -107,8 +107,8 @@ public void testCurrentRawTraceObject() { Trace trace = traceFactory.newTraceObject(); Trace rawTrace = traceFactory.currentRawTraceObject(); - Assert.assertNotNull(rawTrace); - Assert.assertSame(trace, rawTrace); + Assertions.assertNotNull(rawTrace); + Assertions.assertSame(trace, rawTrace); } @Test @@ -118,8 +118,8 @@ public void testCurrentRawTraceObject_unsampled() { Trace trace = traceFactory.newTraceObject(); Trace rawTrace = traceFactory.currentRawTraceObject(); - Assert.assertNotNull(rawTrace); - Assert.assertSame(trace, rawTrace); + Assertions.assertNotNull(rawTrace); + Assertions.assertSame(trace, rawTrace); } @Test @@ -130,8 +130,8 @@ public void testDisableSampling() { Trace trace = traceFactory.disableSampling(); Trace rawTrace = traceFactory.currentRawTraceObject(); - Assert.assertNotNull(rawTrace); - Assert.assertSame(trace, rawTrace); + Assertions.assertNotNull(rawTrace); + Assertions.assertSame(trace, rawTrace); } @Test @@ -144,18 +144,19 @@ public void testNewTraceObject() { traceFactory.newTraceObject(); Trace rawTraceObject = traceFactory.currentRawTraceObject(); - Assert.assertNotNull(rawTraceObject); + Assertions.assertNotNull(rawTraceObject); } - @Test(expected = PinpointException.class) + @Test public void duplicatedTraceStart() { - TraceFactory traceFactory = sampledTraceFactory; - - traceFactory.newTraceObject(); - traceFactory.newTraceObject(); + Assertions.assertThrows(PinpointException.class, () -> { + TraceFactory traceFactory = sampledTraceFactory; + traceFactory.newTraceObject(); + traceFactory.newTraceObject(); + }); } @Test @@ -166,6 +167,6 @@ public void testDetachTraceObject() { traceFactory.removeTraceObject(); Trace rawTraceObject = traceFactory.currentRawTraceObject(); - Assert.assertNull(rawTraceObject); + Assertions.assertNull(rawTraceObject); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/TraceTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/TraceTest.java index 77f84340424d..bf940dbe22be 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/TraceTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/TraceTest.java @@ -30,20 +30,23 @@ import com.navercorp.pinpoint.profiler.context.storage.Storage; import com.navercorp.pinpoint.profiler.metadata.SqlMetaDataService; import com.navercorp.pinpoint.profiler.metadata.StringMetaDataService; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; +import org.mockito.junit.jupiter.MockitoExtension; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; /** * @author emeroad */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class TraceTest { private final Logger logger = LogManager.getLogger(this.getClass()); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/active/ActiveTraceHistogramUtilsTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/active/ActiveTraceHistogramUtilsTest.java index 396570bb4770..114b8373eb9a 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/active/ActiveTraceHistogramUtilsTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/active/ActiveTraceHistogramUtilsTest.java @@ -17,12 +17,11 @@ package com.navercorp.pinpoint.profiler.context.active; import com.navercorp.pinpoint.common.trace.BaseHistogramSchema; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.List; - /** * @author Woonduk Kang(emeroad) */ @@ -33,11 +32,11 @@ public void asList_ZERO_CASE() { ActiveTraceHistogram emptyHistogram= new EmptyActiveTraceHistogram(BaseHistogramSchema.NORMAL_SCHEMA); List zeroList = ActiveTraceHistogramUtils.asList(emptyHistogram); - Assert.assertEquals(zeroList.size(), 4); - Assert.assertEquals(emptyHistogram.getFastCount(), 0); - Assert.assertEquals(emptyHistogram.getNormalCount(), 0); - Assert.assertEquals(emptyHistogram.getSlowCount(), 0); - Assert.assertEquals(emptyHistogram.getVerySlowCount(), 0); + Assertions.assertEquals(zeroList.size(), 4); + Assertions.assertEquals(emptyHistogram.getFastCount(), 0); + Assertions.assertEquals(emptyHistogram.getNormalCount(), 0); + Assertions.assertEquals(emptyHistogram.getSlowCount(), 0); + Assertions.assertEquals(emptyHistogram.getVerySlowCount(), 0); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/active/ActiveTraceRepositoryTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/active/ActiveTraceRepositoryTest.java index fd66e09bc665..49af8e2c7c55 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/active/ActiveTraceRepositoryTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/active/ActiveTraceRepositoryTest.java @@ -16,7 +16,27 @@ package com.navercorp.pinpoint.profiler.context.active; -import static org.junit.Assert.*; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; +import com.navercorp.pinpoint.bootstrap.config.DefaultProfilerConfig; +import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; +import com.navercorp.pinpoint.bootstrap.context.Trace; +import com.navercorp.pinpoint.bootstrap.context.TraceContext; +import com.navercorp.pinpoint.bootstrap.context.TraceId; +import com.navercorp.pinpoint.profiler.context.MockTraceContextFactory; +import com.navercorp.pinpoint.profiler.context.id.DefaultTraceId; +import com.navercorp.pinpoint.profiler.context.id.DefaultTransactionCounter; +import com.navercorp.pinpoint.profiler.context.id.IdGenerator; +import com.navercorp.pinpoint.profiler.context.id.TransactionCounter; +import com.navercorp.pinpoint.profiler.context.module.DefaultApplicationContext; +import com.navercorp.pinpoint.profiler.context.provider.sampler.SamplerConfig; +import com.navercorp.pinpoint.profiler.sampler.CountingSamplerFactory; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; import java.util.ArrayList; import java.util.HashMap; @@ -29,28 +49,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import com.navercorp.pinpoint.bootstrap.config.DefaultProfilerConfig; -import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; -import com.navercorp.pinpoint.bootstrap.context.TraceContext; -import com.navercorp.pinpoint.bootstrap.context.TraceId; -import com.navercorp.pinpoint.profiler.context.id.DefaultTransactionCounter; -import com.navercorp.pinpoint.profiler.context.MockTraceContextFactory; -import com.navercorp.pinpoint.profiler.context.id.IdGenerator; -import com.navercorp.pinpoint.profiler.context.module.DefaultApplicationContext; -import com.navercorp.pinpoint.profiler.context.provider.sampler.SamplerConfig; -import com.navercorp.pinpoint.profiler.sampler.CountingSamplerFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; -import com.navercorp.pinpoint.bootstrap.context.Trace; -import com.navercorp.pinpoint.profiler.context.id.DefaultTraceId; -import com.navercorp.pinpoint.profiler.context.id.TransactionCounter; -import org.mockito.Mockito; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author HyunGil Jeong @@ -65,7 +64,7 @@ public class ActiveTraceRepositoryTest { private DefaultApplicationContext applicationContext; - @Before + @BeforeEach public void setUp() { ProfilerConfig profilerConfig = Mockito.spy(new DefaultProfilerConfig()); @@ -81,7 +80,7 @@ public void setUp() { this.activeTraceRepository = applicationContext.getInjector().getInstance(ActiveTraceRepository.class); } - @After + @AfterEach public void tearDown() throws Exception { if (applicationContext != null) { applicationContext.close(); @@ -92,8 +91,7 @@ public void tearDown() throws Exception { public void verifyActiveTraceCollectionAndTransactionCount() throws Exception { // Given final int newTransactionCount = 50; - @SuppressWarnings("unused") - final int expectedSampledNewCount = newTransactionCount / SAMPLING_RATE + (newTransactionCount % SAMPLING_RATE > 0 ? 1 : 0); + @SuppressWarnings("unused") final int expectedSampledNewCount = newTransactionCount / SAMPLING_RATE + (newTransactionCount % SAMPLING_RATE > 0 ? 1 : 0); final int expectedUnsampledNewCount = newTransactionCount - expectedSampledNewCount; final int expectedSampledContinuationCount = 20; final int expectedUnsampledContinuationCount = 30; @@ -127,7 +125,7 @@ public void verifyActiveTraceCollectionAndTransactionCount() throws Exception { assertEquals(expectedSampledContinuationCount, transactionCounter.getSampledContinuationCount()); assertEquals(expectedUnsampledContinuationCount, transactionCounter.getUnSampledContinuationCount()); assertEquals(expectedTotalTransactionCount, transactionCounter.getTotalTransactionCount()); - + for (ActiveTraceSnapshot activeTraceInfo : activeTraceInfos) { TraceThreadTuple executedTrace = executedTraceMap.get(activeTraceInfo.getLocalTransactionId()); assertEquals(executedTrace.getId(), activeTraceInfo.getLocalTransactionId()); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/compress/GrpcSpanProcessorV2Test.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/compress/GrpcSpanProcessorV2Test.java index 96590688f634..3e6329ea02b1 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/compress/GrpcSpanProcessorV2Test.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/compress/GrpcSpanProcessorV2Test.java @@ -22,14 +22,14 @@ import com.navercorp.pinpoint.grpc.trace.PSpanEvent; import com.navercorp.pinpoint.profiler.context.Span; import com.navercorp.pinpoint.profiler.context.SpanEvent; +import com.navercorp.pinpoint.profiler.context.grpc.GrpcSpanMessageConverter; import com.navercorp.pinpoint.profiler.context.id.DefaultTraceId; import com.navercorp.pinpoint.profiler.context.id.DefaultTraceRoot; import com.navercorp.pinpoint.profiler.context.id.TraceRoot; -import com.navercorp.pinpoint.profiler.context.grpc.GrpcSpanMessageConverter; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.List; @@ -55,12 +55,12 @@ public void preProcess() { List original = factory.getSpanEventList(); factory.shuffle(); - Assert.assertNotEquals(factory.getSpanEventList(), span.getSpanEventList()); + Assertions.assertNotEquals(factory.getSpanEventList(), span.getSpanEventList()); span.setSpanEventList(factory.getSpanEventList()); spanProcessorProtoV2.preProcess(span, PSpan.newBuilder()); - Assert.assertEquals(original, span.getSpanEventList()); + Assertions.assertEquals(original, span.getSpanEventList()); } private Span newSpan() { @@ -96,7 +96,7 @@ public void postProcess() { PSpanEvent pSpanEvent = pSpanEventList.get(i); SpanEvent next = spanEventList.get(i); long startTime = keyStartTime + pSpanEvent.getStartElapsed(); - Assert.assertEquals(startTime, next.getStartTime()); + Assertions.assertEquals(startTime, next.getStartTime()); keyStartTime = startTime; } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/compress/SpanPostProcessorTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/compress/SpanPostProcessorTest.java index cd4baf35cd1d..425af13170af 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/compress/SpanPostProcessorTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/compress/SpanPostProcessorTest.java @@ -17,18 +17,17 @@ package com.navercorp.pinpoint.profiler.context.compress; import com.navercorp.pinpoint.bootstrap.context.TraceId; - import com.navercorp.pinpoint.profiler.context.DefaultSpanChunk; import com.navercorp.pinpoint.profiler.context.SpanChunk; import com.navercorp.pinpoint.profiler.context.SpanEvent; -import com.navercorp.pinpoint.profiler.context.id.DefaultTraceRoot; import com.navercorp.pinpoint.profiler.context.id.DefaultTraceId; +import com.navercorp.pinpoint.profiler.context.id.DefaultTraceRoot; import com.navercorp.pinpoint.profiler.context.id.TraceRoot; import com.navercorp.pinpoint.thrift.dto.TSpan; import com.navercorp.pinpoint.thrift.dto.TSpanChunk; import com.navercorp.pinpoint.thrift.dto.TSpanEvent; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -51,7 +50,7 @@ public void postProcess1() { try { SpanChunk spanChunk = new DefaultSpanChunk(internalTraceId, new ArrayList()); spanChunkPostProcessor.postProcess(spanChunk, tSpanChunk); - Assert.fail(); + Assertions.fail(); } catch (Exception ignored) { } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/config/DefaultContextConfigTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/config/DefaultContextConfigTest.java index f0a78de99b58..05cc57fba65c 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/config/DefaultContextConfigTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/config/DefaultContextConfigTest.java @@ -17,10 +17,10 @@ package com.navercorp.pinpoint.profiler.context.config; import com.navercorp.pinpoint.bootstrap.config.util.ValueAnnotationProcessor; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -39,8 +39,8 @@ public void ioBuffering_test() { ContextConfig contextConfig = new DefaultContextConfig(); processor.process(contextConfig, properties); - Assert.assertEquals(contextConfig.isIoBufferingEnable(), false); - Assert.assertEquals(contextConfig.getIoBufferingBufferSize(), 30); + Assertions.assertEquals(contextConfig.isIoBufferingEnable(), false); + Assertions.assertEquals(contextConfig.getIoBufferingBufferSize(), 30); } @Test @@ -52,8 +52,8 @@ public void ioBuffering_default() { ContextConfig contextConfig = new DefaultContextConfig(); processor.process(contextConfig, properties); - Assert.assertEquals(contextConfig.isIoBufferingEnable(), true); - Assert.assertEquals(contextConfig.getIoBufferingBufferSize(), 10); + Assertions.assertEquals(contextConfig.isIoBufferingEnable(), true); + Assertions.assertEquals(contextConfig.getIoBufferingBufferSize(), 10); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/ClassNameThrowableMatcherTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/ClassNameThrowableMatcherTest.java index afd0a6d96a87..dd68d5214599 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/ClassNameThrowableMatcherTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/ClassNameThrowableMatcherTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.profiler.context.errorhandler; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -27,12 +27,12 @@ public class ClassNameThrowableMatcherTest { @Test public void match() { ThrowableMatcher matcher = new ClassNameThrowableMatcher(new String[]{RuntimeException.class.getName()}); - Assert.assertTrue(matcher.match(RuntimeException.class)); + Assertions.assertTrue(matcher.match(RuntimeException.class)); } @Test public void match_fail() { ThrowableMatcher matcher = new ClassNameThrowableMatcher(new String[]{RuntimeException.class.getName()}); - Assert.assertFalse(matcher.match(Exception.class)); + Assertions.assertFalse(matcher.match(Exception.class)); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/ContainsMessageMatcherTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/ContainsMessageMatcherTest.java index 49615d24bab4..a3dd31cdc966 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/ContainsMessageMatcherTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/ContainsMessageMatcherTest.java @@ -16,9 +16,8 @@ package com.navercorp.pinpoint.profiler.context.errorhandler; -import org.junit.Assert; -import org.junit.Test; - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -29,8 +28,8 @@ public class ContainsMessageMatcherTest { public void match() { MessageMatcher matcher = new ContainsMessageMatcher(new String[] {"error"}); - Assert.assertTrue(matcher.match("aa error bb")); + Assertions.assertTrue(matcher.match("aa error bb")); - Assert.assertFalse(matcher.match("success")); + Assertions.assertFalse(matcher.match("success")); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/DefaultErrorHandlerTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/DefaultErrorHandlerTest.java index cd59d6a5f79f..5fb815b22eff 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/DefaultErrorHandlerTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/DefaultErrorHandlerTest.java @@ -1,21 +1,20 @@ package com.navercorp.pinpoint.profiler.context.errorhandler; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class DefaultErrorHandlerTest { - @Test public void handleError() { - ThrowableMatcher classNameMatcher = new ClassNameThrowableMatcher(new String[] {"java.lang.RuntimeException"}); - MessageMatcher messageMatcher = new ContainsMessageMatcher(new String[] {"abc"}); + ThrowableMatcher classNameMatcher = new ClassNameThrowableMatcher(new String[]{"java.lang.RuntimeException"}); + MessageMatcher messageMatcher = new ContainsMessageMatcher(new String[]{"abc"}); IgnoreErrorHandler errorHandler = new DefaultIgnoreErrorHandler("testHandler", classNameMatcher, messageMatcher); - Assert.assertTrue(errorHandler.handleError(new RuntimeException("error abc"))); + Assertions.assertTrue(errorHandler.handleError(new RuntimeException("error abc"))); - Assert.assertFalse(errorHandler.handleError(new RuntimeException("success"))); + Assertions.assertFalse(errorHandler.handleError(new RuntimeException("success"))); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/DescriptorParserTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/DescriptorParserTest.java index 86a15770363c..8364b52fbaf1 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/DescriptorParserTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/DescriptorParserTest.java @@ -2,8 +2,8 @@ import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfigLoader; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.sql.SQLException; import java.util.HashMap; @@ -21,16 +21,16 @@ public void parse() { DescriptorParser parser = new DescriptorParser(map); List descriptorList = parser.parse(); - Assert.assertEquals(descriptorList.size(), 1); + Assertions.assertEquals(descriptorList.size(), 1); ErrorHandlerBuilder builder = new ErrorHandlerBuilder(descriptorList); IgnoreErrorHandler errorHandler = builder.build(); - Assert.assertTrue(errorHandler.handleError(new RuntimeException(" error "))); + Assertions.assertTrue(errorHandler.handleError(new RuntimeException(" error "))); - Assert.assertFalse(errorHandler.handleError(new RuntimeException(" success"))); - Assert.assertFalse(errorHandler.handleError(new SQLException(" success"))); - Assert.assertFalse(errorHandler.handleError(new SQLException(" error"))); + Assertions.assertFalse(errorHandler.handleError(new RuntimeException(" success"))); + Assertions.assertFalse(errorHandler.handleError(new SQLException(" success"))); + Assertions.assertFalse(errorHandler.handleError(new SQLException(" error"))); } @Test @@ -44,8 +44,8 @@ public void parse_message_regex_test() { Map errorHandlerProperties = config.readPattern(OptionKey.PATTERN_REGEX); - Assert.assertEquals(errorHandlerProperties.get(OptionKey.getClassName(errorHandlerId)), "java.lang.RuntimeException"); - Assert.assertEquals(errorHandlerProperties.get(OptionKey.getExceptionMessageContains(errorHandlerId)), "test"); + Assertions.assertEquals(errorHandlerProperties.get(OptionKey.getClassName(errorHandlerId)), "java.lang.RuntimeException"); + Assertions.assertEquals(errorHandlerProperties.get(OptionKey.getExceptionMessageContains(errorHandlerId)), "test"); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/ErrorHandlerBuilderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/ErrorHandlerBuilderTest.java index a36ce0689dcd..a036984d4f81 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/ErrorHandlerBuilderTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/ErrorHandlerBuilderTest.java @@ -1,9 +1,9 @@ package com.navercorp.pinpoint.profiler.context.errorhandler; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.sql.SQLException; import java.util.Collections; @@ -18,7 +18,7 @@ public void build_nested_parent() { // nested & parent Exception exception = new Exception(new NullPointerException()); - Assert.assertTrue(errorHandler.handleError(exception)); + Assertions.assertTrue(errorHandler.handleError(exception)); } @@ -29,7 +29,7 @@ public void build_nested_parent_not_error() { // nested & parent Exception exception = new Exception(new Exception()); - Assert.assertFalse(errorHandler.handleError(exception)); + Assertions.assertFalse(errorHandler.handleError(exception)); } @Test @@ -39,7 +39,7 @@ public void build_nested() { // nested Exception exception = new Exception(new RuntimeException()); - Assert.assertTrue(errorHandler.handleError(exception)); + Assertions.assertTrue(errorHandler.handleError(exception)); } @Test @@ -49,7 +49,7 @@ public void build_parent() { // parent Exception exception = new IllegalArgumentException(new Exception()); - Assert.assertTrue(errorHandler.handleError(exception)); + Assertions.assertTrue(errorHandler.handleError(exception)); } @Test @@ -59,7 +59,7 @@ public void build_parent2() { // parent Exception exception = new SQLException(new Exception()); - Assert.assertFalse(errorHandler.handleError(exception)); + Assertions.assertFalse(errorHandler.handleError(exception)); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/NestedErrorHandlerTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/NestedErrorHandlerTest.java index 26c3d20c53cf..9d3439756a7e 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/NestedErrorHandlerTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/NestedErrorHandlerTest.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.profiler.context.errorhandler; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.sql.SQLException; @@ -17,9 +17,9 @@ public void handleError() { SQLException sqlException = new SQLException("sql error"); Exception rootException = new RuntimeException("nested error ", sqlException); // fail - Assert.assertFalse(errorHandler.handleError(rootException)); + Assertions.assertFalse(errorHandler.handleError(rootException)); // success - Assert.assertTrue(nestedErrorHandler.handleError(rootException)); + Assertions.assertTrue(nestedErrorHandler.handleError(rootException)); } @@ -33,7 +33,7 @@ public void handleError_nested_not_error() { SQLException sqlException = new SQLException("sql error"); Exception rootException = new RuntimeException("nested error ", sqlException); // not found - Assert.assertFalse(nestedErrorHandler.handleError(rootException)); + Assertions.assertFalse(nestedErrorHandler.handleError(rootException)); } @@ -46,7 +46,7 @@ public void handleError_nested_not_error() { // // NestedErrorHandler errorHandler = new NestedErrorHandler(new BypassErrorHandler()); // -// Assert.assertFalse(errorHandler.handleError(root)); +// Assertions.assertFalse(errorHandler.handleError(root)); // // success // // } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/OptionKeyTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/OptionKeyTest.java index cee27c2eb76b..30ab815979c1 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/OptionKeyTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/OptionKeyTest.java @@ -3,10 +3,10 @@ import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfigLoader; import com.navercorp.pinpoint.profiler.context.DefaultAsyncContext; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Map; import java.util.Properties; @@ -17,14 +17,14 @@ public class OptionKeyTest { @Test public void getKey() { String abc = OptionKey.getKey("handlerId", OptionKey.CLASSNAME); - Assert.assertEquals("profiler.ignore-error-handler.handlerId.class-name", abc); + Assertions.assertEquals("profiler.ignore-error-handler.handlerId.class-name", abc); } @Test public void getHandlerId() { String abc = OptionKey.getKey("handlerId", OptionKey.CLASSNAME); String handlerId = OptionKey.parseHandlerId(abc); - Assert.assertEquals("handlerId", handlerId); + Assertions.assertEquals("handlerId", handlerId); } @Test @@ -34,7 +34,7 @@ public void readPattern() { ProfilerConfig config = ProfilerConfigLoader.load(properties); Map kv = config.readPattern(OptionKey.PATTERN_REGEX); - Assert.assertEquals(1, kv.size()); - Assert.assertEquals("java.lang.RuntimeException", kv.get(OptionKey.getClassName("handler"))); + Assertions.assertEquals(1, kv.size()); + Assertions.assertEquals("java.lang.RuntimeException", kv.get(OptionKey.getClassName("handler"))); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/ParentClassThrowableMatcherTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/ParentClassThrowableMatcherTest.java index e1aa261f454c..4742aca29c4d 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/ParentClassThrowableMatcherTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/errorhandler/ParentClassThrowableMatcherTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.profiler.context.errorhandler; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.sql.SQLException; @@ -32,11 +32,11 @@ public static class SQLExceptionEx extends SQLException { @Test public void match() { - - ThrowableMatcher classNameMatcher = new ClassNameThrowableMatcher(new String[] {SQLException.class.getName()}); + + ThrowableMatcher classNameMatcher = new ClassNameThrowableMatcher(new String[]{SQLException.class.getName()}); ThrowableMatcher matcher = new ParentClassThrowableMatcher(classNameMatcher); - Assert.assertTrue(matcher.match(SQLExceptionEx.class)); + Assertions.assertTrue(matcher.match(SQLExceptionEx.class)); } @@ -44,10 +44,10 @@ public void match() { @Test public void match_fail() { - ThrowableMatcher classNameMatcher = new ClassNameThrowableMatcher(new String[] {RuntimeException.class.getName()}); + ThrowableMatcher classNameMatcher = new ClassNameThrowableMatcher(new String[]{RuntimeException.class.getName()}); ThrowableMatcher matcher = new ParentClassThrowableMatcher(classNameMatcher); - Assert.assertFalse(matcher.match(SQLExceptionEx.class)); + Assertions.assertFalse(matcher.match(SQLExceptionEx.class)); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/grpc/GrpcAnnotationValueMapperTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/grpc/GrpcAnnotationValueMapperTest.java index 5c7b5c1941d7..b4b07fb2ef5b 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/grpc/GrpcAnnotationValueMapperTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/grpc/GrpcAnnotationValueMapperTest.java @@ -29,12 +29,13 @@ import com.navercorp.pinpoint.grpc.trace.PLongIntIntByteByteStringValue; import com.navercorp.pinpoint.grpc.trace.PStringStringValue; import com.navercorp.pinpoint.profiler.context.annotation.Annotations; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Objects; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; /** * @author Woonduk Kang(emeroad) @@ -105,8 +106,8 @@ public void buildPAnnotationValue_IntString() { PAnnotationValue container = mapper.buildPAnnotationValue(Annotations.of(1, intStringValue)); PIntStringValue pAnnotation = container.getIntStringValue(); - Assert.assertEquals(pAnnotation.getIntValue(), 1); - Assert.assertEquals(pAnnotation.getStringValue().getValue(), "2"); + Assertions.assertEquals(pAnnotation.getIntValue(), 1); + Assertions.assertEquals(pAnnotation.getStringValue().getValue(), "2"); } @@ -117,8 +118,8 @@ public void buildPAnnotationValue_StringString() { PAnnotationValue container = mapper.buildPAnnotationValue(Annotations.of(1, intStringValue)); PStringStringValue pAnnotation = container.getStringStringValue(); - Assert.assertEquals(pAnnotation.getStringValue1().getValue(), "1"); - Assert.assertEquals(pAnnotation.getStringValue2().getValue(), "2"); + Assertions.assertEquals(pAnnotation.getStringValue1().getValue(), "1"); + Assertions.assertEquals(pAnnotation.getStringValue2().getValue(), "2"); } @@ -129,9 +130,9 @@ public void buildPAnnotationValue_IntStringStringValue() { PAnnotationValue container = mapper.buildPAnnotationValue(Annotations.of(1, intStringValue)); PIntStringStringValue pAnnotation = container.getIntStringStringValue(); - Assert.assertEquals(pAnnotation.getIntValue(), 1); - Assert.assertEquals(pAnnotation.getStringValue1().getValue(), "2"); - Assert.assertEquals(pAnnotation.getStringValue2().getValue(), "3"); + Assertions.assertEquals(pAnnotation.getIntValue(), 1); + Assertions.assertEquals(pAnnotation.getStringValue1().getValue(), "2"); + Assertions.assertEquals(pAnnotation.getStringValue2().getValue(), "3"); } @Test @@ -142,12 +143,12 @@ public void buildPAnnotationValue_LongIntIntByteByteStringValue() { PAnnotationValue container = mapper.buildPAnnotationValue(Annotations.of(1, intStringValue)); PLongIntIntByteByteStringValue pAnnotation = container.getLongIntIntByteByteStringValue(); - Assert.assertEquals(pAnnotation.getLongValue(), 1); - Assert.assertEquals(pAnnotation.getIntValue1(), 2); - Assert.assertEquals(pAnnotation.getIntValue2(), 3); - Assert.assertEquals(pAnnotation.getByteValue1(), 4); - Assert.assertEquals(pAnnotation.getByteValue2(), 5); - Assert.assertEquals(pAnnotation.getStringValue().getValue(), "6"); + Assertions.assertEquals(pAnnotation.getLongValue(), 1); + Assertions.assertEquals(pAnnotation.getIntValue1(), 2); + Assertions.assertEquals(pAnnotation.getIntValue2(), 3); + Assertions.assertEquals(pAnnotation.getByteValue1(), 4); + Assertions.assertEquals(pAnnotation.getByteValue2(), 5); + Assertions.assertEquals(pAnnotation.getStringValue().getValue(), "6"); } @Test @@ -158,9 +159,9 @@ public void buildPAnnotationValue_IntBooleanIntBooleanValue() { PAnnotationValue container = mapper.buildPAnnotationValue(Annotations.of(1, intStringValue)); PIntBooleanIntBooleanValue pAnnotation = container.getIntBooleanIntBooleanValue(); - Assert.assertEquals(pAnnotation.getIntValue1(), 1); - Assert.assertEquals(pAnnotation.getBoolValue1(), true); - Assert.assertEquals(pAnnotation.getIntValue2(), 3); - Assert.assertEquals(pAnnotation.getBoolValue2(), false); + Assertions.assertEquals(pAnnotation.getIntValue1(), 1); + Assertions.assertEquals(pAnnotation.getBoolValue1(), true); + Assertions.assertEquals(pAnnotation.getIntValue2(), 3); + Assertions.assertEquals(pAnnotation.getBoolValue2(), false); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/grpc/GrpcUriStatMessageConverterTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/grpc/GrpcUriStatMessageConverterTest.java index 8b4ac7bd369c..633b726b22f6 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/grpc/GrpcUriStatMessageConverterTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/grpc/GrpcUriStatMessageConverterTest.java @@ -22,9 +22,8 @@ import com.navercorp.pinpoint.grpc.trace.PUriHistogram; import com.navercorp.pinpoint.profiler.monitor.metric.uri.AgentUriStatData; import com.navercorp.pinpoint.profiler.monitor.metric.uri.UriStatInfo; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -82,15 +81,15 @@ private void assertData(List uriStatInfoList, List ea } private void assertData(List expected, PUriHistogram actual) { - Assert.assertEquals(expected.size(), actual.getCount()); - Assert.assertEquals(getMax(expected), actual.getMax()); - Assert.assertEquals(new Double(getAvg(expected)).longValue(), new Double(actual.getAvg()).longValue()); + Assertions.assertEquals(expected.size(), actual.getCount()); + Assertions.assertEquals(getMax(expected), actual.getMax()); + Assertions.assertEquals(new Double(getAvg(expected)).longValue(), new Double(actual.getAvg()).longValue()); List histogramList = actual.getHistogramList(); for (int i = 0; i < histogramList.size(); i++) { UriStatHistogramBucket valueByIndex = UriStatHistogramBucket.getValueByIndex(i); int bucketCount = getBucketCount(expected, valueByIndex); - Assert.assertEquals(new Integer(bucketCount), histogramList.get(i)); + Assertions.assertEquals(new Integer(bucketCount), histogramList.get(i)); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/grpc/config/GrpcTransportConfigTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/grpc/config/GrpcTransportConfigTest.java index 79da1b192f8a..fd1710f5c188 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/grpc/config/GrpcTransportConfigTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/grpc/config/GrpcTransportConfigTest.java @@ -17,11 +17,11 @@ package com.navercorp.pinpoint.profiler.context.grpc.config; import com.navercorp.pinpoint.common.util.PropertyUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Properties; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author jaehong.kim diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/id/DefaultTransactionCounterTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/id/DefaultTransactionCounterTest.java index 382469fed2b9..1269611d4991 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/id/DefaultTransactionCounterTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/id/DefaultTransactionCounterTest.java @@ -16,10 +16,10 @@ package com.navercorp.pinpoint.profiler.context.id; -import static org.junit.Assert.*; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; -import org.junit.Before; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author HyunGil Jeong @@ -29,7 +29,7 @@ public class DefaultTransactionCounterTest { private AtomicIdGenerator idGenerator; private TransactionCounter transactionCounter; - @Before + @BeforeEach public void setUp() throws Exception { this.idGenerator = new AtomicIdGenerator(); this.transactionCounter = new DefaultTransactionCounter(this.idGenerator); @@ -207,10 +207,10 @@ public void testTotalTransaction() { for (int i = 0; i < expectedUnsampledContinuationCount; i++) { this.idGenerator.nextContinuedDisabledId(); } - for(int i = 0; i < expectedSkippedNewCount; i++) { + for (int i = 0; i < expectedSkippedNewCount; i++) { this.idGenerator.nextSkippedId(); } - for(int i = 0; i < expectedSkippedContinuationCount; i++) { + for (int i = 0; i < expectedSkippedContinuationCount; i++) { this.idGenerator.nextContinuedSkippedId(); } final long actualSampledNewCount = this.transactionCounter.getSampledNewCount(); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/javamodule/PackageUtilsTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/javamodule/PackageUtilsTest.java index 6515913a907d..0d07e3a4bc60 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/javamodule/PackageUtilsTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/javamodule/PackageUtilsTest.java @@ -17,9 +17,8 @@ package com.navercorp.pinpoint.profiler.context.javamodule; import com.navercorp.pinpoint.common.util.ClassUtils; -import org.junit.Assert; -import org.junit.Test; - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -32,6 +31,6 @@ public void getPackageName() { String internalName = ClassUtils.toInternalName(this.getClass().getName()); String packageName = PackageUtils.getPackageNameFromInternalName(internalName); - Assert.assertEquals("com.navercorp.pinpoint.profiler.context.javamodule", packageName); + Assertions.assertEquals("com.navercorp.pinpoint.profiler.context.javamodule", packageName); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/module/DefaultApplicationContextTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/module/DefaultApplicationContextTest.java index 3b7f509efe0b..f3ff0c9a3049 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/module/DefaultApplicationContextTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/module/DefaultApplicationContextTest.java @@ -29,8 +29,8 @@ import com.navercorp.pinpoint.profiler.AgentInfoSender; import com.navercorp.pinpoint.profiler.interceptor.registry.InterceptorRegistryBinder; import com.navercorp.pinpoint.profiler.util.TestInterceptorRegistryBinder; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.lang.annotation.Annotation; import java.lang.instrument.Instrumentation; @@ -60,12 +60,12 @@ public void test() { if (isPinpointBinding(key)) { boolean isSingletonScoped = Scopes.isSingleton(binding); - Assert.assertTrue("Binding " + key + " is not Singleton scoped", isSingletonScoped); + Assertions.assertTrue(isSingletonScoped, "Binding " + key + " is not Singleton scoped"); } } AgentInfoSender instance1 = injector.getInstance(AgentInfoSender.class); AgentInfoSender instance2 = injector.getInstance(AgentInfoSender.class); - Assert.assertSame(instance1, instance2); + Assertions.assertSame(instance1, instance2); } finally { applicationContext.close(); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/module/ModuleFactoryResolverTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/module/ModuleFactoryResolverTest.java index d24789c9644c..90f38f30a7ce 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/module/ModuleFactoryResolverTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/module/ModuleFactoryResolverTest.java @@ -18,8 +18,8 @@ import com.google.inject.Module; import com.navercorp.pinpoint.bootstrap.AgentOption; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Taejin Koo @@ -31,7 +31,7 @@ public void test() { ModuleFactoryResolver provider = new DefaultModuleFactoryResolver(TestModuleFactory.class.getName()); ModuleFactory moduleFactory = provider.resolve(); - Assert.assertEquals(TestModuleFactory.class, moduleFactory.getClass()); + Assertions.assertEquals(TestModuleFactory.class, moduleFactory.getClass()); } @Test @@ -39,13 +39,15 @@ public void test2() { ModuleFactoryResolver provider = new DefaultModuleFactoryResolver(); ModuleFactory moduleFactory = provider.resolve(); - Assert.assertEquals(ApplicationContextModuleFactory.class, moduleFactory.getClass()); + Assertions.assertEquals(ApplicationContextModuleFactory.class, moduleFactory.getClass()); } - @Test(expected = Exception.class) + @Test public void test3() { - ModuleFactoryResolver provider = new DefaultModuleFactoryResolver("abcde"); - provider.resolve(); + Assertions.assertThrows(Exception.class, () -> { + ModuleFactoryResolver provider = new DefaultModuleFactoryResolver("abcde"); + provider.resolve(); + }); } public static class TestModuleFactory implements ModuleFactory { diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/monitor/DataSourceMonitorWrapperTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/monitor/DataSourceMonitorWrapperTest.java index 50728ac34382..ece83cb7589a 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/monitor/DataSourceMonitorWrapperTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/monitor/DataSourceMonitorWrapperTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.bootstrap.plugin.monitor.DataSourceMonitor; import com.navercorp.pinpoint.common.trace.ServiceType; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import static org.mockito.Mockito.when; @@ -34,6 +34,6 @@ public void getServiceType() throws Exception { when(mock.getServiceType()).thenReturn(null); DataSourceMonitorWrapper dataSourceMonitorWrapper = new DataSourceMonitorWrapper(1, mock); - Assert.assertEquals(ServiceType.UNKNOWN, dataSourceMonitorWrapper.getServiceType()); + Assertions.assertEquals(ServiceType.UNKNOWN, dataSourceMonitorWrapper.getServiceType()); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/monitor/DefaultJdbcUrlParsingServiceTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/monitor/DefaultJdbcUrlParsingServiceTest.java index 07ebf234336f..7bb176f76bfd 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/monitor/DefaultJdbcUrlParsingServiceTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/monitor/DefaultJdbcUrlParsingServiceTest.java @@ -18,11 +18,11 @@ import com.navercorp.pinpoint.bootstrap.context.DatabaseInfo; import com.navercorp.pinpoint.bootstrap.plugin.jdbc.DefaultDatabaseInfo; -import com.navercorp.pinpoint.bootstrap.plugin.jdbc.UnKnownDatabaseInfo; import com.navercorp.pinpoint.bootstrap.plugin.jdbc.JdbcUrlParserV2; +import com.navercorp.pinpoint.bootstrap.plugin.jdbc.UnKnownDatabaseInfo; import com.navercorp.pinpoint.common.trace.ServiceType; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -41,15 +41,15 @@ public void cacheTest1() { JdbcUrlParsingService jdbcUrlParsingService = new DefaultJdbcUrlParsingService(Arrays.asList(jdbcUrlParser)); DatabaseInfo databaseInfo = jdbcUrlParsingService.getDatabaseInfo(MYSQL_JDBC_URL); - Assert.assertNull(databaseInfo); + Assertions.assertNull(databaseInfo); DatabaseInfo parsingResult = jdbcUrlParsingService.parseJdbcUrl(ServiceType.TEST, MYSQL_JDBC_URL); - Assert.assertTrue(parsingResult.isParsingComplete()); + Assertions.assertTrue(parsingResult.isParsingComplete()); DatabaseInfo cache1 = jdbcUrlParsingService.getDatabaseInfo(MYSQL_JDBC_URL); DatabaseInfo cache2 = jdbcUrlParsingService.getDatabaseInfo(MYSQL_JDBC_URL); - Assert.assertTrue(parsingResult == cache1 && parsingResult == cache2); + Assertions.assertTrue(parsingResult == cache1 && parsingResult == cache2); } @Test @@ -57,12 +57,12 @@ public void cacheTest2() { JdbcUrlParsingService jdbcUrlParsingService = new DefaultJdbcUrlParsingService(Arrays.asList(jdbcUrlParser)); DatabaseInfo parsingResult = jdbcUrlParsingService.parseJdbcUrl(ServiceType.TEST, MYSQL_JDBC_URL); - Assert.assertTrue(parsingResult.isParsingComplete()); + Assertions.assertTrue(parsingResult.isParsingComplete()); DatabaseInfo cache1 = jdbcUrlParsingService.getDatabaseInfo(ServiceType.TEST, MYSQL_JDBC_URL); DatabaseInfo cache2 = jdbcUrlParsingService.getDatabaseInfo(ServiceType.UNKNOWN_DB, MYSQL_JDBC_URL); - Assert.assertNotEquals(cache1, cache2); + Assertions.assertNotEquals(cache1, cache2); } private static class MockJdbcUrlParser implements JdbcUrlParserV2 { diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/monitor/DefaultPluginMonitorContextTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/monitor/DefaultPluginMonitorContextTest.java index e92d1c7f456b..2774968d7c27 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/monitor/DefaultPluginMonitorContextTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/monitor/DefaultPluginMonitorContextTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.bootstrap.plugin.monitor.DataSourceMonitor; import com.navercorp.pinpoint.common.trace.ServiceType; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Random; @@ -35,16 +35,16 @@ public void registerTest1() { int remainingCapacity = dataSourceMonitorRegistryService.getRemainingIdNumber(); MockDataSourceMonitor[] mockDataSourceMonitors = createMockDataSourceMonitor(dataSourceMonitorRegistryService, remainingCapacity); - Assert.assertEquals(remainingCapacity, dataSourceMonitorRegistryService.getPluginMonitorWrapperList().size()); + Assertions.assertEquals(remainingCapacity, dataSourceMonitorRegistryService.getPluginMonitorWrapperList().size()); addOverDataSourceMonitor(dataSourceMonitorRegistryService); - Assert.assertEquals(remainingCapacity, dataSourceMonitorRegistryService.getPluginMonitorWrapperList().size()); + Assertions.assertEquals(remainingCapacity, dataSourceMonitorRegistryService.getPluginMonitorWrapperList().size()); for (MockDataSourceMonitor mockMonitor : mockDataSourceMonitors) { boolean unregister = dataSourceMonitorRegistryService.unregister(mockMonitor); - Assert.assertTrue(unregister); + Assertions.assertTrue(unregister); } - Assert.assertEquals(0, dataSourceMonitorRegistryService.getPluginMonitorWrapperList().size()); + Assertions.assertEquals(0, dataSourceMonitorRegistryService.getPluginMonitorWrapperList().size()); } @@ -54,15 +54,15 @@ public void registerTest2() { int remainingCapacity = dataSourceMonitorRegistryService.getRemainingIdNumber(); MockDataSourceMonitor[] mockDataSourceMonitors = createMockDataSourceMonitor(dataSourceMonitorRegistryService, remainingCapacity); - Assert.assertEquals(remainingCapacity, dataSourceMonitorRegistryService.getPluginMonitorWrapperList().size()); + Assertions.assertEquals(remainingCapacity, dataSourceMonitorRegistryService.getPluginMonitorWrapperList().size()); addOverDataSourceMonitor(dataSourceMonitorRegistryService); - Assert.assertEquals(remainingCapacity, dataSourceMonitorRegistryService.getPluginMonitorWrapperList().size()); + Assertions.assertEquals(remainingCapacity, dataSourceMonitorRegistryService.getPluginMonitorWrapperList().size()); for (MockDataSourceMonitor mockMonitor : mockDataSourceMonitors) { mockMonitor.close(); } - Assert.assertEquals(0, dataSourceMonitorRegistryService.getPluginMonitorWrapperList().size()); + Assertions.assertEquals(0, dataSourceMonitorRegistryService.getPluginMonitorWrapperList().size()); } private MockDataSourceMonitor[] createMockDataSourceMonitor(DataSourceMonitorRegistryService dataSourceMonitorRegistry, int remainingCapacity) { @@ -70,7 +70,7 @@ private MockDataSourceMonitor[] createMockDataSourceMonitor(DataSourceMonitorReg for (int i = 0; i < remainingCapacity; i++) { MockDataSourceMonitor mock = new MockDataSourceMonitor(); boolean register = dataSourceMonitorRegistry.register(mock); - Assert.assertTrue(register); + Assertions.assertTrue(register); mockDataSourceMonitors[i] = mock; } return mockDataSourceMonitors; @@ -82,7 +82,7 @@ private void addOverDataSourceMonitor(DataSourceMonitorRegistryService dataSourc for (int i = 0; i < additionalRegisterCount; i++) { MockDataSourceMonitor mock = new MockDataSourceMonitor(); boolean register = dataSourceMonitorRegistry.register(mock); - Assert.assertFalse(register); + Assertions.assertFalse(register); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/monitor/metric/CustomMetricRegistryServiceTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/monitor/metric/CustomMetricRegistryServiceTest.java index dd3c3509ab8c..bcca16579296 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/monitor/metric/CustomMetricRegistryServiceTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/monitor/metric/CustomMetricRegistryServiceTest.java @@ -22,9 +22,8 @@ import com.navercorp.pinpoint.bootstrap.plugin.monitor.metric.IntGauge; import com.navercorp.pinpoint.bootstrap.plugin.monitor.metric.LongCounter; import com.navercorp.pinpoint.bootstrap.plugin.monitor.metric.LongGauge; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Map; import java.util.Random; @@ -45,22 +44,22 @@ public void intCountMetricTest() { int value = random.nextInt(100); CustomMetric customMetric = createAndAddFixedValueMetric(customMetricRegistryService, DEFAULT_TEST_METRIC_NAME, value, IntCounter.class); - Assert.assertNotNull(customMetric); + Assertions.assertNotNull(customMetric); Map customMetricMap = customMetricRegistryService.getCustomMetricMap(); - Assert.assertEquals(1, customMetricMap.size()); + Assertions.assertEquals(1, customMetricMap.size()); CustomMetricWrapper customMetricWrapper = customMetricMap.get(DEFAULT_TEST_METRIC_NAME); - Assert.assertTrue(customMetricWrapper instanceof IntCounterWrapper); + Assertions.assertTrue(customMetricWrapper instanceof IntCounterWrapper); IntCounterWrapper intCountMetricWrapper = (IntCounterWrapper) customMetricWrapper; - Assert.assertEquals(value, intCountMetricWrapper.getValue()); + Assertions.assertEquals(value, intCountMetricWrapper.getValue()); boolean unregister = customMetricRegistryService.unregister((IntCounter) customMetric); - Assert.assertTrue(unregister); + Assertions.assertTrue(unregister); customMetricMap = customMetricRegistryService.getCustomMetricMap(); - Assert.assertEquals(0, customMetricMap.size()); + Assertions.assertEquals(0, customMetricMap.size()); } @Test @@ -70,22 +69,22 @@ public void longCountMetricTest() { long value = random.nextLong(); CustomMetric customMetric = createAndAddFixedValueMetric(customMetricRegistryService, DEFAULT_TEST_METRIC_NAME, value, LongCounter.class); - Assert.assertNotNull(customMetric); + Assertions.assertNotNull(customMetric); Map customMetricMap = customMetricRegistryService.getCustomMetricMap(); - Assert.assertEquals(1, customMetricMap.size()); + Assertions.assertEquals(1, customMetricMap.size()); CustomMetricWrapper customMetricWrapper = customMetricMap.get(DEFAULT_TEST_METRIC_NAME); - Assert.assertTrue(customMetricWrapper instanceof LongCounterWrapper); + Assertions.assertTrue(customMetricWrapper instanceof LongCounterWrapper); LongCounterWrapper longCountMetricWrapper = (LongCounterWrapper) customMetricWrapper; - Assert.assertEquals(value, longCountMetricWrapper.getValue()); + Assertions.assertEquals(value, longCountMetricWrapper.getValue()); boolean unregister = customMetricRegistryService.unregister((LongCounter) customMetric); - Assert.assertTrue(unregister); + Assertions.assertTrue(unregister); customMetricMap = customMetricRegistryService.getCustomMetricMap(); - Assert.assertEquals(0, customMetricMap.size()); + Assertions.assertEquals(0, customMetricMap.size()); } @@ -96,22 +95,22 @@ public void intGaugeMetricTest() { int value = random.nextInt(100); CustomMetric customMetric = createAndAddFixedValueMetric(customMetricRegistryService, DEFAULT_TEST_METRIC_NAME, value, IntGauge.class); - Assert.assertNotNull(customMetric); + Assertions.assertNotNull(customMetric); Map customMetricMap = customMetricRegistryService.getCustomMetricMap(); - Assert.assertEquals(1, customMetricMap.size()); + Assertions.assertEquals(1, customMetricMap.size()); CustomMetricWrapper customMetricWrapper = customMetricMap.get(DEFAULT_TEST_METRIC_NAME); - Assert.assertTrue(customMetricWrapper instanceof IntGaugeWrapper); + Assertions.assertTrue(customMetricWrapper instanceof IntGaugeWrapper); IntGaugeWrapper intGaugeMetricWrapper = (IntGaugeWrapper) customMetricWrapper; - Assert.assertEquals(value, intGaugeMetricWrapper.getValue()); + Assertions.assertEquals(value, intGaugeMetricWrapper.getValue()); boolean unregister = customMetricRegistryService.unregister((IntGauge) customMetric); - Assert.assertTrue(unregister); + Assertions.assertTrue(unregister); customMetricMap = customMetricRegistryService.getCustomMetricMap(); - Assert.assertEquals(0, customMetricMap.size()); + Assertions.assertEquals(0, customMetricMap.size()); } @@ -122,22 +121,22 @@ public void longGaugeMetricTest() { long value = random.nextLong(); CustomMetric customMetric = createAndAddFixedValueMetric(customMetricRegistryService, DEFAULT_TEST_METRIC_NAME, value, LongGauge.class); - Assert.assertNotNull(customMetric); + Assertions.assertNotNull(customMetric); Map customMetricMap = customMetricRegistryService.getCustomMetricMap(); - Assert.assertEquals(1, customMetricMap.size()); + Assertions.assertEquals(1, customMetricMap.size()); CustomMetricWrapper customMetricWrapper = customMetricMap.get(DEFAULT_TEST_METRIC_NAME); - Assert.assertTrue(customMetricWrapper instanceof LongGaugeWrapper); + Assertions.assertTrue(customMetricWrapper instanceof LongGaugeWrapper); LongGaugeWrapper longGaugeMetricWrapper = (LongGaugeWrapper) customMetricWrapper; - Assert.assertEquals(value, longGaugeMetricWrapper.getValue()); + Assertions.assertEquals(value, longGaugeMetricWrapper.getValue()); boolean unregister = customMetricRegistryService.unregister((LongGauge) customMetric); - Assert.assertTrue(unregister); + Assertions.assertTrue(unregister); customMetricMap = customMetricRegistryService.getCustomMetricMap(); - Assert.assertEquals(0, customMetricMap.size()); + Assertions.assertEquals(0, customMetricMap.size()); } @Test @@ -147,22 +146,22 @@ public void doubleGaugeMetricTest() { double value = random.nextDouble(); CustomMetric customMetric = createAndAddFixedValueMetric(customMetricRegistryService, DEFAULT_TEST_METRIC_NAME, value, DoubleGauge.class); - Assert.assertNotNull(customMetric); + Assertions.assertNotNull(customMetric); Map customMetricMap = customMetricRegistryService.getCustomMetricMap(); - Assert.assertEquals(1, customMetricMap.size()); + Assertions.assertEquals(1, customMetricMap.size()); CustomMetricWrapper customMetricWrapper = customMetricMap.get(DEFAULT_TEST_METRIC_NAME); - Assert.assertTrue(customMetricWrapper instanceof DoubleGaugeWrapper); + Assertions.assertTrue(customMetricWrapper instanceof DoubleGaugeWrapper); DoubleGaugeWrapper doubleGaugeMetricWrapper = (DoubleGaugeWrapper) customMetricWrapper; - Assert.assertEquals(value, doubleGaugeMetricWrapper.getValue(), 0.0); + Assertions.assertEquals(value, doubleGaugeMetricWrapper.getValue(), 0.0); boolean unregister = customMetricRegistryService.unregister((DoubleGauge) customMetric); - Assert.assertTrue(unregister); + Assertions.assertTrue(unregister); customMetricMap = customMetricRegistryService.getCustomMetricMap(); - Assert.assertEquals(0, customMetricMap.size()); + Assertions.assertEquals(0, customMetricMap.size()); } @Test @@ -172,27 +171,27 @@ public void mixedCustomMetricTest() { int intValue = random.nextInt(100); final String intMetricName = "groupName/metricName/int"; CustomMetric intCountMetric = createAndAddFixedValueMetric(customMetricRegistryService, intMetricName, intValue, IntCounter.class); - Assert.assertNotNull(intCountMetric); + Assertions.assertNotNull(intCountMetric); long longValue = random.nextLong(); final String longMetricName = "groupName/metricName/long"; CustomMetric longGaugeMetric = createAndAddFixedValueMetric(customMetricRegistryService, longMetricName, longValue, LongGauge.class); - Assert.assertNotNull(longGaugeMetric); + Assertions.assertNotNull(longGaugeMetric); Map customMetricMap = customMetricRegistryService.getCustomMetricMap(); - Assert.assertEquals(2, customMetricMap.size()); + Assertions.assertEquals(2, customMetricMap.size()); IntCounterWrapper intCountMetricWrapper = (IntCounterWrapper) customMetricMap.get(intMetricName); - Assert.assertEquals(intValue, intCountMetricWrapper.getValue()); + Assertions.assertEquals(intValue, intCountMetricWrapper.getValue()); LongGaugeWrapper longGaugeMetricWrapper = (LongGaugeWrapper) customMetricMap.get(longMetricName); - Assert.assertEquals(longValue, longGaugeMetricWrapper.getValue()); + Assertions.assertEquals(longValue, longGaugeMetricWrapper.getValue()); customMetricRegistryService.unregister((IntCounter) intCountMetric); - Assert.assertEquals(1, customMetricMap.size()); + Assertions.assertEquals(1, customMetricMap.size()); customMetricRegistryService.unregister((LongGauge) longGaugeMetric); - Assert.assertEquals(0, customMetricMap.size()); + Assertions.assertEquals(0, customMetricMap.size()); } @Test @@ -205,9 +204,9 @@ public void limitNumberMetricTest() { for (int i = 0; i < limitIdNumber + 10; i++) { CustomMetric customMetric = createAndAddFixedValueMetric(customMetricRegistryService, "groupName/metricName/label" + i, value, DoubleGauge.class); if (i < limitIdNumber) { - Assert.assertNotNull(customMetric); + Assertions.assertNotNull(customMetric); } else { - Assert.assertNull(customMetric); + Assertions.assertNull(customMetric); } } } @@ -219,16 +218,16 @@ public void illegalMetricNameTest() { int value = random.nextInt(100); CustomMetric customMetric = createAndAddFixedValueMetric(customMetricRegistryService, "abcde", value, DoubleGauge.class); - Assert.assertNull(customMetric); + Assertions.assertNull(customMetric); customMetric = createAndAddFixedValueMetric(customMetricRegistryService, "abcde/abcde", value, DoubleGauge.class); - Assert.assertNull(customMetric); + Assertions.assertNull(customMetric); customMetric = createAndAddFixedValueMetric(customMetricRegistryService, "a@bcd@e/abcde/abcde", value, DoubleGauge.class); - Assert.assertNull(customMetric); + Assertions.assertNull(customMetric); customMetric = createAndAddFixedValueMetric(customMetricRegistryService, "a@bcd@e//abcde", value, DoubleGauge.class); - Assert.assertNull(customMetric); + Assertions.assertNull(customMetric); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/ClientFactoryProviderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/ClientFactoryProviderTest.java index 3947197bd5c4..0f49674dfb5e 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/ClientFactoryProviderTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/ClientFactoryProviderTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.common.util.ByteSizeUnit; import com.navercorp.pinpoint.profiler.context.provider.thrift.AbstractClientFactoryProvider; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Taejin Koo @@ -32,16 +32,16 @@ public void getByteSizeTest() { TestClientFactoryproviderTest testClientFactoryproviderTest = new TestClientFactoryproviderTest(); int byteSize = testClientFactoryproviderTest.getByteSize("2g", defaultSize); - Assert.assertEquals(Integer.MAX_VALUE, byteSize); + Assertions.assertEquals(Integer.MAX_VALUE, byteSize); byteSize = testClientFactoryproviderTest.getByteSize("100m", defaultSize); - Assert.assertEquals(ByteSizeUnit.MEGA_BYTES.toBytesSizeAsInt(100), byteSize); + Assertions.assertEquals(ByteSizeUnit.MEGA_BYTES.toBytesSizeAsInt(100), byteSize); byteSize = testClientFactoryproviderTest.getByteSize("-100", defaultSize); - Assert.assertEquals(defaultSize, byteSize); + Assertions.assertEquals(defaultSize, byteSize); byteSize = testClientFactoryproviderTest.getByteSize("-100m", defaultSize); - Assert.assertEquals(defaultSize, byteSize); + Assertions.assertEquals(defaultSize, byteSize); } private static class TestClientFactoryproviderTest extends AbstractClientFactoryProvider { diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/stat/buffer/BufferMetricProviderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/stat/buffer/BufferMetricProviderTest.java index bc8dbaa8d171..700112863212 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/stat/buffer/BufferMetricProviderTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/stat/buffer/BufferMetricProviderTest.java @@ -19,8 +19,8 @@ import com.google.inject.Provider; import com.navercorp.pinpoint.profiler.monitor.metric.buffer.BufferMetric; import com.navercorp.pinpoint.profiler.monitor.metric.buffer.BufferMetricSnapshot; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -32,6 +32,6 @@ public void get() { Provider provider = new BufferMetricProvider(); BufferMetric bufferMetric = provider.get(); BufferMetricSnapshot snapshot = bufferMetric.getSnapshot(); - Assert.assertEquals(snapshot.getDirectCount(), BufferMetric.UNCOLLECTED_VALUE); + Assertions.assertEquals(snapshot.getDirectCount(), BufferMetric.UNCOLLECTED_VALUE); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/stat/filedescriptor/FileDescriptorMetricProviderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/stat/filedescriptor/FileDescriptorMetricProviderTest.java index 62a056b608b2..3a8ce060b3fa 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/stat/filedescriptor/FileDescriptorMetricProviderTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/stat/filedescriptor/FileDescriptorMetricProviderTest.java @@ -20,8 +20,8 @@ import com.navercorp.pinpoint.common.util.JvmVersion; import com.navercorp.pinpoint.common.util.OsType; import com.navercorp.pinpoint.profiler.context.config.ContextConfig; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; @@ -40,13 +40,13 @@ public void testOracle_LINUX() { FileDescriptorMetricProvider fileDescriptorMetricProvider = new FileDescriptorMetricProvider(config); String metricClassName = fileDescriptorMetricProvider.getMetricClassName(OsType.LINUX, JvmVersion.JAVA_6, JvmType.ORACLE); - Assert.assertEquals(ORACLE_FILE_DESCRIPTOR_METRIC, metricClassName); + Assertions.assertEquals(ORACLE_FILE_DESCRIPTOR_METRIC, metricClassName); String metricClassName2 = fileDescriptorMetricProvider.getMetricClassName(OsType.AIX, JvmVersion.JAVA_6, JvmType.ORACLE); - Assert.assertEquals(ORACLE_FILE_DESCRIPTOR_METRIC, metricClassName2); + Assertions.assertEquals(ORACLE_FILE_DESCRIPTOR_METRIC, metricClassName2); String metricClassName3 = fileDescriptorMetricProvider.getMetricClassName(OsType.BSD, JvmVersion.JAVA_6, JvmType.ORACLE); - Assert.assertEquals(ORACLE_FILE_DESCRIPTOR_METRIC, metricClassName3); + Assertions.assertEquals(ORACLE_FILE_DESCRIPTOR_METRIC, metricClassName3); } @@ -56,7 +56,7 @@ public void testIBM_SOLARIS() { FileDescriptorMetricProvider fileDescriptorMetricProvider = new FileDescriptorMetricProvider(config); String metricClassName = fileDescriptorMetricProvider.getMetricClassName(OsType.SOLARIS, JvmVersion.JAVA_9, JvmType.IBM); - Assert.assertEquals(IBM_FILE_DESCRIPTOR_METRIC, metricClassName); + Assertions.assertEquals(IBM_FILE_DESCRIPTOR_METRIC, metricClassName); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/stat/loadedclass/LoadedClassMetricProviderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/stat/loadedclass/LoadedClassMetricProviderTest.java index 49bf56104d32..a7997b2a83cf 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/stat/loadedclass/LoadedClassMetricProviderTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/stat/loadedclass/LoadedClassMetricProviderTest.java @@ -19,8 +19,8 @@ import com.google.inject.Provider; import com.navercorp.pinpoint.profiler.monitor.metric.loadedclass.LoadedClassMetric; import com.navercorp.pinpoint.profiler.monitor.metric.loadedclass.LoadedClassMetricSnapshot; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class LoadedClassMetricProviderTest { @Test @@ -28,7 +28,7 @@ public void get() { Provider provider = new LoadedClassMetricProvider(); LoadedClassMetric loadedClassMetric = provider.get(); LoadedClassMetricSnapshot snapshot = loadedClassMetric.getSnapshot(); - Assert.assertNotEquals(0, snapshot.getLoadedClassCount()); + Assertions.assertNotEquals(0, snapshot.getLoadedClassCount()); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/stat/totalthread/TotalThreadMetricProviderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/stat/totalthread/TotalThreadMetricProviderTest.java index de90aa2a88a0..4f1f8d9dbcf6 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/stat/totalthread/TotalThreadMetricProviderTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/provider/stat/totalthread/TotalThreadMetricProviderTest.java @@ -19,8 +19,8 @@ import com.google.inject.Provider; import com.navercorp.pinpoint.profiler.monitor.metric.totalthread.TotalThreadMetric; import com.navercorp.pinpoint.profiler.monitor.metric.totalthread.TotalThreadMetricSnapshot; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class TotalThreadMetricProviderTest { @Test @@ -28,6 +28,6 @@ public void get() { Provider provider = new TotalThreadMetricProvider(); TotalThreadMetric totalThreadMetric = provider.get(); TotalThreadMetricSnapshot snapshot = totalThreadMetric.getSnapshot(); - Assert.assertNotEquals(snapshot.getTotalThreadCount(), 0); + Assertions.assertNotEquals(snapshot.getTotalThreadCount(), 0); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/recorder/DefaultSpanRecorderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/recorder/DefaultSpanRecorderTest.java index a571aaf29a92..850f5d7d3099 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/recorder/DefaultSpanRecorderTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/recorder/DefaultSpanRecorderTest.java @@ -25,10 +25,11 @@ import com.navercorp.pinpoint.profiler.context.id.TraceRoot; import com.navercorp.pinpoint.profiler.metadata.SqlMetaDataService; import com.navercorp.pinpoint.profiler.metadata.StringMetaDataService; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -36,7 +37,7 @@ /** * @author Woonduk Kang(emeroad) */ -@RunWith(org.mockito.junit.MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class DefaultSpanRecorderTest { @Mock @@ -61,7 +62,7 @@ public void testRecordApiId() throws Exception { final int API_ID = 1000; recorder.recordApiId(API_ID); - Assert.assertEquals("API ID", span.getApiId(), API_ID); + Assertions.assertEquals(span.getApiId(), API_ID, "API ID"); } @Test diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/recorder/WrappedSpanEventRecorderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/recorder/WrappedSpanEventRecorderTest.java index dffddc2dce21..da46ea27466c 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/recorder/WrappedSpanEventRecorderTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/recorder/WrappedSpanEventRecorderTest.java @@ -24,18 +24,23 @@ import com.navercorp.pinpoint.profiler.context.id.TraceRoot; import com.navercorp.pinpoint.profiler.metadata.SqlMetaDataService; import com.navercorp.pinpoint.profiler.metadata.StringMetaDataService; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.anyInt; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.only; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; /** * @author Woonduk Kang(emeroad) */ -@RunWith(org.mockito.junit.MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class WrappedSpanEventRecorderTest { @Mock @@ -67,7 +72,7 @@ public void testSetExceptionInfo_RootMarkError() throws Exception { final Exception exception1 = new Exception(exceptionMessage1); recorder.recordException(false, exception1); - Assert.assertEquals("Exception recoding", exceptionMessage1, spanEvent.getExceptionInfo().getStringValue()); + Assertions.assertEquals(spanEvent.getExceptionInfo().getStringValue(), exceptionMessage1, "Exception recoding"); verify(shared, never()).maskErrorCode(anyInt()); @@ -75,7 +80,7 @@ public void testSetExceptionInfo_RootMarkError() throws Exception { final Exception exception2 = new Exception(exceptionMessage2); recorder.recordException(true, exception2); - Assert.assertEquals("Exception recoding", exceptionMessage2, spanEvent.getExceptionInfo().getStringValue()); + Assertions.assertEquals(spanEvent.getExceptionInfo().getStringValue(), exceptionMessage2, "Exception recoding"); verify(shared, only()).maskErrorCode(1); } @@ -89,7 +94,7 @@ public void testRecordAPIId() throws Exception { final int API_ID = 1000; recorder.recordApiId(API_ID); - Assert.assertEquals("API ID", spanEvent.getApiId(), API_ID); + Assertions.assertEquals(spanEvent.getApiId(), API_ID, "API ID"); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/scope/ConcurrentPoolTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/scope/ConcurrentPoolTest.java index 5f397c5d945a..58a6834f4ab7 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/scope/ConcurrentPoolTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/scope/ConcurrentPoolTest.java @@ -18,9 +18,8 @@ package com.navercorp.pinpoint.profiler.context.scope; import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScope; -import org.junit.Assert; -import org.junit.Test; - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -35,13 +34,13 @@ public void testConcurrentPool() { final String OBJECT_NAME = "test"; InterceptorScope addedScope = pool.get(OBJECT_NAME); - Assert.assertSame(pool.get(OBJECT_NAME), addedScope); + Assertions.assertSame(pool.get(OBJECT_NAME), addedScope); InterceptorScope exist = pool.get(OBJECT_NAME); - Assert.assertSame(exist, addedScope); + Assertions.assertSame(exist, addedScope); InterceptorScope another = pool.get("another"); - Assert.assertNotSame(exist, another); + Assertions.assertNotSame(exist, another); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/storage/AsyncQueueingUriStatStorageTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/storage/AsyncQueueingUriStatStorageTest.java index 113d9e57dd71..2068a178b618 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/storage/AsyncQueueingUriStatStorageTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/storage/AsyncQueueingUriStatStorageTest.java @@ -18,9 +18,8 @@ import com.navercorp.pinpoint.profiler.monitor.metric.uri.AgentUriStatData; import com.navercorp.pinpoint.profiler.monitor.metric.uri.EachUriStatData; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Collection; import java.util.Random; @@ -54,7 +53,7 @@ public void storageTest() { storeRandomValue(storage); } - Assert.assertNull(storage.poll()); + Assertions.assertNull(storage.poll()); try { Thread.sleep(collectInterval); @@ -64,14 +63,14 @@ public void storageTest() { storage.pollTimeout(collectInterval); AgentUriStatData poll = storage.poll(); - Assert.assertNotNull(poll); + Assertions.assertNotNull(poll); Collection allUriStatData = poll.getAllUriStatData(); for (EachUriStatData eachUriStatData : allUriStatData) { storeCount -= eachUriStatData.getTotalHistogram().getCount(); } - Assert.assertEquals(0, storeCount); + Assertions.assertEquals(0, storeCount); } finally { if (storage != null) { storage.close(); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/storage/BufferedStorageTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/storage/BufferedStorageTest.java index ae96f0f6d7f4..37bb095c3867 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/storage/BufferedStorageTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/storage/BufferedStorageTest.java @@ -21,14 +21,13 @@ import com.navercorp.pinpoint.profiler.context.Span; import com.navercorp.pinpoint.profiler.context.SpanChunkFactory; import com.navercorp.pinpoint.profiler.context.SpanEvent; -import com.navercorp.pinpoint.profiler.context.id.DefaultTraceRoot; import com.navercorp.pinpoint.profiler.context.id.DefaultTraceId; +import com.navercorp.pinpoint.profiler.context.id.DefaultTraceRoot; import com.navercorp.pinpoint.profiler.context.id.TraceRoot; import com.navercorp.pinpoint.profiler.sender.CountingDataSender; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; public class BufferedStorageTest { @@ -38,7 +37,7 @@ public class BufferedStorageTest { private final CountingDataSender countingDataSender = new CountingDataSender(); private TraceRoot internalTraceId; - @Before + @BeforeEach public void before() { countingDataSender.stop(); internalTraceId = newInternalTraceId(); @@ -58,7 +57,7 @@ public void testStore_Noflush() throws Exception { bufferedStorage.store(spanEvent); bufferedStorage.store(spanEvent); - Assert.assertEquals(0, countingDataSender.getTotalCount()); + Assertions.assertEquals(0, countingDataSender.getTotalCount()); } @Test @@ -70,11 +69,11 @@ public void testStore_flush() throws Exception { bufferedStorage.store(spanEvent); bufferedStorage.store(spanEvent); - Assert.assertEquals(2, countingDataSender.getSenderCounter()); - Assert.assertEquals(2, countingDataSender.getTotalCount()); + Assertions.assertEquals(2, countingDataSender.getSenderCounter()); + Assertions.assertEquals(2, countingDataSender.getTotalCount()); - Assert.assertEquals(2, countingDataSender.getSpanChunkCounter()); - Assert.assertEquals(0, countingDataSender.getSpanCounter()); + Assertions.assertEquals(2, countingDataSender.getSpanChunkCounter()); + Assertions.assertEquals(0, countingDataSender.getSpanCounter()); } @@ -87,11 +86,11 @@ public void testStore_spanFlush() throws Exception { bufferedStorage.store(span); bufferedStorage.store(span); - Assert.assertEquals(3, countingDataSender.getSenderCounter()); - Assert.assertEquals(3, countingDataSender.getTotalCount()); + Assertions.assertEquals(3, countingDataSender.getSenderCounter()); + Assertions.assertEquals(3, countingDataSender.getTotalCount()); - Assert.assertEquals(3, countingDataSender.getSpanCounter()); - Assert.assertEquals(0, countingDataSender.getSpanChunkCounter()); + Assertions.assertEquals(3, countingDataSender.getSpanCounter()); + Assertions.assertEquals(0, countingDataSender.getSpanChunkCounter()); } @Test @@ -104,11 +103,11 @@ public void testStore_spanLastFlush() throws Exception { bufferedStorage.store(spanEvent); bufferedStorage.store(span); - Assert.assertEquals(1, countingDataSender.getSenderCounter()); - Assert.assertEquals(1, countingDataSender.getTotalCount()); + Assertions.assertEquals(1, countingDataSender.getSenderCounter()); + Assertions.assertEquals(1, countingDataSender.getTotalCount()); - Assert.assertEquals(1, countingDataSender.getSpanCounter()); - Assert.assertEquals(0, countingDataSender.getSpanChunkCounter()); + Assertions.assertEquals(1, countingDataSender.getSpanCounter()); + Assertions.assertEquals(0, countingDataSender.getSpanChunkCounter()); } @Test @@ -121,11 +120,11 @@ public void testStore_manual_flush() throws Exception { bufferedStorage.store(spanEvent); bufferedStorage.flush(); - Assert.assertEquals(1, countingDataSender.getSenderCounter()); - Assert.assertEquals(1, countingDataSender.getTotalCount()); + Assertions.assertEquals(1, countingDataSender.getSenderCounter()); + Assertions.assertEquals(1, countingDataSender.getTotalCount()); - Assert.assertEquals(0, countingDataSender.getSpanCounter()); - Assert.assertEquals(1, countingDataSender.getSpanChunkCounter()); + Assertions.assertEquals(0, countingDataSender.getSpanCounter()); + Assertions.assertEquals(1, countingDataSender.getSpanChunkCounter()); } private BufferedStorage newBufferedStorage(int bufferSize) { diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/thrift/DefaultTransactionIdEncoderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/thrift/DefaultTransactionIdEncoderTest.java index 38cd64421eca..a83c1604b2c6 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/thrift/DefaultTransactionIdEncoderTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/thrift/DefaultTransactionIdEncoderTest.java @@ -22,10 +22,10 @@ import com.navercorp.pinpoint.profiler.context.id.DefaultTraceId; import com.navercorp.pinpoint.profiler.context.id.DefaultTraceRoot; import com.navercorp.pinpoint.profiler.context.id.TraceRoot; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; import java.util.Arrays; @@ -58,9 +58,9 @@ public void testCompressedTransactionId() { byte[] transactionId = Arrays.copyOf(encodeTxId.array(), encodeTxId.remaining()); TransactionId parsedTxId = TransactionIdUtils.parseTransactionId(transactionId, DEFAULT_AGENT_ID); logger.debug("transactionId:{}", parsedTxId); - Assert.assertEquals(DEFAULT_AGENT_ID, parsedTxId.getAgentId()); - Assert.assertEquals(parsedTxId.getAgentStartTime(), agentStartTime); - Assert.assertEquals(parsedTxId.getTransactionSequence(), transactionId2); + Assertions.assertEquals(DEFAULT_AGENT_ID, parsedTxId.getAgentId()); + Assertions.assertEquals(parsedTxId.getAgentStartTime(), agentStartTime); + Assertions.assertEquals(parsedTxId.getTransactionSequence(), transactionId2); } @Test @@ -74,9 +74,9 @@ public void testNormalTransactionId() { byte[] transactionId = Arrays.copyOf(encodeTxId.array(), encodeTxId.remaining()); TransactionId parsedTxId = TransactionIdUtils.parseTransactionId(transactionId, DEFAULT_AGENT_ID); logger.debug("transactionId:{}", parsedTxId); - Assert.assertEquals(parsedTxId.getAgentId(), agentId2); - Assert.assertEquals(parsedTxId.getAgentStartTime(), agentStartTime2); - Assert.assertEquals(parsedTxId.getTransactionSequence(), transactionId2); + Assertions.assertEquals(parsedTxId.getAgentId(), agentId2); + Assertions.assertEquals(parsedTxId.getAgentStartTime(), agentStartTime2); + Assertions.assertEquals(parsedTxId.getTransactionSequence(), transactionId2); } @Test @@ -90,13 +90,12 @@ public void testDuplicateAgentId() { byte[] transactionId = Arrays.copyOf(encodeTxId.array(), encodeTxId.remaining()); TransactionId parsedTxId = TransactionIdUtils.parseTransactionId(transactionId, DEFAULT_AGENT_ID); logger.debug("transactionId:{}", parsedTxId); - Assert.assertEquals(DEFAULT_AGENT_ID, parsedTxId.getAgentId()); - Assert.assertEquals(parsedTxId.getAgentStartTime(), agentStartTime2); - Assert.assertEquals(parsedTxId.getTransactionSequence(), transactionId2); + Assertions.assertEquals(DEFAULT_AGENT_ID, parsedTxId.getAgentId()); + Assertions.assertEquals(parsedTxId.getAgentStartTime(), agentStartTime2); + Assertions.assertEquals(parsedTxId.getTransactionSequence(), transactionId2); } - private TraceRoot getRootTraceId() { TraceId traceId = new DefaultTraceId(agentId, agentStartTime, transactionId2); return new DefaultTraceRoot(traceId, agentId, agentStartTime, transactionId); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/thrift/SpanThriftMessageConverterTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/thrift/SpanThriftMessageConverterTest.java index 8daab33caa96..fe8077a37516 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/thrift/SpanThriftMessageConverterTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/thrift/SpanThriftMessageConverterTest.java @@ -20,12 +20,12 @@ import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.util.IntStringValue; import com.navercorp.pinpoint.profiler.context.Annotation; -import com.navercorp.pinpoint.profiler.context.annotation.Annotations; import com.navercorp.pinpoint.profiler.context.DefaultAsyncId; import com.navercorp.pinpoint.profiler.context.DefaultSpanChunk; import com.navercorp.pinpoint.profiler.context.Span; import com.navercorp.pinpoint.profiler.context.SpanChunk; import com.navercorp.pinpoint.profiler.context.SpanEvent; +import com.navercorp.pinpoint.profiler.context.annotation.Annotations; import com.navercorp.pinpoint.profiler.context.compress.SpanProcessorV1; import com.navercorp.pinpoint.profiler.context.id.DefaultTraceId; import com.navercorp.pinpoint.profiler.context.id.DefaultTraceRoot; @@ -37,8 +37,8 @@ import com.navercorp.pinpoint.thrift.dto.TSpan; import com.navercorp.pinpoint.thrift.dto.TSpanChunk; import com.navercorp.pinpoint.thrift.dto.TSpanEvent; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; @@ -102,27 +102,27 @@ public void buildTSpan() { final TSpan tSpan = messageConverter.buildTSpan(span); - Assert.assertEquals(span.getStartTime(), tSpan.getStartTime()); - Assert.assertEquals(span.getElapsedTime(), tSpan.getElapsed()); - Assert.assertEquals(span.getAcceptorHost(), tSpan.getAcceptorHost()); - Assert.assertEquals(span.getExceptionInfo().getIntValue(), tSpan.getExceptionInfo().getIntValue()); - Assert.assertEquals(span.getExceptionInfo().getStringValue(), tSpan.getExceptionInfo().getStringValue()); - Assert.assertEquals(span.getApiId(), tSpan.getApiId()); - Assert.assertEquals(span.getServiceType(), tSpan.getServiceType()); - Assert.assertEquals(span.getRemoteAddr(), tSpan.getRemoteAddr()); - Assert.assertEquals(span.getParentApplicationName(), tSpan.getParentApplicationName()); - Assert.assertEquals(span.getParentApplicationType(), tSpan.getParentApplicationType()); - - Assert.assertEquals(traceRoot.getTraceId().getSpanId(), tSpan.getSpanId()); - Assert.assertEquals(traceRoot.getShared().getEndPoint(), tSpan.getEndPoint()); - Assert.assertEquals(traceRoot.getShared().getRpcName(), tSpan.getRpc()); - Assert.assertEquals(traceRoot.getShared().getLoggingInfo(), tSpan.getLoggingTransactionInfo()); - Assert.assertEquals(traceRoot.getShared().getErrorCode(), tSpan.getErr()); + Assertions.assertEquals(span.getStartTime(), tSpan.getStartTime()); + Assertions.assertEquals(span.getElapsedTime(), tSpan.getElapsed()); + Assertions.assertEquals(span.getAcceptorHost(), tSpan.getAcceptorHost()); + Assertions.assertEquals(span.getExceptionInfo().getIntValue(), tSpan.getExceptionInfo().getIntValue()); + Assertions.assertEquals(span.getExceptionInfo().getStringValue(), tSpan.getExceptionInfo().getStringValue()); + Assertions.assertEquals(span.getApiId(), tSpan.getApiId()); + Assertions.assertEquals(span.getServiceType(), tSpan.getServiceType()); + Assertions.assertEquals(span.getRemoteAddr(), tSpan.getRemoteAddr()); + Assertions.assertEquals(span.getParentApplicationName(), tSpan.getParentApplicationName()); + Assertions.assertEquals(span.getParentApplicationType(), tSpan.getParentApplicationType()); + + Assertions.assertEquals(traceRoot.getTraceId().getSpanId(), tSpan.getSpanId()); + Assertions.assertEquals(traceRoot.getShared().getEndPoint(), tSpan.getEndPoint()); + Assertions.assertEquals(traceRoot.getShared().getRpcName(), tSpan.getRpc()); + Assertions.assertEquals(traceRoot.getShared().getLoggingInfo(), tSpan.getLoggingTransactionInfo()); + Assertions.assertEquals(traceRoot.getShared().getErrorCode(), tSpan.getErr()); // TODO -// Assert.assertEquals(traceRoot.getShared().getStatusCode(), ); +// Assertions.assertEquals(traceRoot.getShared().getStatusCode(), ); - Assert.assertEquals(span.getAnnotations().size(), tSpan.getAnnotations().size()); - Assert.assertEquals(span.getSpanEventList().size(), tSpan.getSpanEventList().size()); + Assertions.assertEquals(span.getAnnotations().size(), tSpan.getAnnotations().size()); + Assertions.assertEquals(span.getSpanEventList().size(), tSpan.getSpanEventList().size()); } @@ -140,8 +140,8 @@ public void buildTSpanChunk() { TSpanChunk tSpanChunk = messageConverter.buildTSpanChunk(spanChunk); - Assert.assertEquals(traceRoot.getTraceId().getSpanId(), tSpanChunk.getSpanId()); - Assert.assertEquals(traceRoot.getShared().getEndPoint(), tSpanChunk.getEndPoint()); + Assertions.assertEquals(traceRoot.getTraceId().getSpanId(), tSpanChunk.getSpanId()); + Assertions.assertEquals(traceRoot.getShared().getEndPoint(), tSpanChunk.getEndPoint()); } @@ -165,16 +165,16 @@ public void buildTSpanEvent() { TSpanEvent tSpanEvent = messageConverter.buildTSpanEvent(spanEvent); spanPostProcessor.postEventProcess(Collections.singletonList(spanEvent), Collections.singletonList(tSpanEvent), startTime); - Assert.assertEquals(spanEvent.getDepth(), tSpanEvent.getDepth()); - Assert.assertEquals(spanEvent.getStartTime(), startTime + tSpanEvent.getStartElapsed()); - Assert.assertEquals(spanEvent.getAfterTime(), startTime + tSpanEvent.getStartElapsed() + tSpanEvent.getEndElapsed()); - Assert.assertEquals(spanEvent.getDestinationId(), tSpanEvent.getDestinationId()); - Assert.assertEquals(spanEvent.getSequence(), tSpanEvent.getSequence()); - Assert.assertEquals(spanEvent.getNextSpanId(), tSpanEvent.getNextSpanId()); + Assertions.assertEquals(spanEvent.getDepth(), tSpanEvent.getDepth()); + Assertions.assertEquals(spanEvent.getStartTime(), startTime + tSpanEvent.getStartElapsed()); + Assertions.assertEquals(spanEvent.getAfterTime(), startTime + tSpanEvent.getStartElapsed() + tSpanEvent.getEndElapsed()); + Assertions.assertEquals(spanEvent.getDestinationId(), tSpanEvent.getDestinationId()); + Assertions.assertEquals(spanEvent.getSequence(), tSpanEvent.getSequence()); + Assertions.assertEquals(spanEvent.getNextSpanId(), tSpanEvent.getNextSpanId()); - Assert.assertEquals(spanEvent.getAsyncIdObject().getAsyncId(), tSpanEvent.getNextAsyncId()); + Assertions.assertEquals(spanEvent.getAsyncIdObject().getAsyncId(), tSpanEvent.getNextAsyncId()); - Assert.assertEquals(spanEvent.getAnnotations().size(), tSpanEvent.getAnnotations().size()); + Assertions.assertEquals(spanEvent.getAnnotations().size(), tSpanEvent.getAnnotations().size()); } @@ -185,8 +185,8 @@ public void buildTAnnotation() { List tAnnotations = messageConverter.buildTAnnotation(annotations); TAnnotation tAnnotation = tAnnotations.get(0); - Assert.assertEquals(annotation.getKey(), tAnnotation.getKey()); - Assert.assertEquals(annotation.getValue(), tAnnotation.getValue().getStringValue()); + Assertions.assertEquals(annotation.getKey(), tAnnotation.getKey()); + Assertions.assertEquals(annotation.getValue(), tAnnotation.getValue().getStringValue()); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/thrift/config/DefaultThriftTransportConfigTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/thrift/config/DefaultThriftTransportConfigTest.java index a0b5bee6e795..d28ca427ddd0 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/thrift/config/DefaultThriftTransportConfigTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/thrift/config/DefaultThriftTransportConfigTest.java @@ -1,9 +1,9 @@ package com.navercorp.pinpoint.profiler.context.thrift.config; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Properties; @@ -23,9 +23,9 @@ public void testPlaceHolder() throws IOException { ThriftTransportConfig thriftTransportConfig = loadThriftTransportConfig(properties); - Assert.assertEquals(thriftTransportConfig.getCollectorSpanServerIp(), "placeHolder1"); - Assert.assertEquals(thriftTransportConfig.getCollectorStatServerIp(), "placeHolder1"); - Assert.assertEquals(thriftTransportConfig.getCollectorTcpServerIp(), "placeHolder2"); + Assertions.assertEquals(thriftTransportConfig.getCollectorSpanServerIp(), "placeHolder1"); + Assertions.assertEquals(thriftTransportConfig.getCollectorStatServerIp(), "placeHolder1"); + Assertions.assertEquals(thriftTransportConfig.getCollectorTcpServerIp(), "placeHolder2"); } @@ -35,7 +35,7 @@ public void tcpCommandAcceptorConfigTest1() throws IOException { properties.put("profiler.tcpdatasender.command.accept.enable", "true"); ThriftTransportConfig thriftTransportConfig = loadThriftTransportConfig(properties); - Assert.assertTrue(thriftTransportConfig.isTcpDataSenderCommandAcceptEnable()); + Assertions.assertTrue(thriftTransportConfig.isTcpDataSenderCommandAcceptEnable()); } @Test @@ -44,7 +44,7 @@ public void tcpCommandAcceptorConfigTest2() throws IOException { properties.put("profiler.tcpdatasender.command.accept.enable", "true"); ThriftTransportConfig thriftTransportConfig = loadThriftTransportConfig(properties); - Assert.assertTrue(thriftTransportConfig.isTcpDataSenderCommandAcceptEnable()); + Assertions.assertTrue(thriftTransportConfig.isTcpDataSenderCommandAcceptEnable()); } @@ -66,11 +66,11 @@ public void waterMarkConfigTest() { DefaultThriftTransportConfig thriftTransportConfig = new DefaultThriftTransportConfig(); thriftTransportConfig.read(properties); - Assert.assertEquals("6m", thriftTransportConfig.getTcpDataSenderPinpointClientWriteBufferHighWaterMark()); - Assert.assertEquals("5m", thriftTransportConfig.getTcpDataSenderPinpointClientWriteBufferLowWaterMark()); - Assert.assertEquals("4m", thriftTransportConfig.getSpanDataSenderWriteBufferHighWaterMark()); - Assert.assertEquals("3m", thriftTransportConfig.getSpanDataSenderWriteBufferLowWaterMark()); - Assert.assertEquals("2m", thriftTransportConfig.getStatDataSenderWriteBufferHighWaterMark()); - Assert.assertEquals("1m", thriftTransportConfig.getStatDataSenderWriteBufferLowWaterMark()); + Assertions.assertEquals("6m", thriftTransportConfig.getTcpDataSenderPinpointClientWriteBufferHighWaterMark()); + Assertions.assertEquals("5m", thriftTransportConfig.getTcpDataSenderPinpointClientWriteBufferLowWaterMark()); + Assertions.assertEquals("4m", thriftTransportConfig.getSpanDataSenderWriteBufferHighWaterMark()); + Assertions.assertEquals("3m", thriftTransportConfig.getSpanDataSenderWriteBufferLowWaterMark()); + Assertions.assertEquals("2m", thriftTransportConfig.getStatDataSenderWriteBufferHighWaterMark()); + Assertions.assertEquals("1m", thriftTransportConfig.getStatDataSenderWriteBufferLowWaterMark()); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMAspectWeaverTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMAspectWeaverTest.java index ae4713014a96..639cbb6e9995 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMAspectWeaverTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMAspectWeaverTest.java @@ -18,7 +18,8 @@ import com.navercorp.pinpoint.bootstrap.instrument.ClassInputStreamProvider; import com.navercorp.pinpoint.common.util.IOUtils; import com.navercorp.pinpoint.profiler.util.JavaAssistUtils; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.tree.ClassNode; @@ -66,26 +67,34 @@ private void weaving(final String originalClass, final String adviceClass) throw invoke(instance, "testMethodCall"); } - @Test(expected = Exception.class) + @Test public void invalidHierarchy() throws Exception { - weaving(ORIGINAL_SUB, ASPECT); + Assertions.assertThrows(Exception.class, () -> { + weaving(ORIGINAL_SUB, ASPECT); + }); } - @Test(expected = Exception.class) + @Test public void signatureMiss() throws Exception { - // not found method - getInstnace(ORIGINAL, ERROR_ASPECT1); + Assertions.assertThrows(Exception.class, () -> { + // not found method + getInstnace(ORIGINAL, ERROR_ASPECT1); + }); } - @Test(expected = Exception.class) + @Test public void internalTypeMiss() throws Exception { - getInstnace(ORIGINAL, ERROR_ASPECT2); + Assertions.assertThrows(Exception.class, () -> { + getInstnace(ORIGINAL, ERROR_ASPECT2); + }); } - @Test(expected = Exception.class) + @Test public void invalidExtend() throws Exception { - // invalid class hierarchy. - getInstnace(ORIGINAL, ERROR_ASPECT_INVALID_EXTENTS); + Assertions.assertThrows(Exception.class, () -> { + // invalid class hierarchy. + getInstnace(ORIGINAL, ERROR_ASPECT_INVALID_EXTENTS); + }); } private Object getInstnace(final String originalName, final String aspectName) throws Exception { diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMBytecodeDisassemblerTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMBytecodeDisassemblerTest.java index 3d8babe3f297..089e5f417537 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMBytecodeDisassemblerTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMBytecodeDisassemblerTest.java @@ -16,11 +16,11 @@ package com.navercorp.pinpoint.profiler.instrument; import com.navercorp.pinpoint.common.util.ClassLoaderUtils; - import com.navercorp.pinpoint.profiler.util.BytecodeUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author jaehong.kim diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassNodeAdapterTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassNodeAdapterTest.java index 443e7808b808..37b1ad665602 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassNodeAdapterTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassNodeAdapterTest.java @@ -21,22 +21,22 @@ import com.navercorp.pinpoint.profiler.instrument.mock.JavaSerializableUtils; import com.navercorp.pinpoint.profiler.instrument.mock.accessor.MockAsyncContext; import com.navercorp.pinpoint.profiler.util.JavaAssistUtils; -import org.junit.Assert; -import org.junit.Test; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.objectweb.asm.Type; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.MethodNode; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; import java.lang.reflect.Method; import java.util.List; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; public class ASMClassNodeAdapterTest { @@ -49,7 +49,7 @@ public void get() { ASMClassNodeAdapter adapter = ASMClassNodeAdapter.get(pluginClassInputStreamProvider, classLoader, getClass().getProtectionDomain(), "com/navercorp/pinpoint/profiler/instrument/mock/BaseClass"); assertNotNull(adapter); - adapter = ASMClassNodeAdapter.get(pluginClassInputStreamProvider, classLoader, getClass().getProtectionDomain(),"com/navercorp/pinpoint/profiler/instrument/mock/NotExistClass"); + adapter = ASMClassNodeAdapter.get(pluginClassInputStreamProvider, classLoader, getClass().getProtectionDomain(), "com/navercorp/pinpoint/profiler/instrument/mock/NotExistClass"); assertNull(adapter); // skip code @@ -57,13 +57,13 @@ public void get() { try { adapter.getDeclaredMethods(); fail("can't throw IllegalStateException"); - } catch(Exception ignored) { + } catch (Exception ignored) { } try { adapter.getDeclaredMethod("base", "()"); fail("can't throw IllegalStateException"); - } catch(Exception ignored) { + } catch (Exception ignored) { } } @@ -102,17 +102,17 @@ public void getter() { assertNull(field); // interface - adapter = ASMClassNodeAdapter.get(pluginClassInputStreamProvider, classLoader, getClass().getProtectionDomain(),"com/navercorp/pinpoint/profiler/instrument/mock/BaseInterface"); + adapter = ASMClassNodeAdapter.get(pluginClassInputStreamProvider, classLoader, getClass().getProtectionDomain(), "com/navercorp/pinpoint/profiler/instrument/mock/BaseInterface"); assertEquals(true, adapter.isInterface()); // implement - adapter = ASMClassNodeAdapter.get(pluginClassInputStreamProvider, classLoader, getClass().getProtectionDomain(),"com/navercorp/pinpoint/profiler/instrument/mock/BaseImplementClass"); + adapter = ASMClassNodeAdapter.get(pluginClassInputStreamProvider, classLoader, getClass().getProtectionDomain(), "com/navercorp/pinpoint/profiler/instrument/mock/BaseImplementClass"); String[] interfaceNames = adapter.getInterfaceNames(); assertEquals(1, interfaceNames.length); assertEquals("com.navercorp.pinpoint.profiler.instrument.mock.BaseInterface", interfaceNames[0]); // annotation - adapter = ASMClassNodeAdapter.get(pluginClassInputStreamProvider, classLoader, getClass().getProtectionDomain(),"com/navercorp/pinpoint/bootstrap/instrument/aspect/Aspect"); + adapter = ASMClassNodeAdapter.get(pluginClassInputStreamProvider, classLoader, getClass().getProtectionDomain(), "com/navercorp/pinpoint/bootstrap/instrument/aspect/Aspect"); assertEquals(true, adapter.isAnnotation()); @@ -220,8 +220,8 @@ public void handle(ClassNode classNode) { @Test public void hasAnnotation() { ASMClassNodeAdapter classNodeAdapter = ASMClassNodeAdapter.get(pluginClassInputStreamProvider, ASMClassNodeLoader.getClassLoader(), getClass().getProtectionDomain(), "com/navercorp/pinpoint/profiler/instrument/mock/AnnotationClass"); - Assert.assertTrue(classNodeAdapter.hasAnnotation(Aspect.class)); - Assert.assertFalse(classNodeAdapter.hasAnnotation(Override.class)); + Assertions.assertTrue(classNodeAdapter.hasAnnotation(Aspect.class)); + Assertions.assertFalse(classNodeAdapter.hasAnnotation(Override.class)); } @Test @@ -247,20 +247,20 @@ public void handle(ClassNode classNode) { @Test public void getDeclaredMethod() { ASMClassNodeAdapter adapter = ASMClassNodeAdapter.get(pluginClassInputStreamProvider, ASMClassNodeLoader.getClassLoader(), - getClass().getProtectionDomain(),"com/navercorp/pinpoint/profiler/instrument/mock/ArgsClass"); + getClass().getProtectionDomain(), "com/navercorp/pinpoint/profiler/instrument/mock/ArgsClass"); List constructors = adapter.getDeclaredConstructors(); - Assert.assertEquals(2, constructors.size()); + Assertions.assertEquals(2, constructors.size()); assertEquals("ArgsClass", constructors.get(0).getName()); assertEquals("ArgsClass", constructors.get(1).getName()); - assertArrayEquals(new String[] {"int"}, constructors.get(1).getParameterTypes()); + assertArrayEquals(new String[]{"int"}, constructors.get(1).getParameterTypes()); ASMMethodNodeAdapter m1 = adapter.getDeclaredMethod("", null); logger.debug("{}", m1.getName()); } @Test public void subclassOf() { - ASMClassNodeAdapter adapter = ASMClassNodeAdapter.get(pluginClassInputStreamProvider, ASMClassNodeLoader.getClassLoader(), getClass().getProtectionDomain(),"com/navercorp/pinpoint/profiler/instrument/mock/ExtendedClass"); + ASMClassNodeAdapter adapter = ASMClassNodeAdapter.get(pluginClassInputStreamProvider, ASMClassNodeLoader.getClassLoader(), getClass().getProtectionDomain(), "com/navercorp/pinpoint/profiler/instrument/mock/ExtendedClass"); // self assertEquals(true, adapter.subclassOf("com/navercorp/pinpoint/profiler/instrument/mock/ExtendedClass")); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassTest.java index 427df69e7cbb..336da098cbb3 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassTest.java @@ -15,6 +15,8 @@ */ package com.navercorp.pinpoint.profiler.instrument; +import com.google.inject.Provider; +import com.google.inject.util.Providers; import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.instrument.ClassFilters; @@ -37,59 +39,15 @@ import com.navercorp.pinpoint.profiler.instrument.mock.accessor.ObjectArraysAccessor; import com.navercorp.pinpoint.profiler.instrument.mock.accessor.PublicStrAccessor; import com.navercorp.pinpoint.profiler.instrument.mock.accessor.ThrowExceptionAccessor; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldDefaultStaticFinalStrGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldDefaultStaticStrGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldDefaultStrGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldEnumGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldIntArrayGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldIntGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldMapGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldObjectArrayGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldObjectArraysGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldObjectGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldObjectMapGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldPrivateStaticFinalStrGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldPrivateStaticStrGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldPrivateStrGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldProtectedStaticFinalStrGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldProtectedStaticStrGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldProtectedStrGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldPublicStaticFinalStrGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldPublicStaticStrGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldPublicStrGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldStrMapGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldTransientIntGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldVolatileIntGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.getter.FieldWildcardMapGetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldDefaultFinalStrSetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldDefaultStaticStrSetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldDefaultStrSetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldEnumSetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldIntArraySetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldIntSetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldMapSetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldObjectArraySetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldObjectArraysSetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldObjectMapSetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldObjectSetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldPrivateStrSetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldProtectedStrSetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldPublicFinalStrSetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldPublicStrSetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldStrMapSetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldTransientIntSetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldVolatileIntSetter; -import com.navercorp.pinpoint.profiler.instrument.mock.setter.FieldWildcardMapSetter; +import com.navercorp.pinpoint.profiler.instrument.mock.getter.*; +import com.navercorp.pinpoint.profiler.instrument.mock.setter.*; import com.navercorp.pinpoint.profiler.interceptor.factory.ExceptionHandlerFactory; import com.navercorp.pinpoint.profiler.interceptor.registry.DefaultInterceptorRegistryBinder; import com.navercorp.pinpoint.profiler.interceptor.registry.InterceptorRegistryBinder; import com.navercorp.pinpoint.profiler.metadata.ApiMetaDataService; import com.navercorp.pinpoint.profiler.objectfactory.ObjectBinderFactory; - -import com.google.inject.Provider; -import com.google.inject.util.Providers; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.objectweb.asm.tree.ClassNode; @@ -97,13 +55,13 @@ import java.io.InputStream; import java.util.List; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -135,7 +93,7 @@ public class ASMClassTest { private final EngineComponent engineComponent = new DefaultEngineComponent(objectBinderFactory, interceptorRegistryBinder, interceptorDefinitionFactory, apiMetaDataService, scopeFactory); - @Before + @BeforeEach public void setUp() { when(pluginContext.injectClass(any(ClassLoader.class), any(String.class))).thenAnswer(new Answer>() { @@ -155,7 +113,7 @@ public Class answer(InvocationOnMock invocation) throws Throwable { public InputStream answer(InvocationOnMock invocation) throws Throwable { ClassLoader loader = (ClassLoader) invocation.getArguments()[0]; String name = (String) invocation.getArguments()[1]; - if(loader == null) { + if (loader == null) { loader = ClassLoader.getSystemClassLoader(); } @@ -267,7 +225,7 @@ public void getDeclaredConstructors() throws Exception { assertEquals("ArgsClass", constructors.get(0).getName()); assertEquals("ArgsClass", constructors.get(1).getName()); - assertArrayEquals(new String[] {"int"}, constructors.get(1).getParameterTypes()); + assertArrayEquals(new String[]{"int"}, constructors.get(1).getParameterTypes()); } @Test @@ -377,14 +335,14 @@ public void addDelegatorMethod() throws Exception { try { clazz.addDelegatorMethod("extended"); fail("skip throw exception."); - } catch(Exception ignored) { + } catch (Exception ignored) { } // not exist. try { clazz.addDelegatorMethod("notExist"); fail("skip throw exception."); - } catch(Exception ignored) { + } catch (Exception ignored) { } clazz.addDelegatorMethod("getInstance"); @@ -594,7 +552,7 @@ public void addSetter() throws Exception { clazz.addSetter(FieldDefaultStaticStrSetter.class, "defaultStaticStr"); assertNotNull(clazz.getDeclaredMethod("_$PINPOINT$_setDefaultStaticStr", "java.lang.String")); fail("can't throw exception"); - } catch(Exception ignored) { + } catch (Exception ignored) { } try { @@ -602,7 +560,7 @@ public void addSetter() throws Exception { clazz.addSetter(FieldDefaultFinalStrSetter.class, "defaultFinalStr"); assertNotNull(clazz.getDeclaredMethod("_$PINPOINT$_setDefaultFinalStr", "java.lang.String")); fail("can't throw exception"); - } catch(Exception ignored) { + } catch (Exception ignored) { } clazz = getClass("com.navercorp.pinpoint.profiler.instrument.mock.FieldClass"); @@ -622,7 +580,7 @@ public void addSetter() throws Exception { clazz.addSetter(FieldPublicFinalStrSetter.class, "publicFinalStr"); assertNotNull(clazz.getDeclaredMethod("_$PINPOINT$_setPublicFinalStr", "java.lang.String")); fail("can't throw exception"); - } catch(Exception ignored) { + } catch (Exception ignored) { } // removeFinal is true diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassWriterTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassWriterTest.java index c4a6d70433ed..da8eb31385e4 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassWriterTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMClassWriterTest.java @@ -17,8 +17,8 @@ import com.navercorp.pinpoint.bootstrap.instrument.InstrumentContext; import com.navercorp.pinpoint.profiler.util.JavaAssistUtils; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatchers; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -27,7 +27,7 @@ import java.io.InputStream; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -39,7 +39,7 @@ public class ASMClassWriterTest { private final InstrumentContext pluginContext = mock(InstrumentContext.class); - @Before + @BeforeEach public void setUp() { when(pluginContext.injectClass(ArgumentMatchers.isNull(), anyString())).thenAnswer(new Answer>() { diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMFieldNodeAdapterTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMFieldNodeAdapterTest.java index 8a39a842ec5a..85190cae1a52 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMFieldNodeAdapterTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMFieldNodeAdapterTest.java @@ -15,13 +15,13 @@ */ package com.navercorp.pinpoint.profiler.instrument; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.FieldNode; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author jaehong.kim diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterAddDelegatorTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterAddDelegatorTest.java index 11d71260bcc3..7c657edd0379 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterAddDelegatorTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterAddDelegatorTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.profiler.instrument; import com.navercorp.pinpoint.profiler.util.JavaAssistUtils; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.MethodNode; @@ -32,7 +32,7 @@ public class ASMMethodNodeAdapterAddDelegatorTest { private ASMClassNodeLoader.TestClassLoader classLoader; - @Before + @BeforeEach public void before() { this.classLoader = ASMClassNodeLoader.getClassLoader(); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterAddInterceptorTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterAddInterceptorTest.java index 8628c7a98983..db093655918c 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterAddInterceptorTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterAddInterceptorTest.java @@ -28,11 +28,11 @@ import com.navercorp.pinpoint.profiler.interceptor.factory.ExceptionHandlerFactory; import com.navercorp.pinpoint.profiler.interceptor.registry.InterceptorRegistryBinder; import com.navercorp.pinpoint.profiler.util.TestInterceptorRegistryBinder; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.MethodNode; @@ -44,10 +44,10 @@ import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; public class ASMMethodNodeAdapterAddInterceptorTest { private final static InterceptorRegistryBinder interceptorRegistryBinder = new TestInterceptorRegistryBinder(); @@ -55,17 +55,17 @@ public class ASMMethodNodeAdapterAddInterceptorTest { private ExceptionHandlerFactory exceptionHandlerFactory = new ExceptionHandlerFactory(false); - @BeforeClass + @BeforeAll public static void beforeClass() { interceptorRegistryBinder.bind(); } - @AfterClass + @AfterAll public static void afterClass() { interceptorRegistryBinder.unbind(); } - @Before + @BeforeEach public void before() { this.classLoader = ASMClassNodeLoader.getClassLoader(); } @@ -94,7 +94,7 @@ public void addBasicInterceptor() throws Exception { addInterceptor(interceptorId, BasicInterceptor.class); } - @Ignore + @Disabled @Test public void addExceptionInterceptor() throws Exception { ExceptionHandler exceptionHandler = exceptionHandlerFactory.getExceptionHandler(); @@ -325,64 +325,64 @@ private void invokeMethod(final Class clazz, final String methodName, final C final String name = clazz.getName() + "." + methodName; if (interceptorClass == ArgsArrayInterceptor.class) { - assertEquals(name, true, ArgsArrayInterceptor.before); - assertEquals(name, true, ArgsArrayInterceptor.after); + assertEquals(true, ArgsArrayInterceptor.before, name); + assertEquals(true, ArgsArrayInterceptor.after, name); if (method != null && Modifier.isStatic(method.getModifiers())) { - assertNull(name, ArgsArrayInterceptor.beforeTarget); - assertNull(name, ArgsArrayInterceptor.afterTarget); + assertNull(ArgsArrayInterceptor.beforeTarget, name); + assertNull(ArgsArrayInterceptor.afterTarget, name); } else if (method != null) { - assertNotNull(name, ArgsArrayInterceptor.beforeTarget); - assertNotNull(name, ArgsArrayInterceptor.afterTarget); + assertNotNull(ArgsArrayInterceptor.beforeTarget, name); + assertNotNull(ArgsArrayInterceptor.afterTarget, name); } - assertEquals(name, ArgsArrayInterceptor.beforeTarget, ArgsArrayInterceptor.afterTarget); + assertEquals(ArgsArrayInterceptor.beforeTarget, ArgsArrayInterceptor.afterTarget, name); - if(ArgsArrayInterceptor.beforeArgs != null) { - assertEquals(name, args.length, ArgsArrayInterceptor.beforeArgs.length); + if (ArgsArrayInterceptor.beforeArgs != null) { + assertEquals(args.length, ArgsArrayInterceptor.beforeArgs.length, name); } - if(ArgsArrayInterceptor.afterArgs != null) { - assertEquals(name, args.length, ArgsArrayInterceptor.afterArgs.length); + if (ArgsArrayInterceptor.afterArgs != null) { + assertEquals(args.length, ArgsArrayInterceptor.afterArgs.length, name); } - assertEquals(name, returnValue, ArgsArrayInterceptor.result); + assertEquals(returnValue, ArgsArrayInterceptor.result, name); if (throwable) { - assertNotNull(name, ArgsArrayInterceptor.throwable); + assertNotNull(ArgsArrayInterceptor.throwable, name); } } else if (interceptorClass == ExceptionInterceptor.class) { - assertEquals(name, true, ExceptionInterceptor.before); - assertEquals(name, true, ExceptionInterceptor.after); + assertEquals(true, ExceptionInterceptor.before, name); + assertEquals(true, ExceptionInterceptor.after, name); if (method != null && Modifier.isStatic(method.getModifiers())) { - assertNull(name, ExceptionInterceptor.beforeTarget); - assertNull(name, ExceptionInterceptor.afterTarget); + assertNull(ExceptionInterceptor.beforeTarget, name); + assertNull(ExceptionInterceptor.afterTarget, name); } else if (method != null) { - assertNotNull(name, ExceptionInterceptor.beforeTarget); - assertNotNull(name, ExceptionInterceptor.afterTarget); + assertNotNull(ExceptionInterceptor.beforeTarget, name); + assertNotNull(ExceptionInterceptor.afterTarget, name); } - assertEquals(name, ExceptionInterceptor.beforeTarget, ExceptionInterceptor.afterTarget); + assertEquals(ExceptionInterceptor.beforeTarget, ExceptionInterceptor.afterTarget, name); - if(ExceptionInterceptor.beforeArgs != null) { - assertEquals(name, args.length, ExceptionInterceptor.beforeArgs.length); + if (ExceptionInterceptor.beforeArgs != null) { + assertEquals(args.length, ExceptionInterceptor.beforeArgs.length, name); } - if(ExceptionInterceptor.afterArgs != null) { - assertEquals(name, args.length, ExceptionInterceptor.afterArgs.length); + if (ExceptionInterceptor.afterArgs != null) { + assertEquals(args.length, ExceptionInterceptor.afterArgs.length, name); } - assertEquals(name, returnValue, ExceptionInterceptor.result); + assertEquals(returnValue, ExceptionInterceptor.result, name); if (throwable) { - assertNotNull(name, ExceptionInterceptor.throwable); + assertNotNull(ExceptionInterceptor.throwable, name); } } else if (interceptorClass == StaticInterceptor.class) { assertEquals(true, StaticInterceptor.before); assertEquals(true, StaticInterceptor.after); if (method != null && Modifier.isStatic(method.getModifiers())) { - assertNull(name, StaticInterceptor.beforeTarget); - assertNull(name, StaticInterceptor.afterTarget); + assertNull(StaticInterceptor.beforeTarget, name); + assertNull(StaticInterceptor.afterTarget, name); } else if (method != null) { - assertNotNull(name, StaticInterceptor.beforeTarget); - assertNotNull(name, StaticInterceptor.afterTarget); + assertNotNull(StaticInterceptor.beforeTarget, name); + assertNotNull(StaticInterceptor.afterTarget, name); } assertEquals(StaticInterceptor.beforeTarget, StaticInterceptor.afterTarget); @@ -393,58 +393,58 @@ private void invokeMethod(final Class clazz, final String methodName, final C assertNotNull(StaticInterceptor.afterMethodName); assertNotNull(StaticInterceptor.afterParameterDescription); - if(StaticInterceptor.beforeArgs != null) { + if (StaticInterceptor.beforeArgs != null) { assertEquals(args.length, StaticInterceptor.beforeArgs.length); } - if(StaticInterceptor.afterArgs != null) { + if (StaticInterceptor.afterArgs != null) { assertEquals(args.length, StaticInterceptor.afterArgs.length); } assertEquals(returnValue, StaticInterceptor.result); if (throwable) { - assertNotNull(name, StaticInterceptor.throwable); + assertNotNull(StaticInterceptor.throwable, name); } } else if (interceptorClass == ApiIdAwareInterceptor.class) { - assertEquals(name, true, ApiIdAwareInterceptor.before); - assertEquals(name, true, ApiIdAwareInterceptor.after); + assertEquals(true, ApiIdAwareInterceptor.before, name); + assertEquals(true, ApiIdAwareInterceptor.after, name); if (method != null && Modifier.isStatic(method.getModifiers())) { - assertNull(name, ApiIdAwareInterceptor.beforeTarget); - assertNull(name, ApiIdAwareInterceptor.afterTarget); + assertNull(ApiIdAwareInterceptor.beforeTarget, name); + assertNull(ApiIdAwareInterceptor.afterTarget, name); } else if (method != null) { - assertNotNull(name, ApiIdAwareInterceptor.beforeTarget); - assertNotNull(name, ApiIdAwareInterceptor.afterTarget); + assertNotNull(ApiIdAwareInterceptor.beforeTarget, name); + assertNotNull(ApiIdAwareInterceptor.afterTarget, name); } - assertEquals(name, ApiIdAwareInterceptor.beforeTarget, ApiIdAwareInterceptor.afterTarget); + assertEquals(ApiIdAwareInterceptor.beforeTarget, ApiIdAwareInterceptor.afterTarget, name); assertEquals(99, ApiIdAwareInterceptor.beforeApiId); assertEquals(99, ApiIdAwareInterceptor.afterApiId); - if(ApiIdAwareInterceptor.beforeArgs != null) { - assertEquals(name, args.length, ApiIdAwareInterceptor.beforeArgs.length); + if (ApiIdAwareInterceptor.beforeArgs != null) { + assertEquals(args.length, ApiIdAwareInterceptor.beforeArgs.length, name); } - if(ApiIdAwareInterceptor.afterArgs != null) { - assertEquals(name, args.length, ApiIdAwareInterceptor.afterArgs.length); + if (ApiIdAwareInterceptor.afterArgs != null) { + assertEquals(args.length, ApiIdAwareInterceptor.afterArgs.length, name); } - assertEquals(name, returnValue, ApiIdAwareInterceptor.result); + assertEquals(returnValue, ApiIdAwareInterceptor.result, name); if (throwable) { - assertNotNull(name, ApiIdAwareInterceptor.throwable); + assertNotNull(ApiIdAwareInterceptor.throwable, name); } } else if (interceptorClass == BasicInterceptor.class) { - assertEquals(name, true, BasicInterceptor.before); - assertEquals(name, true, BasicInterceptor.after); + assertEquals(true, BasicInterceptor.before, name); + assertEquals(true, BasicInterceptor.after, name); if (method != null && Modifier.isStatic(method.getModifiers())) { - assertNull(name, BasicInterceptor.beforeTarget); - assertNull(name, BasicInterceptor.afterTarget); + assertNull(BasicInterceptor.beforeTarget, name); + assertNull(BasicInterceptor.afterTarget, name); } else if (method != null) { - assertNotNull(name, BasicInterceptor.beforeTarget); - assertNotNull(name, BasicInterceptor.afterTarget); + assertNotNull(BasicInterceptor.beforeTarget, name); + assertNotNull(BasicInterceptor.afterTarget, name); } - assertEquals(name, BasicInterceptor.beforeTarget, BasicInterceptor.afterTarget); + assertEquals(BasicInterceptor.beforeTarget, BasicInterceptor.afterTarget, name); if (args != null && args.length >= 1) { @@ -471,9 +471,9 @@ private void invokeMethod(final Class clazz, final String methodName, final C assertEquals(args[4], BasicInterceptor.afterArg4); } - assertEquals(name, returnValue, BasicInterceptor.result); + assertEquals(returnValue, BasicInterceptor.result, name); if (throwable) { - assertNotNull(name, BasicInterceptor.throwable); + assertNotNull(BasicInterceptor.throwable, name); } } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterRemapMethodInsnNodeTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterRemapMethodInsnNodeTest.java index 8b1d69e8d8a3..1317b9a1e5e8 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterRemapMethodInsnNodeTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterRemapMethodInsnNodeTest.java @@ -15,8 +15,8 @@ */ package com.navercorp.pinpoint.profiler.instrument; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.MethodNode; @@ -26,7 +26,7 @@ public class ASMMethodNodeAdapterRemapMethodInsnNodeTest { private ASMClassNodeLoader.TestClassLoader classLoader; - @Before + @BeforeEach public void before() { this.classLoader = ASMClassNodeLoader.getClassLoader(); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterRenameTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterRenameTest.java index 587c02334eeb..4988b6937ace 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterRenameTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterRenameTest.java @@ -15,8 +15,8 @@ */ package com.navercorp.pinpoint.profiler.instrument; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.MethodNode; @@ -26,7 +26,7 @@ public class ASMMethodNodeAdapterRenameTest { private ASMClassNodeLoader.TestClassLoader classLoader; - @Before + @BeforeEach public void before() { this.classLoader = ASMClassNodeLoader.getClassLoader(); } @@ -43,7 +43,7 @@ public void handle(ClassNode classNode) { List methodNodes = classNode.methods; for (MethodNode methodNode : methodNodes) { ASMMethodNodeAdapter adapter = new ASMMethodNodeAdapter(classNode.name, methodNode); - if(!adapter.isConstructor()) { + if (!adapter.isConstructor()) { adapter.rename(adapter.getName() + "_rename"); } } @@ -52,6 +52,6 @@ public void handle(ClassNode classNode) { Class clazz = classLoader.loadClass(targetClassName); Method method = clazz.getDeclaredMethod("sum_rename", int.class); method.invoke(clazz.newInstance(), 10); - } + } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterTest.java index 643b51509c3b..b60e0ad46376 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeAdapterTest.java @@ -23,10 +23,10 @@ import com.navercorp.pinpoint.profiler.interceptor.registry.DefaultInterceptorRegistryBinder; import com.navercorp.pinpoint.profiler.interceptor.registry.InterceptorRegistryBinder; import com.navercorp.pinpoint.profiler.util.JavaAssistUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.objectweb.asm.tree.MethodNode; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ASMMethodNodeAdapterTest { private final static InterceptorRegistryBinder interceptorRegistryBinder = new DefaultInterceptorRegistryBinder(); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeTest.java index caf7eaecd01f..e090a468c327 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodNodeTest.java @@ -22,8 +22,8 @@ import com.navercorp.pinpoint.profiler.instrument.mock.ArgsArrayInterceptor; import com.navercorp.pinpoint.profiler.interceptor.registry.DefaultInterceptorRegistryBinder; import com.navercorp.pinpoint.profiler.interceptor.registry.InterceptorRegistryBinder; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.objectweb.asm.tree.ClassNode; @@ -32,9 +32,9 @@ import java.lang.reflect.Method; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -49,7 +49,7 @@ public class ASMMethodNodeTest { private final InstrumentContext pluginContext = mock(InstrumentContext.class); - @Before + @BeforeEach public void setUp() { when(pluginContext.injectClass(any(ClassLoader.class), any(String.class))).thenAnswer(new Answer>() { diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodVariablesTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodVariablesTest.java index 6f6ff3ac4875..93d5a7accc3c 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodVariablesTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ASMMethodVariablesTest.java @@ -24,15 +24,18 @@ import com.navercorp.pinpoint.profiler.interceptor.registry.DefaultInterceptorRegistryBinder; import com.navercorp.pinpoint.profiler.interceptor.registry.InterceptorRegistryBinder; import com.navercorp.pinpoint.profiler.util.JavaAssistUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.objectweb.asm.Type; -import org.objectweb.asm.tree.*; +import org.objectweb.asm.tree.AbstractInsnNode; +import org.objectweb.asm.tree.ClassNode; +import org.objectweb.asm.tree.InsnList; +import org.objectweb.asm.tree.MethodNode; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; /** * @author @@ -59,7 +62,7 @@ public void getParameterNames() throws Exception { ASMMethodNodeAdapter methodNodeAdapter = new ASMMethodNodeAdapter(classNode.name, methodNode); String[] types = methodNodeAdapter.getParameterTypes(); String[] names = methodNodeAdapter.getParameterNames(); - assertEquals(methodNode.name, types.length, names.length); + assertEquals(types.length, names.length, methodNode.name); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/BytecodeDumpServiceTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/BytecodeDumpServiceTest.java index 8a131de811e9..4eb02c031895 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/BytecodeDumpServiceTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/BytecodeDumpServiceTest.java @@ -3,12 +3,12 @@ import com.navercorp.pinpoint.common.util.ClassLoaderUtils; import com.navercorp.pinpoint.profiler.util.BytecodeUtils; import com.navercorp.pinpoint.profiler.util.JavaAssistUtils; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Collections; @@ -18,7 +18,7 @@ /** * @author Woonduk Kang(emeroad) */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class BytecodeDumpServiceTest { private final String classInternalName = JavaAssistUtils.javaNameToJvmName("java.lang.String"); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ScopeFactoryTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ScopeFactoryTest.java index 3290d69575b1..de62b83fd324 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ScopeFactoryTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/ScopeFactoryTest.java @@ -21,12 +21,11 @@ import com.navercorp.pinpoint.bootstrap.interceptor.scope.ExecutionPolicy; import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScope; import com.navercorp.pinpoint.profiler.interceptor.scope.DefaultInterceptorScope; -import org.junit.Assert; -import org.junit.Test; -import org.mockito.Mockito; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; - +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; /** * @author Woonduk Kang(emeroad) @@ -45,8 +44,8 @@ public void newScopeInfo_annotation() { ScopeInfo scopeInfo = scopeFactory.newScopeInfo(context, Interceptor_Annotation.class, null, null); logger.debug("scopeInfo:{}", scopeInfo); - Assert.assertEquals(scopeInfo.getInterceptorScope().getName(), "test"); - Assert.assertEquals(scopeInfo.getExecutionPolicy(), ExecutionPolicy.BOUNDARY); + Assertions.assertEquals(scopeInfo.getInterceptorScope().getName(), "test"); + Assertions.assertEquals(scopeInfo.getExecutionPolicy(), ExecutionPolicy.BOUNDARY); } @Test @@ -59,8 +58,8 @@ public void newScopeInfo_annotation_and_policy() { logger.debug("scopeInfo:{}", scopeInfo); - Assert.assertEquals(scopeInfo.getInterceptorScope().getName(), "test"); - Assert.assertEquals(scopeInfo.getExecutionPolicy(), ExecutionPolicy.ALWAYS); + Assertions.assertEquals(scopeInfo.getInterceptorScope().getName(), "test"); + Assertions.assertEquals(scopeInfo.getExecutionPolicy(), ExecutionPolicy.ALWAYS); } @@ -75,8 +74,8 @@ public void newScopeInfo_policyIsNull() { logger.debug("scopeInfo:{}", scopeInfo); - Assert.assertEquals(scopeInfo.getInterceptorScope().getName(), "test"); - Assert.assertEquals(scopeInfo.getExecutionPolicy(), ExecutionPolicy.BOUNDARY); + Assertions.assertEquals(scopeInfo.getInterceptorScope().getName(), "test"); + Assertions.assertEquals(scopeInfo.getExecutionPolicy(), ExecutionPolicy.BOUNDARY); } @Scope("test") diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classloading/JarProfilerPluginClassInjectorTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classloading/JarProfilerPluginClassInjectorTest.java index 6b5cb652ee79..321e8af4b26c 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classloading/JarProfilerPluginClassInjectorTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classloading/JarProfilerPluginClassInjectorTest.java @@ -17,23 +17,21 @@ package com.navercorp.pinpoint.profiler.instrument.classloading; import com.navercorp.pinpoint.bootstrap.classloader.PinpointClassLoaderFactory; -import com.navercorp.pinpoint.profiler.plugin.JarPlugin; -import com.navercorp.pinpoint.profiler.plugin.Plugin; -import com.navercorp.pinpoint.profiler.plugin.PluginJar; import com.navercorp.pinpoint.common.util.ClassLoaderUtils; import com.navercorp.pinpoint.common.util.CodeSourceUtils; +import com.navercorp.pinpoint.profiler.plugin.JarPlugin; +import com.navercorp.pinpoint.profiler.plugin.Plugin; import com.navercorp.pinpoint.profiler.plugin.PluginConfig; +import com.navercorp.pinpoint.profiler.plugin.PluginJar; import com.navercorp.pinpoint.profiler.plugin.PluginPackageFilter; import org.apache.commons.lang.CharRange; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.junit.Assert; -import org.junit.Test; - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.lang.reflect.Constructor; import java.net.URL; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -63,8 +61,8 @@ public void testInjectClass() throws Exception { final Class commonsLangClass = injector.injectClass(contextTypeMatchClassLoader, className); logger.debug("ClassLoader{}", commonsLangClass.getClassLoader()); - Assert.assertEquals("check className", commonsLangClass.getName(), className); - Assert.assertEquals("check ClassLoader", commonsLangClass.getClassLoader().getClass().getName(), CONTEXT_TYPE_MATCH_CLASS_LOADER); + Assertions.assertEquals(commonsLangClass.getName(), className, "check className"); + Assertions.assertEquals(commonsLangClass.getClassLoader().getClass().getName(), CONTEXT_TYPE_MATCH_CLASS_LOADER, "check ClassLoader"); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classloading/PlainClassLoaderHandlerTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classloading/PlainClassLoaderHandlerTest.java index 001a2402ebcc..c68ff9e090b8 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classloading/PlainClassLoaderHandlerTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classloading/PlainClassLoaderHandlerTest.java @@ -16,11 +16,11 @@ package com.navercorp.pinpoint.profiler.instrument.classloading; -import com.navercorp.pinpoint.profiler.plugin.JarPlugin; import com.navercorp.pinpoint.profiler.plugin.ClassNameFilter; +import com.navercorp.pinpoint.profiler.plugin.JarPlugin; import com.navercorp.pinpoint.profiler.plugin.PluginConfig; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.jar.JarFile; @@ -39,9 +39,9 @@ public void injectClass_bootstrapClass() { ClassInjector plainClassLoaderHandler = new PlainClassLoaderHandler(pluginConfig); try { plainClassLoaderHandler.injectClass(this.getClass().getClassLoader(), "com.navercorp.pinpoint.bootstrap.Test"); - Assert.fail(); + Assertions.fail(); } catch (NullPointerException e) { - Assert.fail(); + Assertions.fail(); } catch (Exception e) { } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/ClassReaderWrapperTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/ClassReaderWrapperTest.java index f5010d3dbd68..b805e6648e3c 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/ClassReaderWrapperTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/ClassReaderWrapperTest.java @@ -18,11 +18,14 @@ import com.navercorp.pinpoint.common.util.ClassLoaderUtils; import com.navercorp.pinpoint.profiler.util.BytecodeUtils; import com.navercorp.pinpoint.profiler.util.JavaAssistUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.annotation.Resource; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/DefaultInternalClassMetadataTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/DefaultInternalClassMetadataTest.java index 7298474c9153..245561647e1c 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/DefaultInternalClassMetadataTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/DefaultInternalClassMetadataTest.java @@ -15,12 +15,13 @@ */ package com.navercorp.pinpoint.profiler.instrument.classreading; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/DefaultSimpleClassMetadataTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/DefaultSimpleClassMetadataTest.java index ea22eb4e135c..5209239fff83 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/DefaultSimpleClassMetadataTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/DefaultSimpleClassMetadataTest.java @@ -15,11 +15,12 @@ */ package com.navercorp.pinpoint.profiler.instrument.classreading; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/InternalClassMetadataReaderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/InternalClassMetadataReaderTest.java index 791445a05941..e81159e3463c 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/InternalClassMetadataReaderTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/InternalClassMetadataReaderTest.java @@ -18,12 +18,13 @@ import com.navercorp.pinpoint.common.util.ClassLoaderUtils; import com.navercorp.pinpoint.profiler.util.BytecodeUtils; import com.navercorp.pinpoint.profiler.util.JavaAssistUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.lang.annotation.Annotation; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; /** * @author jaehong.kim @@ -42,7 +43,7 @@ public void getInternalClassMetadata() { // interfaces for (Class interfacez : clazz.getInterfaces()) { final String interfaceInternalName = JavaAssistUtils.javaNameToJvmName(interfacez.getName()); - Assert.assertTrue(classMetadata.getInterfaceInternalNames().contains(interfaceInternalName)); + Assertions.assertTrue(classMetadata.getInterfaceInternalNames().contains(interfaceInternalName)); } // super @@ -51,7 +52,7 @@ public void getInternalClassMetadata() { // annotations for (Annotation annotation : clazz.getAnnotations()) { final String annotationInternalName = JavaAssistUtils.javaNameToJvmName(annotation.annotationType().getName()); - Assert.assertTrue(classMetadata.getAnnotationInternalNames().contains(annotationInternalName)); + Assertions.assertTrue(classMetadata.getAnnotationInternalNames().contains(annotationInternalName)); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/SimpleClassMetadataReaderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/SimpleClassMetadataReaderTest.java index 12f9d51984f7..71c68c4ff624 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/SimpleClassMetadataReaderTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/classreading/SimpleClassMetadataReaderTest.java @@ -19,11 +19,11 @@ import com.navercorp.pinpoint.common.util.ClassLoaderUtils; import com.navercorp.pinpoint.profiler.util.BytecodeUtils; -import org.hamcrest.MatcherAssert; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hamcrest.MatcherAssert; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -43,7 +43,7 @@ public void testSimpleClassMetadata() { SimpleClassMetadata simpleClassMetadata = SimpleClassMetadataReader.readSimpleClassMetadata(classFile); // name. - Assert.assertEquals(simpleClassMetadata.getClassName(), clazz.getName()); + Assertions.assertEquals(simpleClassMetadata.getClassName(), clazz.getName()); // interfaces List interfaceList = getInterfaceList(clazz.getInterfaces()); @@ -51,7 +51,7 @@ public void testSimpleClassMetadata() { MatcherAssert.assertThat(interfaceNames, containsInAnyOrder(interfaceList.toArray())); // super - Assert.assertEquals(simpleClassMetadata.getSuperClassName(), "java.lang.Object"); + Assertions.assertEquals(simpleClassMetadata.getSuperClassName(), "java.lang.Object"); // access simpleClassMetadata.getAccessFlag(); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/config/DefaultInstrumentConfigTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/config/DefaultInstrumentConfigTest.java index eb472deaf165..05d432a891a7 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/config/DefaultInstrumentConfigTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/config/DefaultInstrumentConfigTest.java @@ -18,20 +18,19 @@ import com.navercorp.pinpoint.bootstrap.config.Filter; import com.navercorp.pinpoint.bootstrap.config.util.ValueAnnotationProcessor; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Properties; - public class DefaultInstrumentConfigTest { private final ValueAnnotationProcessor valueAnnotationProcessor = new ValueAnnotationProcessor(); @Test - public void defaultProfilableClassFilter(){ + public void defaultProfilableClassFilter() { InstrumentConfig instrumentConfig = new DefaultInstrumentConfig(); Filter profilableClassFilter = instrumentConfig.getProfilableClassFilter(); - Assert.assertFalse(profilableClassFilter.filter("net/spider/king/wang/Jjang")); + Assertions.assertFalse(profilableClassFilter.filter("net/spider/king/wang/Jjang")); } @Test @@ -41,22 +40,22 @@ public void getCallStackMaxDepth() { // Read InstrumentConfig instrumentConfig = new DefaultInstrumentConfig(); - valueAnnotationProcessor.process(instrumentConfig, properties);; + valueAnnotationProcessor.process(instrumentConfig, properties); - Assert.assertEquals(instrumentConfig.getCallStackMaxDepth(), 64); + Assertions.assertEquals(instrumentConfig.getCallStackMaxDepth(), 64); // Unlimited properties.setProperty("profiler.callstack.max.depth", "-1"); instrumentConfig = new DefaultInstrumentConfig(); valueAnnotationProcessor.process(instrumentConfig, properties); - Assert.assertEquals(instrumentConfig.getCallStackMaxDepth(), -1); + Assertions.assertEquals(instrumentConfig.getCallStackMaxDepth(), -1); // Minimum calibration properties.setProperty("profiler.callstack.max.depth", "0"); instrumentConfig = new DefaultInstrumentConfig(); valueAnnotationProcessor.process(instrumentConfig, properties); - Assert.assertEquals(instrumentConfig.getCallStackMaxDepth(), 2); + Assertions.assertEquals(instrumentConfig.getCallStackMaxDepth(), 2); } @Test @@ -66,33 +65,33 @@ public void getCallStackMaxSequence() { // Read InstrumentConfig instrumentConfig = new DefaultInstrumentConfig(); - valueAnnotationProcessor.process(instrumentConfig, properties);; + valueAnnotationProcessor.process(instrumentConfig, properties); - Assert.assertEquals(instrumentConfig.getCallStackMaxSequence(), 5000); + Assertions.assertEquals(instrumentConfig.getCallStackMaxSequence(), 5000); // Unlimited properties.setProperty("profiler.callstack.max.sequence", "-1"); instrumentConfig = new DefaultInstrumentConfig(); valueAnnotationProcessor.process(instrumentConfig, properties); - Assert.assertEquals(instrumentConfig.getCallStackMaxSequence(), 32767); + Assertions.assertEquals(instrumentConfig.getCallStackMaxSequence(), 32767); properties.setProperty("profiler.callstack.max.sequence", "-73"); instrumentConfig = new DefaultInstrumentConfig(); valueAnnotationProcessor.process(instrumentConfig, properties); - Assert.assertEquals(instrumentConfig.getCallStackMaxSequence(), 32767); + Assertions.assertEquals(instrumentConfig.getCallStackMaxSequence(), 32767); // short overflow properties.setProperty("profiler.callstack.max.sequence", "1048576"); instrumentConfig = new DefaultInstrumentConfig(); valueAnnotationProcessor.process(instrumentConfig, properties); - Assert.assertEquals(instrumentConfig.getCallStackMaxSequence(), 32767); + Assertions.assertEquals(instrumentConfig.getCallStackMaxSequence(), 32767); // Minimum calibration properties.setProperty("profiler.callstack.max.sequence", "0"); instrumentConfig = new DefaultInstrumentConfig(); valueAnnotationProcessor.process(instrumentConfig, properties); - Assert.assertEquals(instrumentConfig.getCallStackMaxSequence(), 4); + Assertions.assertEquals(instrumentConfig.getCallStackMaxSequence(), 4); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/config/DefaultInstrumentMatcherCacheConfigTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/config/DefaultInstrumentMatcherCacheConfigTest.java index ac6bc4061191..3f2c0fe816b7 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/config/DefaultInstrumentMatcherCacheConfigTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/config/DefaultInstrumentMatcherCacheConfigTest.java @@ -17,11 +17,11 @@ package com.navercorp.pinpoint.profiler.instrument.config; import com.navercorp.pinpoint.bootstrap.config.util.ValueAnnotationProcessor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Properties; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class DefaultInstrumentMatcherCacheConfigTest { diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InterceptorDefinitionFactoryTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InterceptorDefinitionFactoryTest.java index e12e03773fdd..356f9e4ee3a9 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InterceptorDefinitionFactoryTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InterceptorDefinitionFactoryTest.java @@ -18,11 +18,10 @@ import com.navercorp.pinpoint.bootstrap.interceptor.*; import com.navercorp.pinpoint.bootstrap.interceptor.annotation.IgnoreMethod; - -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.lang.reflect.Method; @@ -32,22 +31,23 @@ public class InterceptorDefinitionFactoryTest { private final Logger logger = LogManager.getLogger(this.getClass()); + @Test public void testGetInterceptorType_BasicType() { InterceptorDefinitionFactory typeDetector = new InterceptorDefinitionFactory(); - Assert.assertSame(typeDetector.createInterceptorDefinition(AroundInterceptor.class).getCaptureType(), CaptureType.AROUND); + Assertions.assertSame(typeDetector.createInterceptorDefinition(AroundInterceptor.class).getCaptureType(), CaptureType.AROUND); - Assert.assertSame(typeDetector.createInterceptorDefinition(AroundInterceptor0.class).getCaptureType(), CaptureType.AROUND); - Assert.assertSame(typeDetector.createInterceptorDefinition(AroundInterceptor1.class).getCaptureType(), CaptureType.AROUND); - Assert.assertSame(typeDetector.createInterceptorDefinition(AroundInterceptor2.class).getCaptureType(), CaptureType.AROUND); - Assert.assertSame(typeDetector.createInterceptorDefinition(AroundInterceptor3.class).getCaptureType(), CaptureType.AROUND); - Assert.assertSame(typeDetector.createInterceptorDefinition(AroundInterceptor4.class).getCaptureType(), CaptureType.AROUND); - Assert.assertSame(typeDetector.createInterceptorDefinition(AroundInterceptor5.class).getCaptureType(), CaptureType.AROUND); + Assertions.assertSame(typeDetector.createInterceptorDefinition(AroundInterceptor0.class).getCaptureType(), CaptureType.AROUND); + Assertions.assertSame(typeDetector.createInterceptorDefinition(AroundInterceptor1.class).getCaptureType(), CaptureType.AROUND); + Assertions.assertSame(typeDetector.createInterceptorDefinition(AroundInterceptor2.class).getCaptureType(), CaptureType.AROUND); + Assertions.assertSame(typeDetector.createInterceptorDefinition(AroundInterceptor3.class).getCaptureType(), CaptureType.AROUND); + Assertions.assertSame(typeDetector.createInterceptorDefinition(AroundInterceptor4.class).getCaptureType(), CaptureType.AROUND); + Assertions.assertSame(typeDetector.createInterceptorDefinition(AroundInterceptor5.class).getCaptureType(), CaptureType.AROUND); - Assert.assertSame(typeDetector.createInterceptorDefinition(StaticAroundInterceptor.class).getCaptureType(), CaptureType.AROUND); + Assertions.assertSame(typeDetector.createInterceptorDefinition(StaticAroundInterceptor.class).getCaptureType(), CaptureType.AROUND); - Assert.assertSame(typeDetector.createInterceptorDefinition(ApiIdAwareAroundInterceptor.class).getCaptureType(), CaptureType.AROUND); + Assertions.assertSame(typeDetector.createInterceptorDefinition(ApiIdAwareAroundInterceptor.class).getCaptureType(), CaptureType.AROUND); } @@ -55,7 +55,7 @@ public void testGetInterceptorType_BasicType() { public void testGetInterceptorType_Inherited() { InterceptorDefinitionFactory typeDetector = new InterceptorDefinitionFactory(); - Assert.assertSame(typeDetector.createInterceptorDefinition(InheritedAroundInterceptor.class).getCaptureType(), CaptureType.AROUND); + Assertions.assertSame(typeDetector.createInterceptorDefinition(InheritedAroundInterceptor.class).getCaptureType(), CaptureType.AROUND); } @Test @@ -69,10 +69,12 @@ public void testDeclaredMethods() { } - @Test(expected = RuntimeException.class) + @Test public void testGetType_Error() { - InterceptorDefinitionFactory typeDetector = new InterceptorDefinitionFactory(); - typeDetector.createInterceptorDefinition(Interceptor.class); + Assertions.assertThrows(RuntimeException.class, () -> { + InterceptorDefinitionFactory typeDetector = new InterceptorDefinitionFactory(); + typeDetector.createInterceptorDefinition(Interceptor.class); + }); } @@ -94,20 +96,20 @@ public void testGetInterceptorCaptureType() { } private void assertInterceptorType(InterceptorDefinition interceptor, CaptureType aroundType, String beforeName, String afterName) { - Assert.assertSame("Type", aroundType, aroundType); + Assertions.assertSame(aroundType, aroundType, "Type"); if (beforeName == null) { - Assert.assertNull("before is null", interceptor.getBeforeMethod()); + Assertions.assertNull(interceptor.getBeforeMethod(), "before is null"); } else { - Assert.assertNotNull("after is not null", interceptor.getBeforeMethod()); - Assert.assertEquals("check beforeName", interceptor.getBeforeMethod().getName(), beforeName); + Assertions.assertNotNull(interceptor.getBeforeMethod(), "after is not null"); + Assertions.assertEquals(interceptor.getBeforeMethod().getName(), beforeName, "check beforeName"); } if (afterName == null) { - Assert.assertNull("after is null", interceptor.getAfterMethod()); + Assertions.assertNull(interceptor.getAfterMethod(), "after is null"); } else { - Assert.assertNotNull("after is not null", interceptor.getAfterMethod()); - Assert.assertEquals("check afterName", interceptor.getAfterMethod().getName(), afterName); + Assertions.assertNotNull(interceptor.getAfterMethod(), "after is not null"); + Assertions.assertEquals(interceptor.getAfterMethod().getName(), afterName, "check afterName"); } } @@ -118,6 +120,7 @@ public static class TestBeforeInterceptor implements AroundInterceptor { public void before(Object target, Object[] args) { } + @IgnoreMethod @Override public void after(Object target, Object[] args, Object result, Throwable throwable) { @@ -156,6 +159,7 @@ public static class TestIgnoreInterceptor implements AroundInterceptor { public void before(Object target, Object[] args) { } + @IgnoreMethod @Override public void after(Object target, Object[] args, Object result, Throwable throwable) { diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InvokeAfterCodeGeneratorTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InvokeAfterCodeGeneratorTest.java index e115c7823ca4..34b630e4f6eb 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InvokeAfterCodeGeneratorTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/interceptor/InvokeAfterCodeGeneratorTest.java @@ -16,19 +16,18 @@ package com.navercorp.pinpoint.profiler.instrument.interceptor; -import static org.mockito.Mockito.*; - -import com.navercorp.pinpoint.profiler.metadata.ApiMetaDataService; -import org.junit.Assert; -import org.junit.Test; -import org.mockito.Mockito; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; - import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor0; import com.navercorp.pinpoint.bootstrap.interceptor.AroundInterceptor3; +import com.navercorp.pinpoint.profiler.metadata.ApiMetaDataService; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; + +import static org.mockito.Mockito.mock; /** * @author emeroad @@ -37,6 +36,7 @@ public class InvokeAfterCodeGeneratorTest { private final Logger logger = LogManager.getLogger(this.getClass()); private final InterceptorDefinitionFactory interceptorDefinitionFactory = new InterceptorDefinitionFactory(); + @Test public void testGenerate_AroundInterceptor3_catchClause() { @@ -58,11 +58,11 @@ public void testGenerate_AroundInterceptor3_catchClause() { final String generate = invokeAfterCodeGenerator.generate(); logger.debug("testGenerate_AroundInterceptor3_catchClause:{}", generate); - Assert.assertTrue(generate.contains("($w)$1")); - Assert.assertTrue(generate.contains("($w)$2")); - Assert.assertTrue(generate.contains("($w)$3")); + Assertions.assertTrue(generate.contains("($w)$1")); + Assertions.assertTrue(generate.contains("($w)$2")); + Assertions.assertTrue(generate.contains("($w)$3")); - Assert.assertTrue(generate.contains("$e")); + Assertions.assertTrue(generate.contains("$e")); } @@ -86,11 +86,11 @@ public void testGenerate_AroundInterceptor3_NoCatchClause() { final String generate = invokeAfterCodeGenerator.generate(); logger.debug("testGenerate_AroundInterceptor3_NoCatchClause:{}", generate); - Assert.assertTrue(generate.contains("($w)$1")); - Assert.assertTrue(generate.contains("($w)$2")); - Assert.assertTrue(generate.contains("($w)$3")); + Assertions.assertTrue(generate.contains("($w)$1")); + Assertions.assertTrue(generate.contains("($w)$2")); + Assertions.assertTrue(generate.contains("($w)$3")); - Assert.assertTrue(generate.contains("($w)$_")); + Assertions.assertTrue(generate.contains("($w)$_")); } @@ -115,11 +115,11 @@ public void testGenerate_AroundInterceptor3_methodParam2() { final String generate = invokeAfterCodeGenerator.generate(); logger.debug("testGenerate_AroundInterceptor3_methodParam2:{}", generate); - Assert.assertTrue(generate.contains("($w)$1")); - Assert.assertTrue(generate.contains("($w)$2")); - Assert.assertFalse(generate.contains("($w)$3")); + Assertions.assertTrue(generate.contains("($w)$1")); + Assertions.assertTrue(generate.contains("($w)$2")); + Assertions.assertFalse(generate.contains("($w)$3")); - Assert.assertTrue(generate.contains("$e")); + Assertions.assertTrue(generate.contains("$e")); } @@ -143,12 +143,12 @@ public void testGenerate_AroundInterceptor3_methodParam4() { final String generate = invokeAfterCodeGenerator.generate(); logger.debug("testGenerate_AroundInterceptor3_methodParam4:{}", generate); - Assert.assertTrue(generate.contains("($w)$1")); - Assert.assertTrue(generate.contains("($w)$2")); - Assert.assertTrue(generate.contains("($w)$3")); - Assert.assertFalse(generate.contains("($w)$4")); + Assertions.assertTrue(generate.contains("($w)$1")); + Assertions.assertTrue(generate.contains("($w)$2")); + Assertions.assertTrue(generate.contains("($w)$3")); + Assertions.assertFalse(generate.contains("($w)$4")); - Assert.assertTrue(generate.contains("$e")); + Assertions.assertTrue(generate.contains("$e")); } @@ -173,11 +173,11 @@ public void testGenerate_AroundInterceptor0() { final String generate = invokeAfterCodeGenerator.generate(); logger.debug("testGenerate_AroundInterceptor0:{}", generate); - Assert.assertFalse(generate.contains("($w)$1")); - Assert.assertFalse(generate.contains("($w)$2")); - Assert.assertFalse(generate.contains("($w)$3")); + Assertions.assertFalse(generate.contains("($w)$1")); + Assertions.assertFalse(generate.contains("($w)$2")); + Assertions.assertFalse(generate.contains("($w)$3")); - Assert.assertTrue(generate.contains("$e")); + Assertions.assertTrue(generate.contains("$e")); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/scanner/ClassScannerFactoryTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/scanner/ClassScannerFactoryTest.java index 1b708e99b559..c2ef3d0a2af3 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/scanner/ClassScannerFactoryTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/scanner/ClassScannerFactoryTest.java @@ -17,10 +17,10 @@ package com.navercorp.pinpoint.profiler.instrument.scanner; import com.navercorp.pinpoint.profiler.util.JavaAssistUtils; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.URL; @@ -49,7 +49,7 @@ public void hasClass_directory() { String fileName = JavaAssistUtils.javaClassNameToJvmResourceName(testClass.getName()); boolean exist = scanner.exist(fileName); scanner.close(); - Assert.assertTrue(exist); + Assertions.assertTrue(exist); } @Test @@ -60,7 +60,7 @@ public void hasClass_Jar() { String fileName = JavaAssistUtils.javaClassNameToJvmResourceName(testClass.getName()); boolean exist = scanner.exist(fileName); scanner.close(); - Assert.assertTrue(exist); + Assertions.assertTrue(exist); } @Test @@ -71,7 +71,7 @@ public void hasClass_classLoader() { String fileName = JavaAssistUtils.javaClassNameToJvmResourceName(testClass.getName()); boolean exist = scanner.exist(fileName); scanner.close(); - Assert.assertTrue(exist); + Assertions.assertTrue(exist); } @Test @@ -82,42 +82,42 @@ public void hasClass_classLoader_notfound() { String fileName = JavaAssistUtils.javaClassNameToJvmResourceName("test.Test"); boolean exist = scanner.exist(fileName); scanner.close(); - Assert.assertFalse(exist); + Assertions.assertFalse(exist); } @Test public void isFileProtocol() { - Assert.assertTrue(ClassScannerFactory.isFileProtocol("file")); + Assertions.assertTrue(ClassScannerFactory.isFileProtocol("file")); // for jboss vfs support - Assert.assertTrue(ClassScannerFactory.isFileProtocol("vfs")); + Assertions.assertTrue(ClassScannerFactory.isFileProtocol("vfs")); - Assert.assertFalse(ClassScannerFactory.isFileProtocol("cd")); + Assertions.assertFalse(ClassScannerFactory.isFileProtocol("cd")); } @Test public void isJarExtension() { - Assert.assertTrue(ClassScannerFactory.isJarExtension(".jar")); - Assert.assertTrue(ClassScannerFactory.isJarExtension(".war")); - Assert.assertTrue(ClassScannerFactory.isJarExtension(".ear")); + Assertions.assertTrue(ClassScannerFactory.isJarExtension(".jar")); + Assertions.assertTrue(ClassScannerFactory.isJarExtension(".war")); + Assertions.assertTrue(ClassScannerFactory.isJarExtension(".ear")); - Assert.assertFalse(ClassScannerFactory.isJarExtension(".zip")); + Assertions.assertFalse(ClassScannerFactory.isJarExtension(".zip")); } @Test public void isNestedJar() { - Assert.assertTrue(ClassScannerFactory.isNestedJar("file:/path/to/some.jar!/nested/another.jar!/")); - - Assert.assertFalse(ClassScannerFactory.isNestedJar(null)); - Assert.assertFalse(ClassScannerFactory.isNestedJar("")); - Assert.assertFalse(ClassScannerFactory.isNestedJar("/path/to/some.jar")); - Assert.assertFalse(ClassScannerFactory.isNestedJar("/path/to/some.jar!/")); - Assert.assertFalse(ClassScannerFactory.isNestedJar("file:/path/to/some.jar")); - Assert.assertFalse(ClassScannerFactory.isNestedJar("file:/path/to/some.jar!/")); + Assertions.assertTrue(ClassScannerFactory.isNestedJar("file:/path/to/some.jar!/nested/another.jar!/")); + + Assertions.assertFalse(ClassScannerFactory.isNestedJar(null)); + Assertions.assertFalse(ClassScannerFactory.isNestedJar("")); + Assertions.assertFalse(ClassScannerFactory.isNestedJar("/path/to/some.jar")); + Assertions.assertFalse(ClassScannerFactory.isNestedJar("/path/to/some.jar!/")); + Assertions.assertFalse(ClassScannerFactory.isNestedJar("file:/path/to/some.jar")); + Assertions.assertFalse(ClassScannerFactory.isNestedJar("file:/path/to/some.jar!/")); } - /* - * https://github.com/naver/pinpoint/issues/6670 - */ + /* + * https://github.com/naver/pinpoint/issues/6670 + */ @Test public void jar_file_prefix_github_6670() throws IOException, ClassNotFoundException { Class testClass = Logger.class; @@ -126,7 +126,7 @@ public void jar_file_prefix_github_6670() throws IOException, ClassNotFoundExcep URL classUrl = codeSource.getLocation(); String jarURLSpec = ClassScannerFactory.JAR_URL_PREFIX + classUrl.toExternalForm() + ClassScannerFactory.JAR_URL_SEPARATOR; - Assert.assertTrue(jarURLSpec.startsWith(ClassScannerFactory.JAR_URL_PREFIX + ClassScannerFactory.FILE_URL_PREFIX)); + Assertions.assertTrue(jarURLSpec.startsWith(ClassScannerFactory.JAR_URL_PREFIX + ClassScannerFactory.FILE_URL_PREFIX)); URL url = new URL(jarURLSpec); ProtectionDomain protectionDomain = newProtectionDomain(url); @@ -134,11 +134,11 @@ public void jar_file_prefix_github_6670() throws IOException, ClassNotFoundExcep String fileName = JavaAssistUtils.javaClassNameToJvmResourceName(testClass.getName()); boolean exist = scanner.exist(fileName); scanner.close(); - Assert.assertTrue(exist); + Assertions.assertTrue(exist); } private ProtectionDomain newProtectionDomain(URL url) { - CodeSource codeSource = new CodeSource(url, (CodeSigner[])null); + CodeSource codeSource = new CodeSource(url, (CodeSigner[]) null); return new ProtectionDomain(codeSource, null); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/DefaultHierarchyCachesTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/DefaultHierarchyCachesTest.java index 8684d01564ea..4691249b2d37 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/DefaultHierarchyCachesTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/DefaultHierarchyCachesTest.java @@ -15,10 +15,10 @@ */ package com.navercorp.pinpoint.profiler.instrument.transformer; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/DefaultLambdaClassFileResolverTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/DefaultLambdaClassFileResolverTest.java index 873f7e25ef2d..fc5bb8d64abc 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/DefaultLambdaClassFileResolverTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/DefaultLambdaClassFileResolverTest.java @@ -18,13 +18,12 @@ import com.navercorp.pinpoint.common.util.IOUtils; import com.navercorp.pinpoint.profiler.util.JavaAssistUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.InputStream; - /** * @author Woonduk Kang(emeroad) */ @@ -41,6 +40,6 @@ public void resolve() throws IOException { LambdaClassFileResolver resolver = new DefaultLambdaClassFileResolver(); String resolve = resolver.resolve(null, null, null, bytes); - Assert.assertEquals(resolve, stringName); + Assertions.assertEquals(resolve, stringName); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/DefaultTransformerMatcherTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/DefaultTransformerMatcherTest.java index b6be8e69b518..c10a6f248b86 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/DefaultTransformerMatcherTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/DefaultTransformerMatcherTest.java @@ -16,8 +16,6 @@ package com.navercorp.pinpoint.profiler.instrument.transformer; -import com.navercorp.pinpoint.profiler.instrument.config.DefaultInstrumentMatcherCacheConfig; -import com.navercorp.pinpoint.profiler.instrument.config.InstrumentMatcherCacheConfig; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.AnnotationInternalNameMatcherOperand; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.ClassInternalNameMatcherOperand; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.InterfaceInternalNameMatcherOperand; @@ -26,14 +24,17 @@ import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.SuperClassInternalNameMatcherOperand; import com.navercorp.pinpoint.profiler.instrument.classreading.InternalClassMetadata; import com.navercorp.pinpoint.profiler.instrument.classreading.InternalClassMetadataReader; +import com.navercorp.pinpoint.profiler.instrument.config.DefaultInstrumentMatcherCacheConfig; +import com.navercorp.pinpoint.profiler.instrument.config.InstrumentMatcherCacheConfig; import com.navercorp.pinpoint.profiler.util.JavaAssistUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.annotation.Resource; import java.io.IOException; import java.io.InputStream; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author jaehong.kim diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/MatchableTransformerRegistryTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/MatchableTransformerRegistryTest.java index 3d0f215984b2..b4fb69ceb69a 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/MatchableTransformerRegistryTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/MatchableTransformerRegistryTest.java @@ -16,15 +16,15 @@ package com.navercorp.pinpoint.profiler.instrument.transformer; -import com.navercorp.pinpoint.profiler.instrument.config.DefaultInstrumentMatcherCacheConfig; import com.navercorp.pinpoint.bootstrap.instrument.matcher.Matcher; import com.navercorp.pinpoint.bootstrap.instrument.matcher.Matchers; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.MatcherOperand; +import com.navercorp.pinpoint.profiler.instrument.config.DefaultInstrumentMatcherCacheConfig; import com.navercorp.pinpoint.profiler.plugin.Foo; import com.navercorp.pinpoint.profiler.plugin.MatchableClassFileTransformer; import com.navercorp.pinpoint.profiler.sender.Bar; import com.navercorp.pinpoint.profiler.util.BytecodeUtils; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.lang.instrument.ClassFileTransformer; import java.lang.instrument.IllegalClassFormatException; @@ -35,8 +35,7 @@ import java.util.TreeMap; import java.util.concurrent.atomic.AtomicLong; -import static org.junit.Assert.assertEquals; - +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author jaehong.kim diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/TransformerMatcherExecutionPlannerTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/TransformerMatcherExecutionPlannerTest.java index 6e1e813024a2..285d8e81ee5c 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/TransformerMatcherExecutionPlannerTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/instrument/transformer/TransformerMatcherExecutionPlannerTest.java @@ -22,11 +22,11 @@ import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.MatcherOperand; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.PackageInternalNameMatcherOperand; import com.navercorp.pinpoint.bootstrap.instrument.matcher.operand.SuperClassInternalNameMatcherOperand; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author jaehong.kim diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/bci/CodeBuilderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/bci/CodeBuilderTest.java index 238d4fa4c3c4..196c124f84af 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/bci/CodeBuilderTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/bci/CodeBuilderTest.java @@ -16,10 +16,9 @@ package com.navercorp.pinpoint.profiler.interceptor.bci; -import org.junit.Assert; -import org.junit.Test; - import com.navercorp.pinpoint.profiler.instrument.interceptor.CodeBuilder; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -31,7 +30,7 @@ public void testCodeBuilder() { builder.begin(); builder.format("1"); builder.end(); - Assert.assertEquals("{1}", builder.toString()); + Assertions.assertEquals("{1}", builder.toString()); } @Test @@ -41,7 +40,7 @@ public void testFormat() { builder.format("1"); builder.format("2"); builder.end(); - Assert.assertEquals("{12}", builder.toString()); + Assertions.assertEquals("{12}", builder.toString()); } @Test @@ -51,7 +50,7 @@ public void testFormatAppend() { builder.format("1"); builder.append("2"); builder.end(); - Assert.assertEquals("{12}", builder.toString()); + Assertions.assertEquals("{12}", builder.toString()); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/bci/FormatTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/bci/FormatTest.java index a54f0da316e1..f752501d43bc 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/bci/FormatTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/bci/FormatTest.java @@ -16,10 +16,10 @@ package com.navercorp.pinpoint.profiler.interceptor.bci; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Formatter; @@ -36,7 +36,7 @@ public void format() { formatter.format("%1s", "ab"); formatter.format("%3s", "a"); - Assert.assertEquals(buffer.toString(), "ab a"); + Assertions.assertEquals(buffer.toString(), "ab a"); } @Test @@ -45,6 +45,6 @@ public void format2() { Formatter formatter = new Formatter(buffer); formatter.format("(%s, %s, %s)", 1, 2, 3); - Assert.assertEquals(buffer.toString(), "(1, 2, 3)"); + Assertions.assertEquals(buffer.toString(), "(1, 2, 3)"); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/jdbc/BindValueConverterTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/jdbc/BindValueConverterTest.java index 7363bfc532f0..ad72952608b3 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/jdbc/BindValueConverterTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/jdbc/BindValueConverterTest.java @@ -18,11 +18,10 @@ package com.navercorp.pinpoint.profiler.jdbc; import com.navercorp.pinpoint.common.util.StringUtils; -import org.junit.Assert; - -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; import java.util.Arrays; @@ -39,7 +38,7 @@ public void testBindValueToString() { Date d = new Date(); logger.debug("{}", d); - byte[] bytes = new byte[] {1, 2, 4}; + byte[] bytes = new byte[]{1, 2, 4}; String s = Arrays.toString(bytes); logger.debug(s); } @@ -47,14 +46,14 @@ public void testBindValueToString() { @Test public void testBindValueBoolean() { String setBoolean = bindValueConverter.convert("setBoolean", new Object[]{null, Boolean.TRUE}); - Assert.assertEquals(setBoolean, Boolean.TRUE.toString()); + Assertions.assertEquals(setBoolean, Boolean.TRUE.toString()); } @Test public void testBindValueNotSupport() { // Should not throw even if given arguments are not supported value String setBoolean = bindValueConverter.convert("setXxxx", new Object[]{null, "XXX"}); - Assert.assertEquals(setBoolean, ""); + Assertions.assertEquals(setBoolean, ""); } @Test @@ -69,7 +68,7 @@ public void testBindValueBytes() { BindValueConverter bindValueConverter = BindValueConverter.defaultBindValueConverter(); bindValueConverter.setHexBytesConverter(); String setBytes = bindValueConverter.convert("setBytes", new Object[]{null, bytes}); - Assert.assertEquals(setBytes, uuidHex); + Assertions.assertEquals(setBytes, uuidHex); } @Test @@ -78,6 +77,6 @@ public void testMaxWidth() { BindValueConverter converter = BindValueConverter.defaultBindValueConverter(maxWidth); String stringValue = converter.convert("setString", new Object[]{null, "abc"}); - Assert.assertEquals(StringUtils.abbreviate("abc", maxWidth), stringValue); + Assertions.assertEquals(StringUtils.abbreviate("abc", maxWidth), stringValue); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/jdbc/BindValueUtilsTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/jdbc/BindValueUtilsTest.java index e8efef835551..e52104d9e1e9 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/jdbc/BindValueUtilsTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/jdbc/BindValueUtilsTest.java @@ -17,47 +17,47 @@ package com.navercorp.pinpoint.profiler.jdbc; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + import java.util.HashMap; import java.util.Map; -import org.junit.Assert; -import org.junit.Test; - public class BindValueUtilsTest { @Test public void testBindValueToString() { String[] bindValue = {"a", "b"}; String result = BindValueUtils.bindValueToString(bindValue); - Assert.assertEquals("a, b", result); + Assertions.assertEquals("a, b", result); } @Test public void testBindValueToString_limit1() { String[] bindValue = {"a", "b"}; String result = BindValueUtils.bindValueToString(bindValue, 0); - Assert.assertEquals("...(2)", result); + Assertions.assertEquals("...(2)", result); } @Test public void testBindValueToString_limit2() { String[] bindValue = {"a", "b"}; String result = BindValueUtils.bindValueToString(bindValue, 1); - Assert.assertEquals("a, ...(2)", result); + Assertions.assertEquals("a, ...(2)", result); } @Test public void testBindValueToString_limit3() { String[] bindValue = {"abc", "b"}; String result = BindValueUtils.bindValueToString(bindValue, 1); - Assert.assertEquals("a...(3), ...(2)", result); + Assertions.assertEquals("a...(3), ...(2)", result); } @Test public void testBindValueToString_limit4() { String[] bindValue = {"abc", "b", "c"}; String result = BindValueUtils.bindValueToString(bindValue, 1); - Assert.assertEquals("a...(3), ...(3)", result); + Assertions.assertEquals("a...(3), ...(3)", result); } @@ -65,7 +65,7 @@ public void testBindValueToString_limit4() { public void testBindValueToString_limit5() { String[] bindValue = {"abc", "b", "c"}; String result = BindValueUtils.bindValueToString(bindValue, 1024); - Assert.assertEquals("abc, b, c", result); + Assertions.assertEquals("abc, b, c", result); } @Test @@ -73,7 +73,7 @@ public void testBindValueToString_limit6() { String[] bindValue = {"a", "b", "1234567891012"}; // limit is smaller than 3rd arg. String result = BindValueUtils.bindValueToString(bindValue, 10); - Assert.assertEquals("a, b, 1234567891...(13)", result); + Assertions.assertEquals("a, b, 1234567891...(13)", result); } @Test @@ -81,34 +81,34 @@ public void testBindValueToString_limit7() { String[] bindValue = {"a", "12345678901", "c"}; // limit is smaller than 2nd arg. String result = BindValueUtils.bindValueToString(bindValue, 10); - Assert.assertEquals("a, 1234567890...(11), ...(3)", result); + Assertions.assertEquals("a, 1234567890...(11), ...(3)", result); } @Test public void testBindValueToString_null() { - String result = BindValueUtils.bindValueToString((String[])null, 10); - Assert.assertEquals("", result); + String result = BindValueUtils.bindValueToString((String[]) null, 10); + Assertions.assertEquals("", result); } @Test public void testBindValueToString_native() { String[] bindValue = {"a", "b"}; String result = BindValueUtils.bindValueToString(bindValue, -1); - Assert.assertEquals("...(2)", result); + Assertions.assertEquals("...(2)", result); } @Test public void testBindValueToString_singleLargeString() { String[] bindValue = {"123456"}; String result = BindValueUtils.bindValueToString(bindValue, 5); - Assert.assertEquals("12345...(6)", result); + Assertions.assertEquals("12345...(6)", result); } @Test public void testBindValueToString_twoLargeString() { String[] bindValue = {"123456", "123456"}; String result = BindValueUtils.bindValueToString(bindValue, 5); - Assert.assertEquals("12345...(6), ...(2)", result); + Assertions.assertEquals("12345...(6), ...(2)", result); } // #737 https://github.com/naver/pinpoint/issues/737 @@ -121,7 +121,7 @@ public void test_734_bug_regression() { bindValue.put(4, "4"); String bindValueToString = BindValueUtils.bindValueToString(bindValue, 100); - Assert.assertEquals("1, 2, , 4", bindValueToString); + Assertions.assertEquals("1, 2, , 4", bindValueToString); } @Test @@ -130,7 +130,7 @@ public void test_index_error_zero() { bindValue.put(0, "0"); String bindValueToString = BindValueUtils.bindValueToString(bindValue, 100); - Assert.assertEquals("", bindValueToString); + Assertions.assertEquals("", bindValueToString); } @Test @@ -139,7 +139,7 @@ public void test_index_error_negative() { bindValue.put(-2, "-2"); String bindValueToString = BindValueUtils.bindValueToString(bindValue, 100); - Assert.assertEquals("", bindValueToString); + Assertions.assertEquals("", bindValueToString); } @Test @@ -151,14 +151,14 @@ public void test_index_error_complex() { bindValue.put(3, "3"); String bindValueToString = BindValueUtils.bindValueToString(bindValue, 100); - Assert.assertEquals("1, , 3", bindValueToString); + Assertions.assertEquals("1, , 3", bindValueToString); } @Test public void test_NullElement() { String[] temp = {"1", null, "3"}; String bindValueToString = BindValueUtils.bindValueToString(temp, 100); - Assert.assertEquals("1, , 3", bindValueToString); + Assertions.assertEquals("1, , 3", bindValueToString); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/jdbc/HexUtilsTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/jdbc/HexUtilsTest.java index e670958a9bde..1e66d15b2d26 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/jdbc/HexUtilsTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/jdbc/HexUtilsTest.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.profiler.jdbc; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class HexUtilsTest { @@ -9,13 +9,13 @@ public class HexUtilsTest { public void toHexString() { byte[] bytes = new byte[] {1, 2, 3}; String s = HexUtils.toHexString(bytes, 16); - Assert.assertEquals("010203", s); + Assertions.assertEquals("010203", s); } @Test public void toHexString2() { byte[] bytes = new byte[] {1, 2, 3}; String s = HexUtils.toHexString(bytes, 1); - Assert.assertEquals("01...", s); + Assertions.assertEquals("01...", s); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/jdbc/ObjectConverterTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/jdbc/ObjectConverterTest.java index 54b368ef730d..6a21860a0acc 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/jdbc/ObjectConverterTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/jdbc/ObjectConverterTest.java @@ -16,10 +16,10 @@ package com.navercorp.pinpoint.profiler.jdbc; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.sql.Time; import java.util.UUID; @@ -36,7 +36,7 @@ public void convert_sqlTime() { Time sqlTime = new Time(System.currentTimeMillis()); String stringTime = convert(sqlTime); - Assert.assertEquals(stringTime, sqlTime.toString()); + Assertions.assertEquals(stringTime, sqlTime.toString()); } @Test @@ -44,11 +44,11 @@ public void convert_byte() { byte byte1 = 0; String convert = convert(byte1); - Assert.assertEquals(convert, String.valueOf(byte1)); + Assertions.assertEquals(convert, String.valueOf(byte1)); } private String convert(Object param) { - Object[] args = new Object[] { new Object(), param }; + Object[] args = new Object[]{new Object(), param}; ObjectConverter objectConverter = new ObjectConverter(); return objectConverter.convert(args); } @@ -57,6 +57,6 @@ private String convert(Object param) { public void convert_UUID() { UUID uuid = UUID.randomUUID(); String uuidStr = convert(uuid); - Assert.assertEquals(uuidStr, uuidStr); + Assertions.assertEquals(uuidStr, uuidStr); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultApiMetaDataServiceTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultApiMetaDataServiceTest.java index cf3bdc53b07f..045aefd81074 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultApiMetaDataServiceTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultApiMetaDataServiceTest.java @@ -21,10 +21,13 @@ import com.navercorp.pinpoint.profiler.cache.SimpleCache; import com.navercorp.pinpoint.profiler.context.DefaultMethodDescriptor; import com.navercorp.pinpoint.profiler.sender.EnhancedDataSender; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; /** * @author Woonduk Kang(emeroad) @@ -42,11 +45,11 @@ public void cacheApi() { int first = apiMetaDataService.cacheApi(methodDescriptor); - Assert.assertNotEquals("not exist", first, 0); + Assertions.assertNotEquals(first, 0, "not exist"); verify(dataSender, times(1)).request(any(ApiMetaData.class)); int second = apiMetaDataService.cacheApi(methodDescriptor); - Assert.assertEquals("check cache", first, second); + Assertions.assertEquals(first, second, "check cache"); verify(dataSender, times(1)).request(any(ApiMetaData.class)); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultCachingSqlNormalizerTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultCachingSqlNormalizerTest.java index 142c40a5501e..1032620ce704 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultCachingSqlNormalizerTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultCachingSqlNormalizerTest.java @@ -19,8 +19,8 @@ import com.navercorp.pinpoint.bootstrap.context.ParsingResult; import com.navercorp.pinpoint.profiler.cache.IdAllocator; import com.navercorp.pinpoint.profiler.cache.SimpleCache; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -34,14 +34,14 @@ public void testNormalizedSql() { ParsingResult parsingResult = normalizer.wrapSql("select * from dual"); boolean newCache = normalizer.normalizedSql(parsingResult); - Assert.assertTrue("newCacheState", newCache); + Assertions.assertTrue(newCache, "newCacheState"); boolean notCached = normalizer.normalizedSql(parsingResult); - Assert.assertFalse("alreadyCached", notCached); + Assertions.assertFalse(notCached, "alreadyCached"); ParsingResult alreadyCached = normalizer.wrapSql("select * from dual"); boolean notCached2 = normalizer.normalizedSql(alreadyCached); - Assert.assertFalse("alreadyCached2", notCached2); + Assertions.assertFalse(notCached2, "alreadyCached2"); } @@ -51,16 +51,16 @@ public void testNormalizedSql_cache_expire() { CachingSqlNormalizer normalizer = new DefaultCachingSqlNormalizer(cache); ParsingResult parsingResult = normalizer.wrapSql("select * from table1"); boolean newCache = normalizer.normalizedSql(parsingResult); - Assert.assertTrue("newCacheState", newCache); + Assertions.assertTrue(newCache, "newCacheState"); // cache expire ParsingResult parsingResult2 = normalizer.wrapSql("select * from table2"); boolean cached = normalizer.normalizedSql(parsingResult2); - Assert.assertTrue(cached); + Assertions.assertTrue(cached); ParsingResult parsingResult1_recached = normalizer.wrapSql("select * from table3"); boolean newCache_parsingResult1_recached = normalizer.normalizedSql(parsingResult1_recached); - Assert.assertTrue(newCache_parsingResult1_recached); + Assertions.assertTrue(newCache_parsingResult1_recached); } private SimpleCache newCache(int size) { diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultParsingResultTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultParsingResultTest.java index de29a9248778..d6ca4d94c075 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultParsingResultTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultParsingResultTest.java @@ -17,21 +17,21 @@ package com.navercorp.pinpoint.profiler.metadata; import com.navercorp.pinpoint.bootstrap.context.ParsingResult; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class DefaultParsingResultTest { @Test public void testId() { DefaultParsingResult result = new DefaultParsingResult(""); - Assert.assertEquals(ParsingResult.ID_NOT_EXIST, result.getId()); + Assertions.assertEquals(ParsingResult.ID_NOT_EXIST, result.getId()); // update - Assert.assertTrue(result.setId(1)); + Assertions.assertTrue(result.setId(1)); // already updated - Assert.assertFalse(result.setId(1)); + Assertions.assertFalse(result.setId(1)); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultSqlMetaDataServiceTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultSqlMetaDataServiceTest.java index 6b4097b71ffe..c3a898b82600 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultSqlMetaDataServiceTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultSqlMetaDataServiceTest.java @@ -20,8 +20,8 @@ import com.navercorp.pinpoint.profiler.cache.IdAllocator; import com.navercorp.pinpoint.profiler.cache.SimpleCache; import com.navercorp.pinpoint.profiler.sender.EnhancedDataSender; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; @@ -44,11 +44,11 @@ public void cacheSql() { boolean newValue = sqlMetaDataService.cacheSql(parsingResult); - Assert.assertTrue(newValue); + Assertions.assertTrue(newValue); verify(dataSender, times(1)).request(any(SqlMetaData.class)); boolean notNewValue = sqlMetaDataService.cacheSql(parsingResult); - Assert.assertFalse(notNewValue); + Assertions.assertFalse(notNewValue); verify(dataSender, times(1)).request(any(SqlMetaData.class)); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultStringMetaDataServiceTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultStringMetaDataServiceTest.java index 990eadf55b38..95b734b3d298 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultStringMetaDataServiceTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/DefaultStringMetaDataServiceTest.java @@ -19,10 +19,13 @@ import com.navercorp.pinpoint.profiler.cache.IdAllocator; import com.navercorp.pinpoint.profiler.cache.SimpleCache; import com.navercorp.pinpoint.profiler.sender.EnhancedDataSender; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; /** * @author Woonduk Kang(emeroad) @@ -39,11 +42,11 @@ public void cacheString() { int first = stringMetaDataService.cacheString(str); - Assert.assertNotEquals("not exist", first, 0); + Assertions.assertNotEquals(first, 0, "not exist"); verify(dataSender, times(1)).request(any(StringMetaData.class)); int second = stringMetaDataService.cacheString(str); - Assert.assertEquals("check cache", first, second); + Assertions.assertEquals(first, second, "check cache"); verify(dataSender, times(1)).request(any(StringMetaData.class)); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/CollectJobTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/CollectJobTest.java index 24bebc2c18ac..608a140d4d16 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/CollectJobTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/CollectJobTest.java @@ -21,7 +21,7 @@ import com.navercorp.pinpoint.profiler.monitor.metric.AgentStatMetricSnapshotBatch; import com.navercorp.pinpoint.profiler.monitor.metric.MetricType; import com.navercorp.pinpoint.profiler.sender.DataSender; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import static org.mockito.ArgumentMatchers.any; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/DeadlockMonitorJobTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/DeadlockMonitorJobTest.java index 1990030ac153..b33b52126507 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/DeadlockMonitorJobTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/DeadlockMonitorJobTest.java @@ -16,7 +16,7 @@ package com.navercorp.pinpoint.profiler.monitor; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; import java.util.Set; @@ -31,7 +31,7 @@ public class DeadlockMonitorJobTest { private final Object lock1 = new Object(); private final Object lock2 = new Object(); - @Ignore + @Disabled // @Test public void testName() throws Exception { Thread thread1 = null; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/collector/response/DefaultResponseTimeMetricCollectorTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/collector/response/DefaultResponseTimeMetricCollectorTest.java index ae839501af7c..e04c6153e26c 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/collector/response/DefaultResponseTimeMetricCollectorTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/collector/response/DefaultResponseTimeMetricCollectorTest.java @@ -19,12 +19,14 @@ import com.navercorp.pinpoint.profiler.monitor.collector.AgentStatMetricCollector; import com.navercorp.pinpoint.profiler.monitor.metric.response.ResponseTimeMetric; import com.navercorp.pinpoint.profiler.monitor.metric.response.ResponseTimeValue; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import java.util.Random; @@ -33,7 +35,7 @@ /** * @author Taejin Koo */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class DefaultResponseTimeMetricCollectorTest { private final Random random = new Random(System.currentTimeMillis()); @@ -47,7 +49,7 @@ public class DefaultResponseTimeMetricCollectorTest { @Mock private ResponseTimeMetric responseTimeMetric; - @Before + @BeforeEach public void setUp() { totalValue = 0; for (int i = 0; i < COUNT; i++) { @@ -65,12 +67,15 @@ public void defaultTest() throws Exception { AgentStatMetricCollector responseTimeMetricCollector = new DefaultResponseTimeMetricCollector(responseTimeMetric); ResponseTimeValue collect = responseTimeMetricCollector.collect(); - Assert.assertEquals(totalValue / COUNT, collect.getAvg()); + Assertions.assertEquals(totalValue / COUNT, collect.getAvg()); } - @Test(expected = NullPointerException.class) + @MockitoSettings(strictness = Strictness.LENIENT) + @Test public void throwNPETest() throws Exception { - AgentStatMetricCollector responseTimeMetricCollector = new DefaultResponseTimeMetricCollector(null); + Assertions.assertThrows(NullPointerException.class, () -> { + AgentStatMetricCollector responseTimeMetricCollector = new DefaultResponseTimeMetricCollector(null); + }); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/CustomMetricRegistryFilterTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/CustomMetricRegistryFilterTest.java index e37e6432c31b..09e2c34c0a44 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/CustomMetricRegistryFilterTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/CustomMetricRegistryFilterTest.java @@ -20,9 +20,8 @@ import com.navercorp.pinpoint.bootstrap.plugin.monitor.metric.LongCounter; import com.navercorp.pinpoint.profiler.context.monitor.metric.CustomMetricRegistryFilter; import com.navercorp.pinpoint.profiler.context.monitor.metric.DefaultCustomMetricRegistryFilter; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -40,16 +39,16 @@ public void customMetricRegistryFilterTest() { TestIntCounter testIntCount = new TestIntCounter(allowedMetricName); boolean filtered = filter.filter(testIntCount); - Assert.assertFalse(filtered); + Assertions.assertFalse(filtered); TestIntCounter testIntCount2 = new TestIntCounter("test2"); filtered = filter.filter(testIntCount2); - Assert.assertTrue(filtered); + Assertions.assertTrue(filtered); TestLongCounter testLongCount = new TestLongCounter(allowedMetricName); filtered = filter.filter(testLongCount); - Assert.assertTrue(filtered); + Assertions.assertTrue(filtered); } private static class TestIntCounter implements IntCounter { diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/datasource/DefaultDataSourceMetricTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/datasource/DefaultDataSourceMetricTest.java index bbb814a49c2f..25414686db4a 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/datasource/DefaultDataSourceMetricTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/datasource/DefaultDataSourceMetricTest.java @@ -22,13 +22,13 @@ import com.navercorp.pinpoint.profiler.context.monitor.DefaultDataSourceMonitorRegistryService; import com.navercorp.pinpoint.profiler.context.monitor.JdbcUrlParsingService; import com.navercorp.pinpoint.profiler.util.RandomExUtils; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.HashSet; import java.util.List; @@ -38,7 +38,7 @@ /** * @author Taejin Koo */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class DefaultDataSourceMetricTest { private final Logger logger = LogManager.getLogger(this.getClass()); @@ -69,7 +69,7 @@ private MockDataSourceMonitor[] createMockDataSourceMonitor(DataSourceMonitorReg for (int i = 0; i < remainingCapacity; i++) { MockDataSourceMonitor mock = new MockDataSourceMonitor(i); boolean register = dataSourceMonitorRegistry.register(mock); - Assert.assertTrue(register); + Assertions.assertTrue(register); mockDataSourceMonitors[i] = mock; } return mockDataSourceMonitors; @@ -82,7 +82,7 @@ private void assertIdIsUnique(List dataSourceList) { idSet.add(dataSource.getId()); } - Assert.assertEquals(dataSourceList.size(), idSet.size()); + Assertions.assertEquals(dataSourceList.size(), idSet.size()); } private void assertContainsAndEquals(DataSourceMonitor dataSourceMonitor, List dataSourceList) { @@ -90,14 +90,14 @@ private void assertContainsAndEquals(DataSourceMonitor dataSourceMonitor, List= -1); - Assert.assertTrue(snapshot.getHeapUsed() > 0); - Assert.assertTrue(snapshot.getNonHeapMax() >= -1); - Assert.assertTrue(snapshot.getNonHeapUsed() > 0); + Assertions.assertTrue(snapshot.getHeapMax() >= -1); + Assertions.assertTrue(snapshot.getHeapUsed() > 0); + Assertions.assertTrue(snapshot.getNonHeapMax() >= -1); + Assertions.assertTrue(snapshot.getNonHeapUsed() > 0); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/response/ReuseResponseTimeCollectorTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/response/ReuseResponseTimeCollectorTest.java index 665c099d5202..361b9802a414 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/response/ReuseResponseTimeCollectorTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/response/ReuseResponseTimeCollectorTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.profiler.monitor.metric.response; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Random; @@ -48,12 +48,12 @@ public void defaultTest() { } ResponseTimeValue responseTimeValue = reuseResponseTimeCollector.resetAndGetValue(); - Assert.assertEquals(totalValue / count, responseTimeValue.getAvg()); - Assert.assertEquals(maxValue, responseTimeValue.getMax()); + Assertions.assertEquals(totalValue / count, responseTimeValue.getAvg()); + Assertions.assertEquals(maxValue, responseTimeValue.getMax()); responseTimeValue = reuseResponseTimeCollector.resetAndGetValue(); - Assert.assertEquals(0, responseTimeValue.getAvg()); - Assert.assertEquals(0, responseTimeValue.getMax()); + Assertions.assertEquals(0, responseTimeValue.getAvg()); + Assertions.assertEquals(0, responseTimeValue.getMax()); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/rpc/test/DefaultRpcMetricTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/rpc/test/DefaultRpcMetricTest.java index f85dede574ee..1a2a310f0ac3 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/rpc/test/DefaultRpcMetricTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/rpc/test/DefaultRpcMetricTest.java @@ -16,23 +16,21 @@ package com.navercorp.pinpoint.profiler.monitor.metric.rpc.test; -import static com.navercorp.pinpoint.common.trace.ServiceTypeProperty.*; - import com.navercorp.pinpoint.common.trace.HistogramSchema; import com.navercorp.pinpoint.common.trace.ServiceType; - import com.navercorp.pinpoint.common.trace.ServiceTypeFactory; import com.navercorp.pinpoint.profiler.monitor.metric.rpc.DefaultRpcMetric; import com.navercorp.pinpoint.profiler.monitor.metric.rpc.HistogramSnapshot; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.List; +import static com.navercorp.pinpoint.common.trace.ServiceTypeProperty.RECORD_STATISTICS; public class DefaultRpcMetricTest { private static final ServiceType ASYNC_HTTP_CLIENT = ServiceTypeFactory.of(9056, "ASYNC_HTTP_CLIENT", RECORD_STATISTICS); - + @Test public void testAddResponseTime() throws Exception { @@ -48,7 +46,7 @@ public void testAddResponseTime() throws Exception { metric.addResponseTime("test3", schema.getVerySlowSlot().getSlotTime(), true); List snapshotList = metric.createSnapshotList(); - Assert.assertEquals(snapshotList.size(), 3); + Assertions.assertEquals(snapshotList.size(), 3); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/rpc/test/HistogramTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/rpc/test/HistogramTest.java index 5af644cfeb2d..615d4183f550 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/rpc/test/HistogramTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/rpc/test/HistogramTest.java @@ -21,9 +21,8 @@ import com.navercorp.pinpoint.profiler.monitor.metric.rpc.HistogramSnapshot; import com.navercorp.pinpoint.profiler.monitor.metric.rpc.LongAdderHistogram; -import org.junit.Assert; -import org.junit.Test; - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class HistogramTest { @@ -53,11 +52,11 @@ public void testAddResponseTime() { HistogramSnapshot snapshot = histogram.createSnapshot(); - Assert.assertEquals(snapshot.getFastCount(), 1); - Assert.assertEquals(snapshot.getNormalCount(), 2); - Assert.assertEquals(snapshot.getSlowCount(), 3); - Assert.assertEquals(snapshot.getVerySlowCount(), 4); - Assert.assertEquals(snapshot.getFastErrorCount(), 5); + Assertions.assertEquals(snapshot.getFastCount(), 1); + Assertions.assertEquals(snapshot.getNormalCount(), 2); + Assertions.assertEquals(snapshot.getSlowCount(), 3); + Assertions.assertEquals(snapshot.getVerySlowCount(), 4); + Assertions.assertEquals(snapshot.getFastErrorCount(), 5); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/rpc/test/MetricRegistryTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/rpc/test/MetricRegistryTest.java index c91c8110e839..8437ea45d994 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/rpc/test/MetricRegistryTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/rpc/test/MetricRegistryTest.java @@ -21,10 +21,11 @@ import com.navercorp.pinpoint.common.trace.ServiceTypeFactory; import com.navercorp.pinpoint.profiler.monitor.metric.rpc.MetricRegistry; import com.navercorp.pinpoint.profiler.monitor.metric.rpc.RpcMetric; -import org.junit.Assert; -import org.junit.Test; + import com.navercorp.pinpoint.common.trace.ServiceType; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class MetricRegistryTest { private static final ServiceType ASYNC_HTTP_CLIENT = ServiceTypeFactory.of(9056, "ASYNC_HTTP_CLIENT", RECORD_STATISTICS); @@ -40,14 +41,14 @@ public void testFalse() { MetricRegistry metricRegistry = null; try { metricRegistry = new MetricRegistry(ServiceType.UNKNOWN_DB); - Assert.fail(); + Assertions.fail(); } catch (Exception ignored) { } metricRegistry = new MetricRegistry(ServiceType.STAND_ALONE); try { metricRegistry.getRpcMetric(ServiceType.ASYNC); - Assert.fail(); + Assertions.fail(); } catch (Exception ignored) { } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/totalthread/DefaultTotalThreadMetricTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/totalthread/DefaultTotalThreadMetricTest.java index cc03bfe11822..2dd81c3553d9 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/totalthread/DefaultTotalThreadMetricTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/totalthread/DefaultTotalThreadMetricTest.java @@ -16,14 +16,14 @@ package com.navercorp.pinpoint.profiler.monitor.metric.totalthread; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class DefaultTotalThreadMetricTest { @Test public void test() { TotalThreadMetric totalThreadMetric = new DefaultTotalThreadMetric(); TotalThreadMetricSnapshot snapshot = totalThreadMetric.getSnapshot(); - Assert.assertNotEquals(snapshot.getTotalThreadCount(), 0); + Assertions.assertNotEquals(snapshot.getTotalThreadCount(), 0); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/transaction/DefaultTransactionMetricTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/transaction/DefaultTransactionMetricTest.java index 1def9651ef79..a7952839dd49 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/transaction/DefaultTransactionMetricTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/transaction/DefaultTransactionMetricTest.java @@ -16,12 +16,11 @@ package com.navercorp.pinpoint.profiler.monitor.metric.transaction; -import static org.junit.Assert.*; - -import org.junit.Before; -import org.junit.Test; - import com.navercorp.pinpoint.profiler.context.TestableTransactionCounter; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author HyunGil Jeong @@ -32,7 +31,7 @@ public class DefaultTransactionMetricTest { private TransactionMetric transactionMetric; - @Before + @BeforeEach @SuppressWarnings("unchecked") public void setUp() { this.transactionCounter = new TestableTransactionCounter(); @@ -124,7 +123,7 @@ public void negative_Transaction_should_return_UNCOLLECTED() { assertEquals(expectedNumberOfTransactions, snapshot.getUnsampledNewCount()); assertEquals(expectedNumberOfTransactions, snapshot.getUnsampledContinuationCount()); } - + @Test public void checkContinuousTransactions() { // Given diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/AnnotatedInterceptorFactoryTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/AnnotatedInterceptorFactoryTest.java index 55395eed2f9b..6b32d31eb844 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/AnnotatedInterceptorFactoryTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/AnnotatedInterceptorFactoryTest.java @@ -16,38 +16,42 @@ package com.navercorp.pinpoint.profiler.plugin; -import static org.junit.Assert.*; -import static org.mockito.Mockito.*; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; -import com.navercorp.pinpoint.bootstrap.instrument.InstrumentContext; -import com.navercorp.pinpoint.bootstrap.plugin.RequestRecorderFactory; -import com.navercorp.pinpoint.bootstrap.plugin.monitor.DataSourceMonitorRegistry; -import com.navercorp.pinpoint.bootstrap.plugin.monitor.metric.CustomMetricRegistry; -import com.navercorp.pinpoint.bootstrap.plugin.uri.UriStatRecorderFactory; -import com.navercorp.pinpoint.profiler.instrument.ScopeInfo; -import com.navercorp.pinpoint.profiler.interceptor.factory.ExceptionHandlerFactory; -import com.navercorp.pinpoint.profiler.metadata.ApiMetaDataService; - -import org.junit.Before; -import org.junit.Test; -import org.mockito.invocation.InvocationOnMock; -import org.mockito.stubbing.Answer; - import com.navercorp.pinpoint.bootstrap.context.MethodDescriptor; import com.navercorp.pinpoint.bootstrap.context.TraceContext; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentClass; +import com.navercorp.pinpoint.bootstrap.instrument.InstrumentContext; import com.navercorp.pinpoint.bootstrap.instrument.InstrumentMethod; import com.navercorp.pinpoint.bootstrap.interceptor.Interceptor; import com.navercorp.pinpoint.bootstrap.plugin.ObjectFactory; +import com.navercorp.pinpoint.bootstrap.plugin.RequestRecorderFactory; +import com.navercorp.pinpoint.bootstrap.plugin.monitor.DataSourceMonitorRegistry; +import com.navercorp.pinpoint.bootstrap.plugin.monitor.metric.CustomMetricRegistry; +import com.navercorp.pinpoint.bootstrap.plugin.uri.UriStatRecorderFactory; import com.navercorp.pinpoint.exception.PinpointException; +import com.navercorp.pinpoint.profiler.instrument.ScopeInfo; import com.navercorp.pinpoint.profiler.interceptor.factory.AnnotatedInterceptorFactory; +import com.navercorp.pinpoint.profiler.interceptor.factory.ExceptionHandlerFactory; +import com.navercorp.pinpoint.profiler.metadata.ApiMetaDataService; import com.navercorp.pinpoint.profiler.plugin.TestInterceptors.TestInterceptor0; import com.navercorp.pinpoint.profiler.plugin.TestInterceptors.TestInterceptor1; import com.navercorp.pinpoint.profiler.plugin.TestInterceptors.TestInterceptor2; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.invocation.InvocationOnMock; +import org.mockito.stubbing.Answer; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.when; public class AnnotatedInterceptorFactoryTest { private final ProfilerConfig profilerConfig = mock(ProfilerConfig.class); @@ -65,19 +69,19 @@ public class AnnotatedInterceptorFactoryTest { private final ExceptionHandlerFactory exceptionHandlerFactory = new ExceptionHandlerFactory(false); - @Before + @BeforeEach public void setUp() { reset(traceContext, instrumentClass, instrumentMethod); when(pluginContext.injectClass(any(ClassLoader.class), any(String.class))).thenAnswer(new Answer>() { @Override public Class answer(InvocationOnMock invocation) throws Throwable { - ClassLoader loader = (ClassLoader)invocation.getArguments()[0]; - String name = (String)invocation.getArguments()[1]; - + ClassLoader loader = (ClassLoader) invocation.getArguments()[0]; + String name = (String) invocation.getArguments()[1]; + return loader.loadClass(name); } - + }); when(instrumentMethod.getDescriptor()).thenReturn(descriptor); } @@ -97,35 +101,37 @@ public void test0() { AnnotatedInterceptorFactory factory = newAnnotatedInterceptorFactory(); final ScopeInfo scopeInfo = newEmptyScopeInfo(); Interceptor interceptor = factory.newInterceptor(TestInterceptor0.class, null, scopeInfo, instrumentClass, instrumentMethod); - + assertEquals(TestInterceptor0.class, interceptor.getClass()); } @Test public void test1() throws Exception { - Object[] args = new Object[] { "arg0" }; - + Object[] args = new Object[]{"arg0"}; + AnnotatedInterceptorFactory factory = newAnnotatedInterceptorFactory(); final ScopeInfo scopeInfo = newEmptyScopeInfo(); Interceptor interceptor = factory.newInterceptor(TestInterceptor0.class, args, scopeInfo, instrumentClass, instrumentMethod); - + assertEquals(TestInterceptor0.class, interceptor.getClass()); assertEquals(args[0], getField(interceptor, "field0")); } - - @Test(expected = PinpointException.class) + + @Test public void test2() throws Exception { - Object[] args = new Object[] { 1 }; - - AnnotatedInterceptorFactory factory = newAnnotatedInterceptorFactory(); - final ScopeInfo scopeInfo = newEmptyScopeInfo(); - factory.newInterceptor(TestInterceptor0.class, args, scopeInfo, instrumentClass, instrumentMethod); + Assertions.assertThrows(PinpointException.class, () -> { + Object[] args = new Object[]{1}; + + AnnotatedInterceptorFactory factory = newAnnotatedInterceptorFactory(); + final ScopeInfo scopeInfo = newEmptyScopeInfo(); + factory.newInterceptor(TestInterceptor0.class, args, scopeInfo, instrumentClass, instrumentMethod); + }); } @Test public void test3() throws Exception { - Object[] args = new Object[] { "arg0", (byte)1, (short)2, (float)3.0 }; + Object[] args = new Object[]{"arg0", (byte) 1, (short) 2, (float) 3.0}; AnnotatedInterceptorFactory factory = newAnnotatedInterceptorFactory(); final ScopeInfo scopeInfo = newEmptyScopeInfo(); @@ -140,12 +146,12 @@ public void test3() throws Exception { @Test public void test4() throws Exception { - Object[] args = new Object[] { (byte)1, (short)2, (float)3.0, "arg0" }; - + Object[] args = new Object[]{(byte) 1, (short) 2, (float) 3.0, "arg0"}; + AnnotatedInterceptorFactory factory = newAnnotatedInterceptorFactory(); final ScopeInfo scopeInfo = newEmptyScopeInfo(); Interceptor interceptor = factory.newInterceptor(TestInterceptor1.class, args, scopeInfo, instrumentClass, instrumentMethod); - + assertEquals(TestInterceptor1.class, interceptor.getClass()); assertEquals(args[3], getField(interceptor, "field0")); assertEquals(args[0], getField(interceptor, "field1")); @@ -155,27 +161,27 @@ public void test4() throws Exception { @Test public void test5() throws Exception { - Object[] args = new Object[] { (short)2, (float)3.0, "arg0", (byte)1 }; - + Object[] args = new Object[]{(short) 2, (float) 3.0, "arg0", (byte) 1}; + AnnotatedInterceptorFactory factory = newAnnotatedInterceptorFactory(); final ScopeInfo scopeInfo = newEmptyScopeInfo(); Interceptor interceptor = factory.newInterceptor(TestInterceptor1.class, args, scopeInfo, instrumentClass, instrumentMethod); - + assertEquals(TestInterceptor1.class, interceptor.getClass()); assertEquals(args[2], getField(interceptor, "field0")); assertEquals(args[3], getField(interceptor, "field1")); assertEquals(args[0], getField(interceptor, "field2")); assertEquals(args[1], getField(interceptor, "field3")); } - + @Test public void test6() throws Exception { - Object[] args = new Object[] { (float)3.0, (short)2, (byte)1, "arg0" }; - + Object[] args = new Object[]{(float) 3.0, (short) 2, (byte) 1, "arg0"}; + AnnotatedInterceptorFactory factory = newAnnotatedInterceptorFactory(); final ScopeInfo scopeInfo = newEmptyScopeInfo(); Interceptor interceptor = factory.newInterceptor(TestInterceptor1.class, args, scopeInfo, instrumentClass, instrumentMethod); - + assertEquals(TestInterceptor1.class, interceptor.getClass()); assertEquals(args[3], getField(interceptor, "field0")); assertEquals(args[2], getField(interceptor, "field1")); @@ -183,35 +189,39 @@ public void test6() throws Exception { assertEquals(args[0], getField(interceptor, "field3")); } - @Test(expected=PinpointException.class) + @Test public void test7() { - AnnotatedInterceptorFactory factory = newAnnotatedInterceptorFactory(); - final ScopeInfo scopeInfo = newEmptyScopeInfo(); - factory.newInterceptor(TestInterceptor1.class, null, scopeInfo, instrumentClass, instrumentMethod); + Assertions.assertThrows(PinpointException.class, () -> { + AnnotatedInterceptorFactory factory = newAnnotatedInterceptorFactory(); + final ScopeInfo scopeInfo = newEmptyScopeInfo(); + factory.newInterceptor(TestInterceptor1.class, null, scopeInfo, instrumentClass, instrumentMethod); + }); } - @Test(expected=PinpointException.class) + @Test public void test8() { - AnnotatedInterceptorFactory factory = newAnnotatedInterceptorFactory(); - final ScopeInfo scopeInfo = newEmptyScopeInfo(); - factory.newInterceptor(TestInterceptor1.class, null, scopeInfo, instrumentClass, instrumentMethod); + Assertions.assertThrows(PinpointException.class, () -> { + AnnotatedInterceptorFactory factory = newAnnotatedInterceptorFactory(); + final ScopeInfo scopeInfo = newEmptyScopeInfo(); + factory.newInterceptor(TestInterceptor1.class, null, scopeInfo, instrumentClass, instrumentMethod); + }); } - + @Test public void test9() throws Exception { - Object[] args = new Object[] { "arg0", 1, 2.0, true, 3L }; + Object[] args = new Object[]{"arg0", 1, 2.0, true, 3L}; AnnotatedInterceptorFactory factory = newAnnotatedInterceptorFactory(); final ScopeInfo scopeInfo = newEmptyScopeInfo(); Interceptor interceptor = factory.newInterceptor(TestInterceptor2.class, args, scopeInfo, instrumentClass, instrumentMethod); - + assertEquals(TestInterceptor2.class, interceptor.getClass()); assertEquals(args[0], getField(interceptor, "field0")); assertEquals(args[1], getField(interceptor, "field1")); assertEquals(args[2], getField(interceptor, "field2")); assertEquals(args[3], getField(interceptor, "field3")); assertEquals(args[4], getField(interceptor, "field4")); - + assertSame(descriptor, getField(interceptor, "descriptor")); assertSame(instrumentClass, getField(interceptor, "targetClass")); assertSame(instrumentMethod, getField(interceptor, "targetMethod")); @@ -219,19 +229,19 @@ public void test9() throws Exception { @Test public void test10() throws Exception { - Object[] args = new Object[] { "arg0", 1, 2.0 }; - + Object[] args = new Object[]{"arg0", 1, 2.0}; + AnnotatedInterceptorFactory factory = newAnnotatedInterceptorFactory(); final ScopeInfo scopeInfo = newEmptyScopeInfo(); Interceptor interceptor = factory.newInterceptor(TestInterceptor2.class, args, scopeInfo, instrumentClass, instrumentMethod); - + assertEquals(TestInterceptor2.class, interceptor.getClass()); assertEquals(args[0], getField(interceptor, "field0")); assertEquals(args[1], getField(interceptor, "field1")); assertEquals(args[2], getField(interceptor, "field2")); assertEquals(false, getField(interceptor, "field3")); assertEquals(0L, getField(interceptor, "field4")); - + assertSame(descriptor, getField(interceptor, "descriptor")); assertSame(instrumentClass, getField(interceptor, "targetClass")); assertSame(instrumentMethod, getField(interceptor, "targetMethod")); @@ -239,37 +249,37 @@ public void test10() throws Exception { @Test public void test11() throws Exception { - Object[] args = new Object[] { "arg0", 1 }; - + Object[] args = new Object[]{"arg0", 1}; + AnnotatedInterceptorFactory factory = newAnnotatedInterceptorFactory(); final ScopeInfo scopeInfo = newEmptyScopeInfo(); Interceptor interceptor = factory.newInterceptor(TestInterceptor2.class, args, scopeInfo, instrumentClass, instrumentMethod); - + assertEquals(TestInterceptor2.class, interceptor.getClass()); assertEquals(args[0], getField(interceptor, "field0")); assertEquals(args[1], getField(interceptor, "field1")); assertEquals(0.0, getField(interceptor, "field2")); assertEquals(false, getField(interceptor, "field3")); assertEquals(0L, getField(interceptor, "field4")); - + assertSame(descriptor, getField(interceptor, "descriptor")); assertSame(instrumentClass, getField(interceptor, "targetClass")); assertSame(instrumentMethod, getField(interceptor, "targetMethod")); } - + @Test public void test12() throws Exception { AnnotatedInterceptorFactory factory = newAnnotatedInterceptorFactory(); final ScopeInfo scopeInfo = newEmptyScopeInfo(); Interceptor interceptor = factory.newInterceptor(TestInterceptor2.class, null, scopeInfo, instrumentClass, instrumentMethod); - + assertEquals(TestInterceptor2.class, interceptor.getClass()); assertEquals(null, getField(interceptor, "field0")); assertEquals(0, getField(interceptor, "field1")); assertEquals(0.0, getField(interceptor, "field2")); assertEquals(false, getField(interceptor, "field3")); assertEquals(0L, getField(interceptor, "field4")); - + assertSame(descriptor, getField(interceptor, "descriptor")); assertSame(instrumentClass, getField(interceptor, "targetClass")); assertSame(instrumentMethod, getField(interceptor, "targetMethod")); @@ -277,19 +287,19 @@ public void test12() throws Exception { @Test public void test13() throws Exception { - Object[] args = new Object[] { "arg0" }; - + Object[] args = new Object[]{"arg0"}; + AnnotatedInterceptorFactory factory = newAnnotatedInterceptorFactory(); final ScopeInfo scopeInfo = newEmptyScopeInfo(); Interceptor interceptor = factory.newInterceptor(TestInterceptor2.class, args, scopeInfo, instrumentClass, instrumentMethod); - + assertEquals(TestInterceptor2.class, interceptor.getClass()); assertEquals(args[0], getField(interceptor, "field0")); assertEquals(0, getField(interceptor, "field1")); assertEquals(0.0, getField(interceptor, "field2")); assertEquals(false, getField(interceptor, "field3")); assertEquals(0L, getField(interceptor, "field4")); - + assertSame(descriptor, getField(interceptor, "descriptor")); assertSame(instrumentClass, getField(interceptor, "targetClass")); assertNull(getField(interceptor, "targetMethod")); @@ -298,17 +308,17 @@ public void test13() throws Exception { @Test public void test14() throws Exception { String arg0 = "arg0"; - Object[] args = new Object[] { ObjectFactory.byConstructor("java.lang.String", arg0) }; - + Object[] args = new Object[]{ObjectFactory.byConstructor("java.lang.String", arg0)}; + AnnotatedInterceptorFactory factory = newAnnotatedInterceptorFactory(); final ScopeInfo scopeInfo = newEmptyScopeInfo(); Interceptor interceptor = factory.newInterceptor(TestInterceptor0.class, args, scopeInfo, instrumentClass, instrumentMethod); - + assertEquals(TestInterceptor0.class, interceptor.getClass()); assertEquals(arg0, getField(interceptor, "field0")); } - + private Object getField(Object object, String name) throws NoSuchMethodException, SecurityException, IllegalAccessException, IllegalArgumentException, InvocationTargetException { String methodName = "get" + Character.toUpperCase(name.charAt(0)) + name.substring(1); Method method = object.getClass().getMethod(methodName); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/ClassNameFilterChainTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/ClassNameFilterChainTest.java index 470804a3c09b..1b8f508f4da0 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/ClassNameFilterChainTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/ClassNameFilterChainTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.profiler.plugin; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -34,9 +34,9 @@ public void testAccept() { ClassNameFilterChain chain = new ClassNameFilterChain(Arrays.asList(include, exclude)); - Assert.assertTrue(chain.accept("com.include")); - Assert.assertFalse(chain.accept("com.exclude")); + Assertions.assertTrue(chain.accept("com.include")); + Assertions.assertFalse(chain.accept("com.exclude")); - Assert.assertFalse(chain.accept("unknown")); + Assertions.assertFalse(chain.accept("unknown")); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/PinpointProfilerPackageSkipFilterTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/PinpointProfilerPackageSkipFilterTest.java index 633b261b26da..88ece0f5cf50 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/PinpointProfilerPackageSkipFilterTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/PinpointProfilerPackageSkipFilterTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.profiler.plugin; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -28,9 +28,9 @@ public class PinpointProfilerPackageSkipFilterTest { public void testAccept() { PinpointProfilerPackageSkipFilter filter = new PinpointProfilerPackageSkipFilter(); - Assert.assertFalse("skip", filter.accept("com.navercorp.pinpoint.bootstrap.test.class")); + Assertions.assertFalse(filter.accept("com.navercorp.pinpoint.bootstrap.test.class"), "skip"); - Assert.assertTrue("include", filter.accept("test")); + Assertions.assertTrue(filter.accept("test"), "include"); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/PluginPackageFilterTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/PluginPackageFilterTest.java index 302bfd941511..90c5eff72467 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/PluginPackageFilterTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/plugin/PluginPackageFilterTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.profiler.plugin; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -30,8 +30,8 @@ public class PluginPackageFilterTest { public void testAccept() { PluginPackageFilter filter = new PluginPackageFilter(Arrays.asList("com.plugin")); - Assert.assertTrue(filter.accept("com.plugin.test.module")); + Assertions.assertTrue(filter.accept("com.plugin.test.module")); - Assert.assertFalse(filter.accept("test")); + Assertions.assertFalse(filter.accept("test")); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/ProfilerCommandServiceLocatorTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/ProfilerCommandServiceLocatorTest.java index f3ab56b964aa..c310a12d5772 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/ProfilerCommandServiceLocatorTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/ProfilerCommandServiceLocatorTest.java @@ -21,8 +21,8 @@ import com.navercorp.pinpoint.rpc.stream.ServerStreamChannel; import com.navercorp.pinpoint.thrift.io.TCommandType; import org.apache.thrift.TBase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; @@ -32,32 +32,40 @@ */ public class ProfilerCommandServiceLocatorTest { - @Test(expected = NullPointerException.class) + @Test public void throwNullTest1() { - ProfilerCommandService commandService = null; + Assertions.assertThrows(NullPointerException.class, () -> { + ProfilerCommandService commandService = null; - ProfilerCommandLocatorBuilder builder = new ProfilerCommandLocatorBuilder(); - builder.addService(commandService); + ProfilerCommandLocatorBuilder builder = new ProfilerCommandLocatorBuilder(); + builder.addService(commandService); + }); } - @Test(expected = NullPointerException.class) + @Test public void throwNullTest2() { - ProfilerCommandServiceGroup commandServiceGroup = null; + Assertions.assertThrows(NullPointerException.class, () -> { + ProfilerCommandServiceGroup commandServiceGroup = null; - ProfilerCommandLocatorBuilder builder = new ProfilerCommandLocatorBuilder(); - builder.addService(commandServiceGroup); + ProfilerCommandLocatorBuilder builder = new ProfilerCommandLocatorBuilder(); + builder.addService(commandServiceGroup); + }); } - @Test(expected = NullPointerException.class) + @Test public void throwNullTest3() { - ProfilerCommandLocatorBuilder builder = new ProfilerCommandLocatorBuilder(); - builder.addService((short) -1, null); + Assertions.assertThrows(NullPointerException.class, () -> { + ProfilerCommandLocatorBuilder builder = new ProfilerCommandLocatorBuilder(); + builder.addService((short) -1, null); + }); } - @Test(expected = NullPointerException.class) + @Test public void throwNullTest4() { - ProfilerCommandLocatorBuilder builder = new ProfilerCommandLocatorBuilder(); - builder.addService(TCommandType.RESULT.getCode(), null); + Assertions.assertThrows(NullPointerException.class, () -> { + ProfilerCommandLocatorBuilder builder = new ProfilerCommandLocatorBuilder(); + builder.addService(TCommandType.RESULT.getCode(), null); + }); } @Test @@ -65,10 +73,10 @@ public void returnNullTest() { ProfilerCommandLocatorBuilder builder = new ProfilerCommandLocatorBuilder(); ProfilerCommandServiceLocator commandServiceLocator = builder.build(); - Assert.assertNull(commandServiceLocator.getService((short) -1)); - Assert.assertNull(commandServiceLocator.getSimpleService((short) -1)); - Assert.assertNull(commandServiceLocator.getRequestService((short) -1)); - Assert.assertNull(commandServiceLocator.getStreamService((short) -1)); + Assertions.assertNull(commandServiceLocator.getService((short) -1)); + Assertions.assertNull(commandServiceLocator.getSimpleService((short) -1)); + Assertions.assertNull(commandServiceLocator.getRequestService((short) -1)); + Assertions.assertNull(commandServiceLocator.getStreamService((short) -1)); } @Test @@ -80,15 +88,15 @@ public void basicFunctionTest1() { short commandEcho = TCommandType.ECHO.getCode(); - Assert.assertEquals(1, commandServiceLocator.getCommandServiceSize()); - Assert.assertEquals(1, commandServiceLocator.getCommandServiceCodes().size()); - Assert.assertTrue(commandServiceLocator.getCommandServiceCodes().contains(commandEcho)); + Assertions.assertEquals(1, commandServiceLocator.getCommandServiceSize()); + Assertions.assertEquals(1, commandServiceLocator.getCommandServiceCodes().size()); + Assertions.assertTrue(commandServiceLocator.getCommandServiceCodes().contains(commandEcho)); - Assert.assertNotNull(commandServiceLocator.getService(commandEcho)); - Assert.assertNotNull(commandServiceLocator.getRequestService(commandEcho)); + Assertions.assertNotNull(commandServiceLocator.getService(commandEcho)); + Assertions.assertNotNull(commandServiceLocator.getRequestService(commandEcho)); - Assert.assertNull(commandServiceLocator.getSimpleService(commandEcho)); - Assert.assertNull(commandServiceLocator.getStreamService(commandEcho)); + Assertions.assertNull(commandServiceLocator.getSimpleService(commandEcho)); + Assertions.assertNull(commandServiceLocator.getStreamService(commandEcho)); } @Test @@ -101,20 +109,20 @@ public void basicFunctionTest2() { short commandTransfer = TCommandType.TRANSFER.getCode(); - Assert.assertEquals(2, commandServiceLocator.getCommandServiceSize()); - Assert.assertEquals(2, commandServiceLocator.getCommandServiceCodes().size()); - Assert.assertTrue(commandServiceLocator.getCommandServiceCodes().contains(commandResult)); - Assert.assertTrue(commandServiceLocator.getCommandServiceCodes().contains(commandTransfer)); + Assertions.assertEquals(2, commandServiceLocator.getCommandServiceSize()); + Assertions.assertEquals(2, commandServiceLocator.getCommandServiceCodes().size()); + Assertions.assertTrue(commandServiceLocator.getCommandServiceCodes().contains(commandResult)); + Assertions.assertTrue(commandServiceLocator.getCommandServiceCodes().contains(commandTransfer)); - Assert.assertNotNull(commandServiceLocator.getService(commandResult)); - Assert.assertNotNull(commandServiceLocator.getSimpleService(commandResult)); - Assert.assertNull(commandServiceLocator.getRequestService(commandResult)); - Assert.assertNull(commandServiceLocator.getStreamService(commandResult)); + Assertions.assertNotNull(commandServiceLocator.getService(commandResult)); + Assertions.assertNotNull(commandServiceLocator.getSimpleService(commandResult)); + Assertions.assertNull(commandServiceLocator.getRequestService(commandResult)); + Assertions.assertNull(commandServiceLocator.getStreamService(commandResult)); - Assert.assertNotNull(commandServiceLocator.getService(commandTransfer)); - Assert.assertNotNull(commandServiceLocator.getStreamService(commandTransfer)); - Assert.assertNull(commandServiceLocator.getSimpleService(commandTransfer)); - Assert.assertNull(commandServiceLocator.getRequestService(commandTransfer)); + Assertions.assertNotNull(commandServiceLocator.getService(commandTransfer)); + Assertions.assertNotNull(commandServiceLocator.getStreamService(commandTransfer)); + Assertions.assertNull(commandServiceLocator.getSimpleService(commandTransfer)); + Assertions.assertNull(commandServiceLocator.getRequestService(commandTransfer)); } private static class MockSimpleCommandService implements ProfilerSimpleCommandService> { diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/ActiveThreadDumpServiceTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/ActiveThreadDumpServiceTest.java index e5bb06ff138b..50d0785f6ce9 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/ActiveThreadDumpServiceTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/ActiveThreadDumpServiceTest.java @@ -18,15 +18,15 @@ import com.navercorp.pinpoint.common.profiler.concurrent.PinpointThreadFactory; import com.navercorp.pinpoint.common.util.ThreadMXBeanUtils; -import com.navercorp.pinpoint.profiler.context.active.ActiveTraceSnapshot; import com.navercorp.pinpoint.profiler.context.active.ActiveTraceRepository; +import com.navercorp.pinpoint.profiler.context.active.ActiveTraceSnapshot; import com.navercorp.pinpoint.profiler.context.active.UnsampledActiveTraceSnapshot; import com.navercorp.pinpoint.thrift.dto.command.TActiveThreadDump; import com.navercorp.pinpoint.thrift.dto.command.TCmdActiveThreadDump; import com.navercorp.pinpoint.thrift.dto.command.TCmdActiveThreadDumpRes; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.lang.management.ThreadInfo; import java.util.ArrayList; @@ -55,7 +55,7 @@ public class ActiveThreadDumpServiceTest { private final WaitingJobListFactory waitingJobListFactory = new WaitingJobListFactory(); - @After + @AfterEach public void tearDown() throws Exception { waitingJobListFactory.close(); } @@ -70,7 +70,7 @@ public void basicFunctionTest1() { ActiveThreadDumpService service = createService(activeTraceInfoList); TCmdActiveThreadDumpRes response = (TCmdActiveThreadDumpRes) service.requestCommandService(createRequest(0, null, null)); - Assert.assertEquals(CREATE_SIZE, response.getThreadDumpsSize()); + Assertions.assertEquals(CREATE_SIZE, response.getThreadDumpsSize()); } @@ -85,7 +85,7 @@ public void basicFunctionTest2() { ActiveThreadDumpService service = createService(activeTraceInfoList); TCmdActiveThreadDumpRes response = (TCmdActiveThreadDumpRes) service.requestCommandService(tCmdActiveThreadDump); - Assert.assertEquals(1, response.getThreadDumpsSize()); + Assertions.assertEquals(1, response.getThreadDumpsSize()); } @@ -103,7 +103,7 @@ public void basicFunctionTest3() { ActiveThreadDumpService service = createService(activeTraceInfoList); TCmdActiveThreadDumpRes response = (TCmdActiveThreadDumpRes) service.requestCommandService(tCmdActiveThreadDump); - Assert.assertEquals(3, response.getThreadDumpsSize()); + Assertions.assertEquals(3, response.getThreadDumpsSize()); } @@ -112,7 +112,6 @@ public void basicFunctionTest4() { List waitingJobList = this.waitingJobListFactory.createList(CREATE_SIZE, 1000 * 3); - List activeTraceInfoList = createMockActiveTraceInfoList(CREATE_SIZE, DEFAULT_TIME_MILLIS, TIME_DIFF_INTERVAL, waitingJobList); List copied = shuffle(activeTraceInfoList); @@ -126,7 +125,7 @@ public void basicFunctionTest4() { ActiveThreadDumpService service = createService(activeTraceInfoList); TCmdActiveThreadDumpRes response = (TCmdActiveThreadDumpRes) service.requestCommandService(tCmdActiveThreadDump); - Assert.assertEquals(targetThreadNameSize + targetTraceIdSize, response.getThreadDumpsSize()); + Assertions.assertEquals(targetThreadNameSize + targetTraceIdSize, response.getThreadDumpsSize()); } @@ -145,10 +144,10 @@ public void basicFunctionTest5() { ActiveThreadDumpService service = createService(activeTraceInfoList); TCmdActiveThreadDumpRes response = (TCmdActiveThreadDumpRes) service.requestCommandService(tCmdActiveThreadDump); - Assert.assertEquals(limit, response.getThreadDumpsSize()); + Assertions.assertEquals(limit, response.getThreadDumpsSize()); for (TActiveThreadDump dump : response.getThreadDumps()) { - Assert.assertTrue(oldTimeList.contains(dump.getStartTime())); + Assertions.assertTrue(oldTimeList.contains(dump.getStartTime())); } } @@ -219,7 +218,6 @@ private ActiveThreadDumpService createService(List activeTr } - private TCmdActiveThreadDump createRequest(int limit, List threadNameList, List localTraceIdList) { TCmdActiveThreadDump request = new TCmdActiveThreadDump(); if (limit > 0) { @@ -235,5 +233,4 @@ private TCmdActiveThreadDump createRequest(int limit, List threadNameLis } - } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/ActiveThreadLightDumpServiceTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/ActiveThreadLightDumpServiceTest.java index ef202905546d..ab0da36d2ae6 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/ActiveThreadLightDumpServiceTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/ActiveThreadLightDumpServiceTest.java @@ -16,20 +16,20 @@ package com.navercorp.pinpoint.profiler.receiver.service; -import com.navercorp.pinpoint.common.util.CollectionUtils; import com.navercorp.pinpoint.common.profiler.concurrent.PinpointThreadFactory; +import com.navercorp.pinpoint.common.util.CollectionUtils; import com.navercorp.pinpoint.common.util.ThreadMXBeanUtils; -import com.navercorp.pinpoint.profiler.context.active.ActiveTraceSnapshot; import com.navercorp.pinpoint.profiler.context.active.ActiveTraceRepository; +import com.navercorp.pinpoint.profiler.context.active.ActiveTraceSnapshot; import com.navercorp.pinpoint.profiler.context.active.UnsampledActiveTraceSnapshot; import com.navercorp.pinpoint.thrift.dto.command.TActiveThreadLightDump; import com.navercorp.pinpoint.thrift.dto.command.TCmdActiveThreadLightDump; import com.navercorp.pinpoint.thrift.dto.command.TCmdActiveThreadLightDumpRes; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.lang.management.ThreadInfo; import java.util.ArrayList; @@ -61,7 +61,7 @@ public class ActiveThreadLightDumpServiceTest { private final WaitingJobListFactory waitingJobListFactory = new WaitingJobListFactory(); - @After + @AfterEach public void tearDown() throws Exception { waitingJobListFactory.close(); } @@ -75,7 +75,7 @@ public void basicFunctionTest1() throws Exception { ActiveThreadLightDumpService service = createService(activeTraceInfoList); TCmdActiveThreadLightDumpRes response = (TCmdActiveThreadLightDumpRes) service.requestCommandService(createRequest(0, null, null)); - Assert.assertEquals(CREATE_SIZE, response.getThreadDumpsSize()); + Assertions.assertEquals(CREATE_SIZE, response.getThreadDumpsSize()); } @@ -91,7 +91,7 @@ public void basicFunctionTest2() throws Exception { ActiveThreadLightDumpService service = createService(activeTraceInfoList); TCmdActiveThreadLightDumpRes response = (TCmdActiveThreadLightDumpRes) service.requestCommandService(tCmdActiveThreadDump); - Assert.assertEquals(1, response.getThreadDumpsSize()); + Assertions.assertEquals(1, response.getThreadDumpsSize()); } @@ -109,7 +109,7 @@ public void basicFunctionTest3() throws Exception { ActiveThreadLightDumpService service = createService(activeTraceInfoList); TCmdActiveThreadLightDumpRes response = (TCmdActiveThreadLightDumpRes) service.requestCommandService(tCmdActiveThreadDump); - Assert.assertEquals(3, response.getThreadDumpsSize()); + Assertions.assertEquals(3, response.getThreadDumpsSize()); } @@ -131,7 +131,7 @@ public void basicFunctionTest4() throws Exception { ActiveThreadLightDumpService service = createService(activeTraceInfoList); TCmdActiveThreadLightDumpRes response = (TCmdActiveThreadLightDumpRes) service.requestCommandService(tCmdActiveThreadDump); - Assert.assertEquals(targetThreadNameSize + targetTraceIdSize, response.getThreadDumpsSize()); + Assertions.assertEquals(targetThreadNameSize + targetTraceIdSize, response.getThreadDumpsSize()); } @@ -150,10 +150,10 @@ public void basicFunctionTest5() throws Exception { ActiveThreadLightDumpService service = createService(activeTraceInfoList); TCmdActiveThreadLightDumpRes response = (TCmdActiveThreadLightDumpRes) service.requestCommandService(tCmdActiveThreadDump); - Assert.assertEquals(limit, response.getThreadDumpsSize()); + Assertions.assertEquals(limit, response.getThreadDumpsSize()); for (TActiveThreadLightDump dump : response.getThreadDumps()) { - Assert.assertTrue(oldTimeList.contains(dump.getStartTime())); + Assertions.assertTrue(oldTimeList.contains(dump.getStartTime())); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/ActiveThreadServiceTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/ActiveThreadServiceTest.java index fa236e577d4a..dfbf4aecaa56 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/ActiveThreadServiceTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/ActiveThreadServiceTest.java @@ -26,8 +26,8 @@ import org.apache.thrift.TBase; import org.hamcrest.MatcherAssert; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.util.List; @@ -73,7 +73,7 @@ public void serviceTest1() { MatcherAssert.assertThat(activeThreadCount.get(2), is(SLOW_COUNT)); MatcherAssert.assertThat(activeThreadCount.get(3), is(VERY_SLOW_COUNT)); } else { - Assert.fail(); + Assertions.fail(); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/LimitedListTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/LimitedListTest.java index 1041c17fb40e..0625bb62ccbc 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/LimitedListTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/LimitedListTest.java @@ -18,10 +18,10 @@ import com.navercorp.pinpoint.profiler.context.active.ActiveTraceSnapshot; import com.navercorp.pinpoint.profiler.context.active.UnsampledActiveTraceSnapshot; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.lang.management.ThreadInfo; import java.util.ArrayList; @@ -42,7 +42,7 @@ public class LimitedListTest { @Test public void testMaxSize() { - Comparator threadDump = Collections.reverseOrder(new ThreadDumpComparator()); + Comparator threadDump = Collections.reverseOrder(new ThreadDumpComparator()); final int maxSize = 10; Collection limitedList = new LimitedList<>(maxSize, threadDump); @@ -66,14 +66,14 @@ public void testMaxSize() { List sortedList = new ArrayList<>(limitedList); Collections.sort(sortedList, threadDump); for (ThreadDump activeTraceSnapshot : sortedList) { - logger.debug("poll:{}", activeTraceSnapshot ); + logger.debug("poll:{}", activeTraceSnapshot); } ThreadDump last = getLastObject(sortedList); logger.debug("last pool:{}", last); logger.debug("poll.startTime:{}", last.getActiveTraceSnapshot().getStartTime()); logger.debug("startTime:{}", lastTime); - Assert.assertEquals(last.getActiveTraceSnapshot().getStartTime(), startTime); + Assertions.assertEquals(last.getActiveTraceSnapshot().getStartTime(), startTime); } @@ -83,7 +83,7 @@ private T getLastObject(List testData) { } private int getLastIndex(List testData) { - return testData.size() -1; + return testData.size() - 1; } private List newTestData(int localTransactionId, long startTime, long threadId, int size) { diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/ThreadDumpRequestTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/ThreadDumpRequestTest.java index bfb0af4a24cd..c6f0d6e2e3d6 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/ThreadDumpRequestTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/receiver/service/ThreadDumpRequestTest.java @@ -16,13 +16,12 @@ package com.navercorp.pinpoint.profiler.receiver.service; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.List; - /** * @author Woonduk Kang(emeroad) */ @@ -32,10 +31,10 @@ public class ThreadDumpRequestTest { @Test public void getLimit() { final int maxThreadDumpLimit = ThreadDumpRequest.MAX_THREAD_DUMP_LIMIT; - Assert.assertEquals(ThreadDumpRequest.getLimit(-1), maxThreadDumpLimit); - Assert.assertEquals(ThreadDumpRequest.getLimit(0), maxThreadDumpLimit); - Assert.assertEquals(ThreadDumpRequest.getLimit(1000), 1000); - Assert.assertEquals(ThreadDumpRequest.getLimit(maxThreadDumpLimit + 100), maxThreadDumpLimit); + Assertions.assertEquals(ThreadDumpRequest.getLimit(-1), maxThreadDumpLimit); + Assertions.assertEquals(ThreadDumpRequest.getLimit(0), maxThreadDumpLimit); + Assertions.assertEquals(ThreadDumpRequest.getLimit(1000), 1000); + Assertions.assertEquals(ThreadDumpRequest.getLimit(maxThreadDumpLimit + 100), maxThreadDumpLimit); } @@ -45,15 +44,15 @@ public void enableTransactionId() { List localTransactionIdList = Collections.singletonList(1L); List threadNameList = Collections.emptyList(); ThreadDumpRequest request = new ThreadDumpRequest(StackTrace.DUMP, 10, localTransactionIdList, threadNameList); - Assert.assertTrue(request.isEnableFilter()); - Assert.assertTrue(request.isEnableLocalTransactionIdFilter()); - Assert.assertFalse(request.isEnableThreadNameFilter()); + Assertions.assertTrue(request.isEnableFilter()); + Assertions.assertTrue(request.isEnableLocalTransactionIdFilter()); + Assertions.assertFalse(request.isEnableThreadNameFilter()); - Assert.assertTrue(request.findLocalTransactionId(1)); - Assert.assertFalse(request.findLocalTransactionId(2)); + Assertions.assertTrue(request.findLocalTransactionId(1)); + Assertions.assertFalse(request.findLocalTransactionId(2)); - Assert.assertFalse(request.findThreadName("a")); - Assert.assertFalse(request.findThreadName("b")); + Assertions.assertFalse(request.findThreadName("a")); + Assertions.assertFalse(request.findThreadName("b")); } @Test @@ -63,15 +62,15 @@ public void enableThreadDump() { List threadNameList = Collections.singletonList("a"); ThreadDumpRequest request = new ThreadDumpRequest(StackTrace.DUMP, 10, localTransactionIdList, threadNameList); - Assert.assertTrue(request.isEnableFilter()); - Assert.assertFalse(request.isEnableLocalTransactionIdFilter()); - Assert.assertTrue(request.isEnableThreadNameFilter()); + Assertions.assertTrue(request.isEnableFilter()); + Assertions.assertFalse(request.isEnableLocalTransactionIdFilter()); + Assertions.assertTrue(request.isEnableThreadNameFilter()); - Assert.assertFalse(request.findLocalTransactionId(1)); - Assert.assertFalse(request.findLocalTransactionId(2)); + Assertions.assertFalse(request.findLocalTransactionId(1)); + Assertions.assertFalse(request.findLocalTransactionId(2)); - Assert.assertTrue(request.findThreadName("a")); - Assert.assertFalse(request.findThreadName("b")); + Assertions.assertTrue(request.findThreadName("a")); + Assertions.assertFalse(request.findThreadName("b")); } @@ -81,15 +80,15 @@ public void filter() { List localTransactionIdList = Collections.singletonList(1L); List threadNameList = Collections.singletonList("a"); ThreadDumpRequest request = new ThreadDumpRequest(StackTrace.DUMP, 10, localTransactionIdList, threadNameList); - Assert.assertTrue(request.isEnableFilter()); - Assert.assertTrue(request.isEnableLocalTransactionIdFilter()); - Assert.assertTrue(request.isEnableThreadNameFilter()); + Assertions.assertTrue(request.isEnableFilter()); + Assertions.assertTrue(request.isEnableLocalTransactionIdFilter()); + Assertions.assertTrue(request.isEnableThreadNameFilter()); - Assert.assertTrue(request.findLocalTransactionId(1)); - Assert.assertFalse(request.findLocalTransactionId(2)); + Assertions.assertTrue(request.findLocalTransactionId(1)); + Assertions.assertFalse(request.findLocalTransactionId(2)); - Assert.assertTrue(request.findThreadName("a")); - Assert.assertFalse(request.findThreadName("b")); + Assertions.assertTrue(request.findThreadName("a")); + Assertions.assertFalse(request.findThreadName("b")); } @Test @@ -99,14 +98,14 @@ public void all() { List threadNameList = Collections.emptyList(); ThreadDumpRequest request = new ThreadDumpRequest(StackTrace.DUMP, 10, localTransactionIdList, threadNameList); - Assert.assertFalse(request.isEnableFilter()); - Assert.assertFalse(request.isEnableLocalTransactionIdFilter()); - Assert.assertFalse(request.isEnableThreadNameFilter()); + Assertions.assertFalse(request.isEnableFilter()); + Assertions.assertFalse(request.isEnableLocalTransactionIdFilter()); + Assertions.assertFalse(request.isEnableThreadNameFilter()); - Assert.assertFalse(request.findLocalTransactionId(1)); - Assert.assertFalse(request.findLocalTransactionId(2)); + Assertions.assertFalse(request.findLocalTransactionId(1)); + Assertions.assertFalse(request.findLocalTransactionId(2)); - Assert.assertFalse(request.findThreadName("a")); - Assert.assertFalse(request.findThreadName("b")); + Assertions.assertFalse(request.findThreadName("a")); + Assertions.assertFalse(request.findThreadName("b")); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/CountingSamplerFactoryTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/CountingSamplerFactoryTest.java index 1150cbf9fca4..39d459de0411 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/CountingSamplerFactoryTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/CountingSamplerFactoryTest.java @@ -18,10 +18,8 @@ import com.navercorp.pinpoint.bootstrap.config.ProfilerConfig; import com.navercorp.pinpoint.bootstrap.sampler.Sampler; - -import org.junit.Assert; - -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -35,7 +33,7 @@ public void createSamplerSamplingRate0() { SamplerFactory factory = new CountingSamplerFactory(0); Sampler sampler = factory.createSampler(); boolean sampling = sampler.isSampling(); - Assert.assertFalse(sampling); + Assertions.assertFalse(sampling); } @Test @@ -43,7 +41,7 @@ public void createSamplerSamplingRate_Negative() { SamplerFactory factory = new CountingSamplerFactory(-1); Sampler sampler = factory.createSampler(); boolean sampling = sampler.isSampling(); - Assert.assertFalse(sampling); + Assertions.assertFalse(sampling); } @Test @@ -51,10 +49,10 @@ public void sampling() { SamplerFactory factory = new CountingSamplerFactory(2); Sampler sampler = factory.createSampler(); - Assert.assertEquals(true, sampler.isSampling()); - Assert.assertEquals(false, sampler.isSampling()); - Assert.assertEquals(true, sampler.isSampling()); - Assert.assertEquals(false, sampler.isSampling()); + Assertions.assertEquals(true, sampler.isSampling()); + Assertions.assertEquals(false, sampler.isSampling()); + Assertions.assertEquals(true, sampler.isSampling()); + Assertions.assertEquals(false, sampler.isSampling()); } @Test @@ -63,7 +61,7 @@ public void legacy_samplingRate() { when(profilerConfig.readInt(CountingSamplerFactory.LEGACY_SAMPLING_RATE_NAME, -1)).thenReturn(100); CountingSamplerFactory.Config config = CountingSamplerFactory.config(profilerConfig); - Assert.assertEquals(100, config.getSamplingRate()); + Assertions.assertEquals(100, config.getSamplingRate()); } @Test @@ -73,6 +71,6 @@ public void new_samplingRate() { when(profilerConfig.readInt(CountingSamplerFactory.SAMPLING_RATE_NAME, 1)).thenReturn(200); CountingSamplerFactory.Config config = CountingSamplerFactory.config(profilerConfig); - Assert.assertEquals(200, config.getSamplingRate()); + Assertions.assertEquals(200, config.getSamplingRate()); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/PercentRateSamplerTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/PercentRateSamplerTest.java index a50f1bd33b3e..8cee25763a9f 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/PercentRateSamplerTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/PercentRateSamplerTest.java @@ -17,9 +17,8 @@ package com.navercorp.pinpoint.profiler.sampler; import com.navercorp.pinpoint.bootstrap.sampler.Sampler; -import org.junit.Assert; -import org.junit.Test; - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -90,11 +89,11 @@ public void test_1p() { private void assertDrop(Sampler simpleSampler) { boolean sample = simpleSampler.isSampling(); - Assert.assertFalse(sample); + Assertions.assertFalse(sample); } private void assertChoice(Sampler simpleSampler) { boolean sample = simpleSampler.isSampling(); - Assert.assertTrue(sample); + Assertions.assertTrue(sample); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/PercentSamplerFactoryTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/PercentSamplerFactoryTest.java index 845002bea9ee..69424248ba4b 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/PercentSamplerFactoryTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/PercentSamplerFactoryTest.java @@ -1,8 +1,8 @@ package com.navercorp.pinpoint.profiler.sampler; import com.navercorp.pinpoint.bootstrap.sampler.Sampler; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class PercentSamplerFactoryTest { @@ -23,7 +23,7 @@ public void parseSamplingRate() { private void assertDoubleParse(long expected, String strValue) { long v = PercentSamplerFactory.parseSamplingRate(strValue); - Assert.assertEquals(expected, v); + Assertions.assertEquals(expected, v); } @Test @@ -31,10 +31,10 @@ public void isSampling() { SamplerFactory factory = new PercentSamplerFactory(50_00); Sampler sampler = factory.createSampler(); - Assert.assertEquals(true, sampler.isSampling()); - Assert.assertEquals(false, sampler.isSampling()); - Assert.assertEquals(true, sampler.isSampling()); - Assert.assertEquals(false, sampler.isSampling()); + Assertions.assertEquals(true, sampler.isSampling()); + Assertions.assertEquals(false, sampler.isSampling()); + Assertions.assertEquals(true, sampler.isSampling()); + Assertions.assertEquals(false, sampler.isSampling()); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/SamplerTypeTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/SamplerTypeTest.java index fddaa8980947..dc5724fce221 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/SamplerTypeTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/SamplerTypeTest.java @@ -1,15 +1,13 @@ package com.navercorp.pinpoint.profiler.sampler; -import org.junit.Assert; -import org.junit.Test; - -import static org.junit.Assert.*; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class SamplerTypeTest { @Test public void of() { - Assert.assertEquals(SamplerType.COUNTING, SamplerType.of("counting")); - Assert.assertEquals(SamplerType.PERCENT, SamplerType.of("percent")); + Assertions.assertEquals(SamplerType.COUNTING, SamplerType.of("counting")); + Assertions.assertEquals(SamplerType.PERCENT, SamplerType.of("percent")); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/SimpleSamplerTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/SimpleSamplerTest.java index 9f592a93a5a0..58f483d90d6c 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/SimpleSamplerTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/SimpleSamplerTest.java @@ -16,10 +16,10 @@ package com.navercorp.pinpoint.profiler.sampler; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -36,7 +36,7 @@ public void test() { assertChoice(simpleSampler); assertChoice(simpleSampler); - CountingSampler simpleSampler2 = new CountingSampler(2); + CountingSampler simpleSampler2 = new CountingSampler(2); assertChoice(simpleSampler2); assertDrop(simpleSampler2); assertChoice(simpleSampler2); @@ -54,11 +54,11 @@ public void mod() { private void assertDrop(CountingSampler simpleSampler) { boolean sample = simpleSampler.isSampling(); - Assert.assertFalse(sample); + Assertions.assertFalse(sample); } private void assertChoice(CountingSampler simpleSampler) { boolean sample = simpleSampler.isSampling(); - Assert.assertTrue(sample); + Assertions.assertTrue(sample); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/ThroughputSamplerTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/ThroughputSamplerTest.java index 38656b69625a..920e2face08a 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/ThroughputSamplerTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/ThroughputSamplerTest.java @@ -20,8 +20,8 @@ import com.navercorp.pinpoint.bootstrap.sampler.TraceSampler; import com.navercorp.pinpoint.profiler.context.id.AtomicIdGenerator; import com.navercorp.pinpoint.profiler.context.id.IdGenerator; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class ThroughputSamplerTest { @@ -29,7 +29,7 @@ public class ThroughputSamplerTest { public void isSampling_1() { // 1 per seconds TraceSampler sampler = newTraceSampler(1); - Assert.assertTrue(sampler.isNewSampled().isSampled()); + Assertions.assertTrue(sampler.isNewSampled().isSampled()); } @@ -37,7 +37,7 @@ public void isSampling_1() { public void isSampling_1000() { // 1000 per seconds TraceSampler sampler = newTraceSampler(1000); - Assert.assertTrue(sampler.isNewSampled().isSampled()); + Assertions.assertTrue(sampler.isNewSampled().isSampled()); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/NioUdpDataSenderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/NioUdpDataSenderTest.java index 741436c65195..4ab5efee9c19 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/NioUdpDataSenderTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/NioUdpDataSenderTest.java @@ -25,12 +25,13 @@ import com.navercorp.pinpoint.profiler.metadata.StringMetaData; import com.navercorp.pinpoint.testcase.util.SocketUtils; import org.apache.commons.lang.RandomStringUtils; -import org.apache.thrift.TBase; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.thrift.TBase; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.DatagramPacket; @@ -53,14 +54,14 @@ public class NioUdpDataSenderTest { private int PORT = SocketUtils.findAvailableUdpPort(61112); private DatagramSocket receiver; - @Before + @BeforeEach public void setUp() throws SocketException { receiver = new DatagramSocket(PORT); receiver.setSoTimeout(1000); } - @After - public void setDown() { + @AfterEach + public void setDown() { IOUtils.closeQuietly(receiver); // port conflict happens when testcases run continuously so port number is increased. PORT = SocketUtils.findAvailableUdpPort(61112); @@ -93,16 +94,18 @@ private NioUDPDataSender newNioUdpDataSender() { return new NioUDPDataSender<>("localhost", PORT, "test", 128, 1000, 1024 * 64 * 100, messageConverter); } - @Test(expected = IOException.class) + @Test public void exceedMessageSendTest() throws IOException { - String random = RandomStringUtils.randomAlphabetic(ThriftUdpMessageSerializer.UDP_MAX_PACKET_LENGTH + 100); + Assertions.assertThrows(IOException.class, () -> { + String random = RandomStringUtils.randomAlphabetic(ThriftUdpMessageSerializer.UDP_MAX_PACKET_LENGTH + 100); - MetaDataType metaData = new StringMetaData(1, random); + MetaDataType metaData = new StringMetaData(1, random); - NioUDPDataSender sender = newNioUdpDataSender(); - sender.send(metaData); + NioUDPDataSender sender = newNioUdpDataSender(); + sender.send(metaData); - waitMessageReceived(1); + waitMessageReceived(1); + }); } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/RefreshStrategyTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/RefreshStrategyTest.java index 23d60f37c9d4..b8598885b625 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/RefreshStrategyTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/RefreshStrategyTest.java @@ -17,12 +17,12 @@ package com.navercorp.pinpoint.profiler.sender; import com.navercorp.pinpoint.rpc.client.SocketAddressProvider; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.net.InetSocketAddress; @@ -32,13 +32,13 @@ /** * @author Woonduk Kang(emeroad) */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class RefreshStrategyTest { @Mock private SocketAddressProvider socketAddressProvider; - @Before + @BeforeEach public void setUp() throws Exception { InetSocketAddress address = new InetSocketAddress("127.0.0.1", 8080); when(socketAddressProvider.resolve()).thenReturn(address); @@ -59,7 +59,7 @@ public void resolve_refresh() { @Test public void resolve_norefresh() { - UdpSocketAddressProvider refreshStrategy = new RefreshStrategy(socketAddressProvider, 10*1000, 0); + UdpSocketAddressProvider refreshStrategy = new RefreshStrategy(socketAddressProvider, 10 * 1000, 0); // first lookup refreshStrategy.resolve(); // refresh lookup @@ -70,7 +70,7 @@ public void resolve_norefresh() { @Test public void handlePortUnreachable_refresh() { - UdpSocketAddressProvider refreshStrategy = new RefreshStrategy(socketAddressProvider, 10*1000, -1); + UdpSocketAddressProvider refreshStrategy = new RefreshStrategy(socketAddressProvider, 10 * 1000, -1); // first lookup refreshStrategy.resolve(); refreshStrategy.handlePortUnreachable(); @@ -82,7 +82,7 @@ public void handlePortUnreachable_refresh() { @Test public void handlePortUnreachable_norefresh() { - UdpSocketAddressProvider refreshStrategy = new RefreshStrategy(socketAddressProvider, 10*1000, 10*1000); + UdpSocketAddressProvider refreshStrategy = new RefreshStrategy(socketAddressProvider, 10 * 1000, 10 * 1000); // first lookup refreshStrategy.resolve(); refreshStrategy.handlePortUnreachable(); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/RetryMessageTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/RetryMessageTest.java index 5806c51c5fee..6f21e87965cf 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/RetryMessageTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/RetryMessageTest.java @@ -16,10 +16,10 @@ package com.navercorp.pinpoint.profiler.sender; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Taejin Koo @@ -31,40 +31,47 @@ public class RetryMessageTest { @Test public void availableTest1() { RetryMessage retryMessage = new RetryMessage(1, new byte[0]); - Assert.assertTrue(retryMessage.isRetryAvailable()); + Assertions.assertTrue(retryMessage.isRetryAvailable()); retryMessage.fail(); - Assert.assertFalse(retryMessage.isRetryAvailable()); + Assertions.assertFalse(retryMessage.isRetryAvailable()); } @Test public void availableTest2() { RetryMessage retryMessage = new RetryMessage(1, 2, new byte[0]); - Assert.assertTrue(retryMessage.isRetryAvailable()); + Assertions.assertTrue(retryMessage.isRetryAvailable()); retryMessage.fail(); - Assert.assertFalse(retryMessage.isRetryAvailable()); + Assertions.assertFalse(retryMessage.isRetryAvailable()); } @Test public void availableTest3() { RetryMessage retryMessage = new RetryMessage(2, 2, new byte[0]); - Assert.assertFalse(retryMessage.isRetryAvailable()); + Assertions.assertFalse(retryMessage.isRetryAvailable()); } - @Test(expected = IllegalArgumentException.class) + @Test public void illegalArgumentTest1() { - RetryMessage retryMessage = new RetryMessage(-1, new byte[0]); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + RetryMessage retryMessage = new RetryMessage(-1, new byte[0]); + }); + } - @Test(expected = IllegalArgumentException.class) + @Test public void illegalArgumentTest2() { - RetryMessage retryMessage = new RetryMessage(-1, 5, new byte[0]); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + RetryMessage retryMessage = new RetryMessage(-1, 5, new byte[0]); + }); } - @Test(expected = IllegalArgumentException.class) + @Test public void illegalArgumentTest3() { - RetryMessage retryMessage = new RetryMessage(10, 9, new byte[0]); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + RetryMessage retryMessage = new RetryMessage(10, 9, new byte[0]); + }); } @Test diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/RetryQueueTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/RetryQueueTest.java index 77b97cb6c503..43db5dcd00d8 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/RetryQueueTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/RetryQueueTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.profiler.sender; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -29,7 +29,7 @@ public void size() { retryQueue.add(new RetryMessage(1, new byte[0])); retryQueue.add(new RetryMessage(1, new byte[0])); - Assert.assertEquals(1, retryQueue.size()); + Assertions.assertEquals(1, retryQueue.size()); } @Test @@ -37,7 +37,7 @@ public void size2() { RetryQueue retryQueue = new RetryQueue(1, 1); RetryMessage retryMessage = retryQueue.get(); - Assert.assertNull(retryMessage); + Assertions.assertNull(retryMessage); } @Test @@ -51,7 +51,7 @@ public void maxRetryTest() { retryQueue.add(retryMessage); retryQueue.add(retryMessage); - Assert.assertEquals(retryQueue.size(), 0); + Assertions.assertEquals(retryQueue.size(), 0); } @Test @@ -65,7 +65,7 @@ public void maxRetryTest2() { retryQueue.add(retryMessage); retryQueue.add(retryMessage); - Assert.assertEquals(retryQueue.size(), 0); + Assertions.assertEquals(retryQueue.size(), 0); } @Test @@ -77,6 +77,6 @@ public void add() { retryMessage.fail(); retryQueue.add(retryMessage); - Assert.assertEquals(retryQueue.size(), 1); + Assertions.assertEquals(retryQueue.size(), 1); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/TcpDataSenderReconnectTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/TcpDataSenderReconnectTest.java index 9165498f115b..109f98d640c2 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/TcpDataSenderReconnectTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/TcpDataSenderReconnectTest.java @@ -21,12 +21,12 @@ import com.navercorp.pinpoint.rpc.server.LoggingServerMessageListenerFactory; import com.navercorp.pinpoint.test.server.TestPinpointServerAcceptor; import com.navercorp.pinpoint.thrift.dto.TApiMetaData; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.awaitility.Awaitility; import org.awaitility.core.ConditionFactory; import org.hamcrest.Matchers; -import org.junit.Test; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.concurrent.Callable; @@ -39,7 +39,7 @@ public class TcpDataSenderReconnectTest { private final Logger logger = LogManager.getLogger(this.getClass()); - private ConditionFactory awaitility() { + private ConditionFactory awaitility() { ConditionFactory conditionFactory = Awaitility.await() .pollDelay(100, TimeUnit.MILLISECONDS) .timeout(5000, TimeUnit.MILLISECONDS); @@ -74,7 +74,7 @@ public void connectAndSend() throws InterruptedException { newTestPinpointServerAcceptor.close(); clientFactory.release(); } - + private PinpointClientFactory createPinpointClientFactory() { PinpointClientFactory clientFactory = new DefaultPinpointClientFactory(); clientFactory.setWriteTimeoutMillis(1000 * 3); @@ -85,12 +85,12 @@ private PinpointClientFactory createPinpointClientFactory() { } private void waitClientDisconnected(final TcpDataSender sender) { - awaitility().until(new Callable() { - @Override - public Boolean call() { - return sender.isConnected(); - } - }, Matchers.not(true)); + awaitility().until(new Callable() { + @Override + public Boolean call() { + return sender.isConnected(); + } + }, Matchers.not(true)); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/TcpDataSenderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/TcpDataSenderTest.java index c4040abb5bc6..04e6d9424947 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/TcpDataSenderTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/TcpDataSenderTest.java @@ -21,7 +21,7 @@ import com.navercorp.pinpoint.test.server.TestPinpointServerAcceptor; import com.navercorp.pinpoint.test.server.TestServerMessageListenerFactory; import com.navercorp.pinpoint.thrift.dto.TApiMetaData; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Collections; @@ -48,7 +48,7 @@ public void connectAndSend() { serverMessageListener.awaitAssertExpectedSendCount(2, 1000); } finally { sender.stop(); - + if (clientFactory != null) { clientFactory.release(); } @@ -56,7 +56,7 @@ public void connectAndSend() { testPinpointServerAcceptor.close(); } } - + private PinpointClientFactory createPinpointClientFactory() { PinpointClientFactory clientFactory = new DefaultPinpointClientFactory(); clientFactory.setWriteTimeoutMillis(1000 * 3); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/UdpDataSenderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/UdpDataSenderTest.java index 90ef79c0280f..9fccae308da6 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/UdpDataSenderTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/UdpDataSenderTest.java @@ -22,14 +22,12 @@ import com.navercorp.pinpoint.profiler.logging.Log4j2LoggerBinderInitializer; import com.navercorp.pinpoint.testcase.util.SocketUtils; import com.navercorp.pinpoint.thrift.dto.TAgentInfo; - -import org.junit.Assert; - import org.apache.commons.lang.RandomStringUtils; import org.apache.thrift.TBase; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -45,12 +43,13 @@ public class UdpDataSenderTest { private static final ServiceType APP_SERVICE_TYPE = ServiceType.STAND_ALONE; private final int PORT = SocketUtils.findAvailableUdpPort(9009); - @BeforeClass + + @BeforeAll public static void before() { Log4j2LoggerBinderInitializer.beforeClass(); } - @AfterClass + @AfterAll public static void after() { Log4j2LoggerBinderInitializer.afterClass(); } @@ -60,7 +59,7 @@ public static void after() { public void sendAndFlushCheck() { final MessageConverter, TBase> messageConverter = new BypassMessageConverter<>(); final MessageSerializer, ByteMessage> thriftMessageSerializer = new ThriftUdpMessageSerializer<>(messageConverter, ThriftUdpMessageSerializer.UDP_MAX_PACKET_LENGTH); - UdpDataSender> sender = new UdpDataSender<>("localhost", PORT, "test", 128, 1000, 1024*64*100, + UdpDataSender> sender = new UdpDataSender<>("localhost", PORT, "test", 128, 1000, 1024 * 64 * 100, thriftMessageSerializer); TAgentInfo agentInfo = new TAgentInfo(); @@ -86,10 +85,10 @@ public void sendAndFlushCheck() { // TAgentInfo agentInfo = new TAgentInfo(); // agentInfo.setAgentId(random); // boolean limit = sendMessage_getLimit(agentInfo, 5000); -// Assert.assertTrue("limit overflow",limit); +// Assertions.assertTrue("limit overflow",limit); // // boolean noLimit = sendMessage_getLimit(new TAgentInfo(), 5000); -// Assert.assertFalse("success", noLimit); +// Assertions.assertFalse("success", noLimit); // } @Test @@ -100,10 +99,10 @@ public void sendExceedData() throws InterruptedException { boolean limit = sendMessage_getLimit(agentInfo, 1000); // do not execute. - Assert.assertFalse(limit); + Assertions.assertFalse(limit); } - + private boolean sendMessage_getLimit(TBase tbase, long waitTimeMillis) throws InterruptedException { final AtomicBoolean limitCounter = new AtomicBoolean(false); final CountDownLatch latch = new CountDownLatch(1); @@ -111,14 +110,14 @@ private boolean sendMessage_getLimit(TBase tbase, long waitTimeMillis) thr final MessageSerializer thriftMessageSerializer = new ThriftUdpMessageSerializer(messageConverter, ThriftUdpMessageSerializer.UDP_MAX_PACKET_LENGTH) { @Override protected boolean isLimit(int interBufferSize) { - final boolean limit = super.isLimit(interBufferSize); + final boolean limit = super.isLimit(interBufferSize); limitCounter.set(limit); latch.countDown(); return limit; } }; - UdpDataSender sender = new UdpDataSender<>("localhost", PORT, "test", 128, 1000, 1024*64*100, + UdpDataSender sender = new UdpDataSender<>("localhost", PORT, "test", 128, 1000, 1024 * 64 * 100, thriftMessageSerializer); try { sender.send(tbase); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/UdpSocketTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/UdpSocketTest.java index 3891368de3bd..1bb5e478a046 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/UdpSocketTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/UdpSocketTest.java @@ -18,9 +18,13 @@ import com.navercorp.pinpoint.common.util.IOUtils; import com.navercorp.pinpoint.testcase.util.SocketUtils; -import org.junit.*; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.DatagramPacket; @@ -31,7 +35,7 @@ /** * @author emeroad */ -@Ignore +@Disabled public class UdpSocketTest { private final Logger logger = LogManager.getLogger(this.getClass().getName()); @@ -46,14 +50,14 @@ public class UdpSocketTest { private DatagramSocket receiver; private DatagramSocket sender; - @Before + @BeforeEach public void setUp() throws SocketException { receiver = new DatagramSocket(PORT); sender = new DatagramSocket(); sender.connect(new InetSocketAddress("localhost", PORT)); } - @After + @AfterEach public void setDown() throws InterruptedException { IOUtils.closeQuietly(sender); IOUtils.closeQuietly(receiver); @@ -76,11 +80,11 @@ public void testChunkSize() throws IOException { DatagramPacket r1 = newDatagramPacket(2000); receiver.receive(r1); - Assert.assertEquals(r1.getLength(), 1000); + Assertions.assertEquals(r1.getLength(), 1000); DatagramPacket r2 = newDatagramPacket(2000); receiver.receive(r2); - Assert.assertEquals(r2.getLength(), 500); + Assertions.assertEquals(r2.getLength(), 500); } @@ -90,7 +94,7 @@ public void testDatagramSendFail() { DatagramPacket packet1 = newDatagramPacket(size); try { sender.send(packet1); - Assert.fail("expected fail, but succeed"); + Assertions.fail("expected fail, but succeed"); } catch (IOException ignored) { } } @@ -103,7 +107,7 @@ public void testDatagramMaxSend() throws IOException { DatagramPacket r1 = newDatagramPacket(AcceptedSize); receiver.receive(r1); - Assert.assertEquals(r1.getLength(), AcceptedSize); + Assertions.assertEquals(r1.getLength(), AcceptedSize); } @@ -155,13 +159,13 @@ public void testRemoteSend() throws IOException { try { so.send(newDatagramPacket(AcceptedSize + 1)); - Assert.fail("failed"); + Assertions.fail("failed"); } catch (IOException ignored) { } try { so.send(newDatagramPacket(70000)); - Assert.fail("failed"); + Assertions.fail("failed"); } catch (IOException ignored) { } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/grpc/PingStreamContextTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/grpc/PingStreamContextTest.java index f9e9b271386a..6447408b094f 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/grpc/PingStreamContextTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/grpc/PingStreamContextTest.java @@ -17,9 +17,9 @@ package com.navercorp.pinpoint.profiler.sender.grpc; import com.google.common.util.concurrent.SettableFuture; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; @@ -29,6 +29,7 @@ */ public class PingStreamContextTest { private final Logger logger = LogManager.getLogger(this.getClass()); + @Test public void test() throws InterruptedException, ExecutionException, TimeoutException { SettableFuture future = SettableFuture.create(); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/grpc/stream/StreamExecutorTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/grpc/stream/StreamExecutorTest.java index 8eb04738830b..1c1ff7a98bd1 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/grpc/stream/StreamExecutorTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/grpc/stream/StreamExecutorTest.java @@ -17,16 +17,13 @@ package com.navercorp.pinpoint.profiler.sender.grpc.stream; import com.navercorp.pinpoint.profiler.sender.grpc.StreamId; -import org.junit.After; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; - /** * @author Woonduk Kang(emeroad) */ @@ -35,12 +32,12 @@ public class StreamExecutorTest { private ExecutorService executor = Executors.newFixedThreadPool(2); private StreamId id = StreamId.newStreamId("test"); - @Before + @BeforeEach public void setUp() throws Exception { executor = Executors.newFixedThreadPool(2); } - @After + @AfterEach public void tearDown() throws Exception { if (executor != null) { executor.shutdown(); diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/transformer/DynamicTransformServiceTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/transformer/DynamicTransformServiceTest.java index 13dc428c1420..ee06dede95bf 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/transformer/DynamicTransformServiceTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/transformer/DynamicTransformServiceTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.profiler.transformer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -25,7 +25,10 @@ import java.lang.instrument.Instrumentation; import java.lang.instrument.UnmodifiableClassException; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; /** * @author Woonduk Kang(emeroad) @@ -52,10 +55,10 @@ public Void answer(InvocationOnMock invocation) throws Throwable { try { dynamicTransformService.retransform(String.class, classFileTransformer); - Assert.fail("expected retransform fail"); + Assertions.fail("expected retransform fail"); } catch (Exception e) { } - Assert.assertEquals(listener.size(), 0); + Assertions.assertEquals(listener.size(), 0); } // @Test diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/transformer/PinpointClassFilterTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/transformer/PinpointClassFilterTest.java index 645df07a08cf..00aa3dde3b3a 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/transformer/PinpointClassFilterTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/transformer/PinpointClassFilterTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.profiler.transformer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -29,9 +29,9 @@ public void doFilter() { ClassFileFilter filter = new PinpointClassFilter(); - Assert.assertEquals(ClassFileFilter.CONTINUE, filter.accept(null, "java/test", null, null, null)); - Assert.assertEquals(ClassFileFilter.CONTINUE, filter.accept(null, "javax/test", null, null, null)); - Assert.assertEquals(ClassFileFilter.CONTINUE, filter.accept(null, "test", null, null, null)); + Assertions.assertEquals(ClassFileFilter.CONTINUE, filter.accept(null, "java/test", null, null, null)); + Assertions.assertEquals(ClassFileFilter.CONTINUE, filter.accept(null, "javax/test", null, null, null)); + Assertions.assertEquals(ClassFileFilter.CONTINUE, filter.accept(null, "test", null, null, null)); } @Test @@ -39,7 +39,7 @@ public void doFilter_Package() { ClassFileFilter filter = new PinpointClassFilter(); - Assert.assertEquals(ClassFileFilter.SKIP, filter.accept(null, "com/navercorp/pinpoint/", null, null, null)); + Assertions.assertEquals(ClassFileFilter.SKIP, filter.accept(null, "com/navercorp/pinpoint/", null, null, null)); } @Test @@ -47,7 +47,7 @@ public void doFilter_Package_exclude() { ClassFileFilter filter = new PinpointClassFilter(); - Assert.assertEquals(ClassFileFilter.CONTINUE, filter.accept(null, "com/navercorp/pinpoint/web/", null, null, null)); + Assertions.assertEquals(ClassFileFilter.CONTINUE, filter.accept(null, "com/navercorp/pinpoint/web/", null, null, null)); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/transformer/PinpointClassLoaderFilterTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/transformer/PinpointClassLoaderFilterTest.java index 415b654cb262..4d642c054466 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/transformer/PinpointClassLoaderFilterTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/transformer/PinpointClassLoaderFilterTest.java @@ -17,8 +17,8 @@ package com.navercorp.pinpoint.profiler.transformer; import com.navercorp.pinpoint.common.util.ClassLoaderUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.URL; import java.net.URLClassLoader; @@ -35,11 +35,11 @@ public void testDoFilter_ClassLoader() { final URLClassLoader agentClassLoader = new URLClassLoader(new URL[0]); ClassFileFilter filter = new PinpointClassLoaderFilter(agentClassLoader); - Assert.assertSame("bootstrap test", filter.accept(null, "test", null, null, null), ClassFileFilter.CONTINUE); + Assertions.assertSame(filter.accept(null, "test", null, null, null), ClassFileFilter.CONTINUE, "bootstrap test"); final ClassLoader defaultClassLoader = ClassLoaderUtils.getDefaultClassLoader(); - Assert.assertSame(filter.accept(defaultClassLoader, "test", null, null, null), ClassFileFilter.CONTINUE); + Assertions.assertSame(filter.accept(defaultClassLoader, "test", null, null, null), ClassFileFilter.CONTINUE); - Assert.assertSame(filter.accept(agentClassLoader, "test", null, null, null), ClassFileFilter.SKIP); + Assertions.assertSame(filter.accept(agentClassLoader, "test", null, null, null), ClassFileFilter.SKIP); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/transformer/UnmodifiableClassFilterTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/transformer/UnmodifiableClassFilterTest.java index 2ac31575abf1..c3703ae30869 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/transformer/UnmodifiableClassFilterTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/transformer/UnmodifiableClassFilterTest.java @@ -16,9 +16,8 @@ package com.navercorp.pinpoint.profiler.transformer; -import org.junit.Assert; - -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.URL; import java.net.URLClassLoader; @@ -30,13 +29,13 @@ public class UnmodifiableClassFilterTest { public void testDoFilter_Package() { ClassFileFilter filter = new UnmodifiableClassFilter(); - Assert.assertSame(filter.accept(null, "java/test", null, null, null), ClassFileFilter.SKIP); - Assert.assertSame(filter.accept(null, "javax/test", null, null, null), ClassFileFilter.SKIP); + Assertions.assertSame(filter.accept(null, "java/test", null, null, null), ClassFileFilter.SKIP); + Assertions.assertSame(filter.accept(null, "javax/test", null, null, null), ClassFileFilter.SKIP); - Assert.assertSame(filter.accept(null, "com/navercorp/pinpoint/", null, null, null), ClassFileFilter.CONTINUE); + Assertions.assertSame(filter.accept(null, "com/navercorp/pinpoint/", null, null, null), ClassFileFilter.CONTINUE); - Assert.assertSame(filter.accept(null, "test", null, null, null), ClassFileFilter.CONTINUE); + Assertions.assertSame(filter.accept(null, "test", null, null, null), ClassFileFilter.CONTINUE); } @@ -44,9 +43,9 @@ public void testDoFilter_Package() { public void testDoFilter_ClassLoader() { ClassFileFilter filter = new UnmodifiableClassFilter(); - Assert.assertSame(filter.accept(this.getClass().getClassLoader(), "test", null, null, null), ClassFileFilter.CONTINUE); + Assertions.assertSame(filter.accept(this.getClass().getClassLoader(), "test", null, null, null), ClassFileFilter.CONTINUE); URLClassLoader classLoader = new URLClassLoader(new URL[]{}); - Assert.assertSame(filter.accept(classLoader, "test", null, null, null), ClassFileFilter.CONTINUE); + Assertions.assertSame(filter.accept(classLoader, "test", null, null, null), ClassFileFilter.CONTINUE); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/BytecodeUtilsTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/BytecodeUtilsTest.java index dbd8ffe9f19a..67b564dc486e 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/BytecodeUtilsTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/BytecodeUtilsTest.java @@ -17,11 +17,8 @@ package com.navercorp.pinpoint.profiler.util; -import org.junit.Assert; - -import org.junit.Test; - - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class BytecodeUtilsTest { @@ -41,6 +38,6 @@ public void testGetClassFile_SystemClassLoader() { // SystemClassLoader class Class stringClass = String.class; byte[] stringClassBytes = BytecodeUtils.getClassFile(stringClass.getClassLoader(), stringClass.getName()); - Assert.assertNotNull(stringClassBytes); + Assertions.assertNotNull(stringClassBytes); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/DefaultScopeTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/DefaultScopeTest.java index f58202b7508e..77845ae07691 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/DefaultScopeTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/DefaultScopeTest.java @@ -16,67 +16,69 @@ package com.navercorp.pinpoint.profiler.util; -import static org.junit.Assert.*; - +import com.navercorp.pinpoint.bootstrap.interceptor.scope.ExecutionPolicy; import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScopeInvocation; import com.navercorp.pinpoint.profiler.interceptor.scope.DefaultInterceptorScopeInvocation; -import org.junit.Test; - -import com.navercorp.pinpoint.bootstrap.interceptor.scope.ExecutionPolicy; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; public class DefaultScopeTest { @Test public void test0() { InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); - + assertFalse(transaction.isActive()); - + assertFalse(transaction.tryEnter(ExecutionPolicy.INTERNAL)); assertFalse(transaction.isActive()); - + assertTrue(transaction.tryEnter(ExecutionPolicy.BOUNDARY)); assertTrue(transaction.isActive()); - + assertTrue(transaction.tryEnter(ExecutionPolicy.INTERNAL)); assertTrue(transaction.isActive()); - + assertFalse(transaction.tryEnter(ExecutionPolicy.BOUNDARY)); assertTrue(transaction.isActive()); - + assertFalse(transaction.canLeave(ExecutionPolicy.BOUNDARY)); assertTrue(transaction.isActive()); - + assertTrue(transaction.canLeave(ExecutionPolicy.INTERNAL)); transaction.leave(ExecutionPolicy.INTERNAL); assertTrue(transaction.isActive()); - + assertTrue(transaction.canLeave(ExecutionPolicy.BOUNDARY)); assertTrue(transaction.isActive()); transaction.leave(ExecutionPolicy.BOUNDARY); assertFalse(transaction.isActive()); - + assertFalse(transaction.canLeave(ExecutionPolicy.INTERNAL)); assertFalse(transaction.isActive()); } - + @Test public void test1() { InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); - + assertFalse(transaction.isActive()); - + assertTrue(transaction.tryEnter(ExecutionPolicy.ALWAYS)); assertTrue(transaction.isActive()); - + assertTrue(transaction.tryEnter(ExecutionPolicy.ALWAYS)); assertTrue(transaction.isActive()); - + assertTrue(transaction.canLeave(ExecutionPolicy.ALWAYS)); assertTrue(transaction.isActive()); transaction.leave(ExecutionPolicy.ALWAYS); assertTrue(transaction.isActive()); - + assertTrue(transaction.canLeave(ExecutionPolicy.ALWAYS)); assertTrue(transaction.isActive()); transaction.leave(ExecutionPolicy.ALWAYS); @@ -87,10 +89,10 @@ public void test1() { public void testAttachment() { String attachment = "context"; InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); - + transaction.tryEnter(ExecutionPolicy.ALWAYS); assertNull(transaction.getAttachment()); - + transaction.setAttachment(attachment); assertSame(transaction.getAttachment(), attachment); @@ -100,7 +102,7 @@ public void testAttachment() { transaction.canLeave(ExecutionPolicy.ALWAYS); transaction.leave(ExecutionPolicy.ALWAYS); assertSame(transaction.getAttachment(), attachment); - + transaction.canLeave(ExecutionPolicy.ALWAYS); transaction.leave(ExecutionPolicy.ALWAYS); } @@ -121,7 +123,7 @@ public void testAttachment2() { transaction.canLeave(ExecutionPolicy.ALWAYS); transaction.leave(ExecutionPolicy.ALWAYS); } - + @Test public void testAttachment3() { String oldAttachment = "context"; @@ -138,73 +140,91 @@ public void testAttachment3() { transaction.canLeave(ExecutionPolicy.ALWAYS); transaction.leave(ExecutionPolicy.ALWAYS); } - - @Test(expected=IllegalStateException.class) + + @Test public void testSetAttachmentFail() { - InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); - transaction.setAttachment("attachment"); + Assertions.assertThrows(IllegalStateException.class, () -> { + InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); + transaction.setAttachment("attachment"); + }); } - - @Test(expected=IllegalStateException.class) + + @Test public void testSetAttachmentFail2() { - InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); + Assertions.assertThrows(IllegalStateException.class, () -> { + InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); - transaction.tryEnter(ExecutionPolicy.ALWAYS); - transaction.canLeave(ExecutionPolicy.ALWAYS); - transaction.leave(ExecutionPolicy.ALWAYS); + transaction.tryEnter(ExecutionPolicy.ALWAYS); + transaction.canLeave(ExecutionPolicy.ALWAYS); + transaction.leave(ExecutionPolicy.ALWAYS); - transaction.setAttachment("attachment"); + transaction.setAttachment("attachment"); + }); } - - @Test(expected=IllegalStateException.class) + + @Test public void testGetAttachmentFail() { - InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); - transaction.getAttachment(); + Assertions.assertThrows(IllegalStateException.class, () -> { + InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); + transaction.getAttachment(); + }); } - - @Test(expected=IllegalStateException.class) + + @Test public void testGetAttachmentFail2() { - InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); + Assertions.assertThrows(IllegalStateException.class, () -> { + InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); - transaction.tryEnter(ExecutionPolicy.ALWAYS); - transaction.canLeave(ExecutionPolicy.ALWAYS); - transaction.leave(ExecutionPolicy.ALWAYS); + transaction.tryEnter(ExecutionPolicy.ALWAYS); + transaction.canLeave(ExecutionPolicy.ALWAYS); + transaction.leave(ExecutionPolicy.ALWAYS); - transaction.getAttachment(); + transaction.getAttachment(); + }); } - - @Test(expected=IllegalStateException.class) + + @Test public void testRemoveAttachmentFail() { - InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); - transaction.removeAttachment(); + Assertions.assertThrows(IllegalStateException.class, () -> { + InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); + transaction.removeAttachment(); + }); } - - @Test(expected=IllegalStateException.class) + + @Test public void testRemoveAttachmentFail2() { - InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); + Assertions.assertThrows(IllegalStateException.class, () -> { + InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); - transaction.tryEnter(ExecutionPolicy.ALWAYS); - transaction.canLeave(ExecutionPolicy.ALWAYS); - transaction.leave(ExecutionPolicy.ALWAYS); + transaction.tryEnter(ExecutionPolicy.ALWAYS); + transaction.canLeave(ExecutionPolicy.ALWAYS); + transaction.leave(ExecutionPolicy.ALWAYS); - transaction.removeAttachment(); + transaction.removeAttachment(); + }); } - - @Test(expected=IllegalStateException.class) + + @Test public void testAfterWithoutBefore() { - InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); - transaction.leave(ExecutionPolicy.ALWAYS); + Assertions.assertThrows(IllegalStateException.class, () -> { + InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); + transaction.leave(ExecutionPolicy.ALWAYS); + }); } - - @Test(expected=IllegalStateException.class) + + @Test public void testAfterWithoutBefore2() { - InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); - transaction.leave(ExecutionPolicy.BOUNDARY); + Assertions.assertThrows(IllegalStateException.class, () -> { + InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); + transaction.leave(ExecutionPolicy.BOUNDARY); + }); } - - @Test(expected=IllegalStateException.class) + + @Test public void testAfterWithoutBefore3() { - InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); - transaction.leave(ExecutionPolicy.INTERNAL); + Assertions.assertThrows(IllegalStateException.class, () -> { + InterceptorScopeInvocation transaction = new DefaultInterceptorScopeInvocation("test"); + transaction.leave(ExecutionPolicy.INTERNAL); + }); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/JarReaderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/JarReaderTest.java index 558c0bae0440..11461fb263f3 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/JarReaderTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/JarReaderTest.java @@ -19,12 +19,12 @@ import com.navercorp.pinpoint.common.util.CodeSourceUtils; import org.apache.commons.lang.CharRange; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.URL; import java.util.List; @@ -59,7 +59,7 @@ public void getInputStream() throws Exception { JarFile jarFile = new JarFile(location.getPath()); JarReader jarReader = new JarReader(jarFile); - Assert.assertNotNull(jarReader.getInputStream("org/apache/commons/lang/CharRange.class")); - Assert.assertNull(jarReader.getInputStream("org/apache/commons/lang/NotFound.class")); + Assertions.assertNotNull(jarReader.getInputStream("org/apache/commons/lang/CharRange.class")); + Assertions.assertNull(jarReader.getInputStream("org/apache/commons/lang/NotFound.class")); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/JavaAssistUtilsTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/JavaAssistUtilsTest.java index 28d85caed032..ddb4a9864410 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/JavaAssistUtilsTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/JavaAssistUtilsTest.java @@ -16,10 +16,10 @@ package com.navercorp.pinpoint.profiler.util; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -37,49 +37,49 @@ public class JavaAssistUtilsTest { @Test public void javaArraySize() { - Assert.assertEquals(0, JavaAssistUtils.getJavaObjectArraySize("")); - Assert.assertEquals(1, JavaAssistUtils.getJavaObjectArraySize("[]")); - Assert.assertEquals(3, JavaAssistUtils.getJavaObjectArraySize("[][][]")); + Assertions.assertEquals(0, JavaAssistUtils.getJavaObjectArraySize("")); + Assertions.assertEquals(1, JavaAssistUtils.getJavaObjectArraySize("[]")); + Assertions.assertEquals(3, JavaAssistUtils.getJavaObjectArraySize("[][][]")); - Assert.assertEquals(0, JavaAssistUtils.getJavaObjectArraySize("int")); - Assert.assertEquals(1, JavaAssistUtils.getJavaObjectArraySize("int[]")); - Assert.assertEquals(3, JavaAssistUtils.getJavaObjectArraySize("int[][][]")); + Assertions.assertEquals(0, JavaAssistUtils.getJavaObjectArraySize("int")); + Assertions.assertEquals(1, JavaAssistUtils.getJavaObjectArraySize("int[]")); + Assertions.assertEquals(3, JavaAssistUtils.getJavaObjectArraySize("int[][][]")); - Assert.assertEquals(0, JavaAssistUtils.getJavaObjectArraySize("java.lang.String")); - Assert.assertEquals(2, JavaAssistUtils.getJavaObjectArraySize("java.lang.String[][]")); + Assertions.assertEquals(0, JavaAssistUtils.getJavaObjectArraySize("java.lang.String")); + Assertions.assertEquals(2, JavaAssistUtils.getJavaObjectArraySize("java.lang.String[][]")); } @Test public void javaArraySize_invalid() { - Assert.assertEquals(2, JavaAssistUtils.getJavaObjectArraySize("[]test[][]")); + Assertions.assertEquals(2, JavaAssistUtils.getJavaObjectArraySize("[]test[][]")); } @Test public void javaClassNameToObjectName() { // primitives - Assert.assertEquals("boolean", JavaAssistUtils.javaClassNameToObjectName(boolean.class.getName())); - Assert.assertEquals("byte", JavaAssistUtils.javaClassNameToObjectName(byte.class.getName())); - Assert.assertEquals("char", JavaAssistUtils.javaClassNameToObjectName(char.class.getName())); - Assert.assertEquals("double", JavaAssistUtils.javaClassNameToObjectName(double.class.getName())); - Assert.assertEquals("float", JavaAssistUtils.javaClassNameToObjectName(float.class.getName())); - Assert.assertEquals("int", JavaAssistUtils.javaClassNameToObjectName(int.class.getName())); - Assert.assertEquals("short", JavaAssistUtils.javaClassNameToObjectName(short.class.getName())); + Assertions.assertEquals("boolean", JavaAssistUtils.javaClassNameToObjectName(boolean.class.getName())); + Assertions.assertEquals("byte", JavaAssistUtils.javaClassNameToObjectName(byte.class.getName())); + Assertions.assertEquals("char", JavaAssistUtils.javaClassNameToObjectName(char.class.getName())); + Assertions.assertEquals("double", JavaAssistUtils.javaClassNameToObjectName(double.class.getName())); + Assertions.assertEquals("float", JavaAssistUtils.javaClassNameToObjectName(float.class.getName())); + Assertions.assertEquals("int", JavaAssistUtils.javaClassNameToObjectName(int.class.getName())); + Assertions.assertEquals("short", JavaAssistUtils.javaClassNameToObjectName(short.class.getName())); // wrappers - Assert.assertEquals("java.lang.Integer", JavaAssistUtils.javaClassNameToObjectName(Integer.class.getName())); - Assert.assertEquals("java.lang.String", JavaAssistUtils.javaClassNameToObjectName(String.class.getName())); + Assertions.assertEquals("java.lang.Integer", JavaAssistUtils.javaClassNameToObjectName(Integer.class.getName())); + Assertions.assertEquals("java.lang.String", JavaAssistUtils.javaClassNameToObjectName(String.class.getName())); // classes - Assert.assertEquals("java.util.List", JavaAssistUtils.javaClassNameToObjectName(List.class.getName())); - Assert.assertEquals("java.util.ArrayList", JavaAssistUtils.javaClassNameToObjectName(new ArrayList().getClass().getName())); + Assertions.assertEquals("java.util.List", JavaAssistUtils.javaClassNameToObjectName(List.class.getName())); + Assertions.assertEquals("java.util.ArrayList", JavaAssistUtils.javaClassNameToObjectName(new ArrayList().getClass().getName())); // arrays - Assert.assertEquals("boolean[]", JavaAssistUtils.javaClassNameToObjectName(boolean[].class.getName())); - Assert.assertEquals("byte[]", JavaAssistUtils.javaClassNameToObjectName(byte[].class.getName())); - Assert.assertEquals("java.lang.String[]", JavaAssistUtils.javaClassNameToObjectName(String[].class.getName())); + Assertions.assertEquals("boolean[]", JavaAssistUtils.javaClassNameToObjectName(boolean[].class.getName())); + Assertions.assertEquals("byte[]", JavaAssistUtils.javaClassNameToObjectName(byte[].class.getName())); + Assertions.assertEquals("java.lang.String[]", JavaAssistUtils.javaClassNameToObjectName(String[].class.getName())); // inner/nested classes - Assert.assertEquals( + Assertions.assertEquals( this.getClass().getName() + "$1", JavaAssistUtils.javaClassNameToObjectName(new Comparable() { @Override @@ -94,106 +94,106 @@ public int compareTo(Long o) { } } SomeComparable inner = new SomeComparable(); - Assert.assertEquals( + Assertions.assertEquals( this.getClass().getName() + "$1SomeComparable", JavaAssistUtils.javaClassNameToObjectName(inner.getClass().getName())); // assume nothing else is defined in this class - Assert.assertEquals( + Assertions.assertEquals( this.getClass().getName() + "$1SomeComparable[]", - JavaAssistUtils.javaClassNameToObjectName(new SomeComparable[] {inner}.getClass().getName())); - Assert.assertEquals("java.util.Map$Entry", JavaAssistUtils.javaClassNameToObjectName(Map.Entry.class.getName())); - Assert.assertEquals("java.util.Map$Entry[]", JavaAssistUtils.javaClassNameToObjectName(Map.Entry[].class.getName())); + JavaAssistUtils.javaClassNameToObjectName(new SomeComparable[]{inner}.getClass().getName())); + Assertions.assertEquals("java.util.Map$Entry", JavaAssistUtils.javaClassNameToObjectName(Map.Entry.class.getName())); + Assertions.assertEquals("java.util.Map$Entry[]", JavaAssistUtils.javaClassNameToObjectName(Map.Entry[].class.getName())); } @Test public void toJvmSignature() { - Assert.assertEquals(JavaAssistUtils.toJvmSignature("int"), "I"); - Assert.assertEquals(JavaAssistUtils.toJvmSignature("int[]"), "[I"); - Assert.assertEquals(JavaAssistUtils.toJvmSignature("int[][][]"), "[[[I"); + Assertions.assertEquals(JavaAssistUtils.toJvmSignature("int"), "I"); + Assertions.assertEquals(JavaAssistUtils.toJvmSignature("int[]"), "[I"); + Assertions.assertEquals(JavaAssistUtils.toJvmSignature("int[][][]"), "[[[I"); - Assert.assertEquals(JavaAssistUtils.toJvmSignature("void"), "V"); + Assertions.assertEquals(JavaAssistUtils.toJvmSignature("void"), "V"); - Assert.assertEquals(JavaAssistUtils.toJvmSignature("java.lang.String"), "Ljava/lang/String;"); - Assert.assertEquals(JavaAssistUtils.toJvmSignature("java.lang.String[][]"), "[[Ljava/lang/String;"); + Assertions.assertEquals(JavaAssistUtils.toJvmSignature("java.lang.String"), "Ljava/lang/String;"); + Assertions.assertEquals(JavaAssistUtils.toJvmSignature("java.lang.String[][]"), "[[Ljava/lang/String;"); try { - Assert.assertEquals(JavaAssistUtils.toJvmSignature(""), ""); - Assert.fail("empty string"); + Assertions.assertEquals(JavaAssistUtils.toJvmSignature(""), ""); + Assertions.fail("empty string"); } catch (Exception ignored) { } try { - Assert.assertEquals(JavaAssistUtils.toJvmSignature(null), null); - Assert.fail("null"); + Assertions.assertEquals(JavaAssistUtils.toJvmSignature(null), null); + Assertions.fail("null"); } catch (Exception ignored) { } } @Test - public void javaTypeToJvmSignature() { - Assert.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{}), "()"); + public void javaTypeToJvmSignature() { + Assertions.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{}), "()"); - Assert.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"int"}), "(I)"); - Assert.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"int", "double"}), "(ID)"); - Assert.assertEquals(JavaAssistUtils.javaTypeToJvmSignature( new String[]{"byte", "float", "short"}), "(BFS)"); + Assertions.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"int"}), "(I)"); + Assertions.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"int", "double"}), "(ID)"); + Assertions.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"byte", "float", "short"}), "(BFS)"); - Assert.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"java.lang.String"}), "(Ljava/lang/String;)"); - Assert.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"java.lang.String", "long"}), "(Ljava/lang/String;J)"); + Assertions.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"java.lang.String"}), "(Ljava/lang/String;)"); + Assertions.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"java.lang.String", "long"}), "(Ljava/lang/String;J)"); - Assert.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"long", "java.lang.Object", "boolean"}), "(JLjava/lang/Object;Z)"); - Assert.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"char", "long", "java.lang.Object", "boolean"}), "(CJLjava/lang/Object;Z)"); + Assertions.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"long", "java.lang.Object", "boolean"}), "(JLjava/lang/Object;Z)"); + Assertions.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"char", "long", "java.lang.Object", "boolean"}), "(CJLjava/lang/Object;Z)"); } @Test public void javaTypeToJvmSignatureReturnType() { - Assert.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{}, "void"), "()V"); + Assertions.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{}, "void"), "()V"); - Assert.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"int"}, "int"), "(I)I"); - Assert.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"int", "double"}, "double"), "(ID)D"); - Assert.assertEquals(JavaAssistUtils.javaTypeToJvmSignature( new String[]{"byte", "float", "short"}, "float"), "(BFS)F"); + Assertions.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"int"}, "int"), "(I)I"); + Assertions.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"int", "double"}, "double"), "(ID)D"); + Assertions.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"byte", "float", "short"}, "float"), "(BFS)F"); - Assert.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"java.lang.String"}, "java.lang.String"), "(Ljava/lang/String;)Ljava/lang/String;"); - Assert.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"java.lang.String", "long"}, "long"), "(Ljava/lang/String;J)J"); + Assertions.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"java.lang.String"}, "java.lang.String"), "(Ljava/lang/String;)Ljava/lang/String;"); + Assertions.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"java.lang.String", "long"}, "long"), "(Ljava/lang/String;J)J"); - Assert.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"long", "java.lang.Object", "boolean"}, "boolean"), "(JLjava/lang/Object;Z)Z"); - Assert.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"char", "long", "java.lang.Object", "boolean"}, "java.lang.Object"), "(CJLjava/lang/Object;Z)Ljava/lang/Object;"); + Assertions.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"long", "java.lang.Object", "boolean"}, "boolean"), "(JLjava/lang/Object;Z)Z"); + Assertions.assertEquals(JavaAssistUtils.javaTypeToJvmSignature(new String[]{"char", "long", "java.lang.Object", "boolean"}, "java.lang.Object"), "(CJLjava/lang/Object;Z)Ljava/lang/Object;"); } @Test public void testParseParameterDescriptor() throws Exception { - Assert.assertArrayEquals(JavaAssistUtils.parseParameterSignature("()V"), new String[]{}); + Assertions.assertArrayEquals(JavaAssistUtils.parseParameterSignature("()V"), new String[]{}); - Assert.assertArrayEquals(JavaAssistUtils.parseParameterSignature("(I)I"), new String[]{"int"}); - Assert.assertArrayEquals(JavaAssistUtils.parseParameterSignature("(ID)I"), new String[]{"int", "double"}); - Assert.assertArrayEquals(JavaAssistUtils.parseParameterSignature("(BFS)I"), new String[]{"byte", "float", "short"}); + Assertions.assertArrayEquals(JavaAssistUtils.parseParameterSignature("(I)I"), new String[]{"int"}); + Assertions.assertArrayEquals(JavaAssistUtils.parseParameterSignature("(ID)I"), new String[]{"int", "double"}); + Assertions.assertArrayEquals(JavaAssistUtils.parseParameterSignature("(BFS)I"), new String[]{"byte", "float", "short"}); - Assert.assertArrayEquals(JavaAssistUtils.parseParameterSignature("(Ljava/lang/String;)I"), new String[]{"java.lang.String"}); - Assert.assertArrayEquals(JavaAssistUtils.parseParameterSignature("(Ljava/lang/String;J)I"), new String[]{"java.lang.String", "long"}); + Assertions.assertArrayEquals(JavaAssistUtils.parseParameterSignature("(Ljava/lang/String;)I"), new String[]{"java.lang.String"}); + Assertions.assertArrayEquals(JavaAssistUtils.parseParameterSignature("(Ljava/lang/String;J)I"), new String[]{"java.lang.String", "long"}); - Assert.assertArrayEquals(JavaAssistUtils.parseParameterSignature("(JLjava/lang/Object;Z)I"), new String[]{"long", "java.lang.Object", "boolean"}); - Assert.assertArrayEquals(JavaAssistUtils.parseParameterSignature("(CJLjava/lang/Object;Z)I"), new String[]{"char", "long", "java.lang.Object", "boolean"}); + Assertions.assertArrayEquals(JavaAssistUtils.parseParameterSignature("(JLjava/lang/Object;Z)I"), new String[]{"long", "java.lang.Object", "boolean"}); + Assertions.assertArrayEquals(JavaAssistUtils.parseParameterSignature("(CJLjava/lang/Object;Z)I"), new String[]{"char", "long", "java.lang.Object", "boolean"}); } @Test public void testParseParameterDescriptor_array() throws Exception { - Assert.assertArrayEquals(JavaAssistUtils.parseParameterSignature("([I)I"), new String[]{"int[]"}); - Assert.assertArrayEquals(JavaAssistUtils.parseParameterSignature("([IJ)I"), new String[]{"int[]", "long"}); - Assert.assertArrayEquals(JavaAssistUtils.parseParameterSignature("([J[I)I"), new String[]{"long[]", "int[]"}); + Assertions.assertArrayEquals(JavaAssistUtils.parseParameterSignature("([I)I"), new String[]{"int[]"}); + Assertions.assertArrayEquals(JavaAssistUtils.parseParameterSignature("([IJ)I"), new String[]{"int[]", "long"}); + Assertions.assertArrayEquals(JavaAssistUtils.parseParameterSignature("([J[I)I"), new String[]{"long[]", "int[]"}); - Assert.assertArrayEquals(JavaAssistUtils.parseParameterSignature("([Ljava/lang/String;)"), new String[]{"java.lang.String[]"}); + Assertions.assertArrayEquals(JavaAssistUtils.parseParameterSignature("([Ljava/lang/String;)"), new String[]{"java.lang.String[]"}); - Assert.assertArrayEquals(JavaAssistUtils.parseParameterSignature("(Ljava/lang/String;[[J)"), new String[]{"java.lang.String", "long[][]"}); - Assert.assertArrayEquals(JavaAssistUtils.parseParameterSignature("(Ljava/lang/Object;[[Ljava/lang/String;)"), new String[]{"java.lang.Object", "java.lang.String[][]"}); + Assertions.assertArrayEquals(JavaAssistUtils.parseParameterSignature("(Ljava/lang/String;[[J)"), new String[]{"java.lang.String", "long[][]"}); + Assertions.assertArrayEquals(JavaAssistUtils.parseParameterSignature("(Ljava/lang/Object;[[Ljava/lang/String;)"), new String[]{"java.lang.Object", "java.lang.String[][]"}); - Assert.assertArrayEquals(JavaAssistUtils.parseParameterSignature("([[[Ljava/lang/String;)"), new String[]{"java.lang.String[][][]"}); + Assertions.assertArrayEquals(JavaAssistUtils.parseParameterSignature("([[[Ljava/lang/String;)"), new String[]{"java.lang.String[][][]"}); - Assert.assertArrayEquals(JavaAssistUtils.parseParameterSignature("([[[I)"), new String[]{"int[][][]"}); + Assertions.assertArrayEquals(JavaAssistUtils.parseParameterSignature("([[[I)"), new String[]{"int[][][]"}); } @@ -201,63 +201,63 @@ public void testParseParameterDescriptor_array() throws Exception { public void testGetParameterDescription2() throws Exception { @SuppressWarnings("deprecation") String clsDescription = JavaAssistUtils.getParameterDescription(new Class[]{String.class, Integer.class}); - Assert.assertEquals("(java.lang.String, java.lang.Integer)", clsDescription); + Assertions.assertEquals("(java.lang.String, java.lang.Integer)", clsDescription); } @Test public void testJavaClassNameToJvmResourceName1() throws Exception { - Assert.assertEquals("java/lang/String.class", JavaAssistUtils.javaClassNameToJvmResourceName("java.lang.String")); + Assertions.assertEquals("java/lang/String.class", JavaAssistUtils.javaClassNameToJvmResourceName("java.lang.String")); } @Test public void testJavaClassNameToJvmResourceName2() throws Exception { - Assert.assertEquals("java/lang/String.class", JavaAssistUtils.javaClassNameToJvmResourceName("java/lang/String")); + Assertions.assertEquals("java/lang/String.class", JavaAssistUtils.javaClassNameToJvmResourceName("java/lang/String")); } @Test public void testToPinpointParameterType() { int[][] stringArray = new int[0][0]; String parameterType = JavaAssistUtils.toPinpointParameterType(stringArray.getClass()); - Assert.assertEquals("int[][]", parameterType); + Assertions.assertEquals("int[][]", parameterType); } @Test public void javaClassNameToVariableName1() { String variableName = JavaAssistUtils.javaClassNameToVariableName("Test$CgLib"); - Assert.assertEquals("Test_CgLib", variableName); + Assertions.assertEquals("Test_CgLib", variableName); } @Test public void javaClassNameToVariableName2() { String variableName = JavaAssistUtils.javaClassNameToVariableName("Test$$CgLib"); - Assert.assertEquals("Test__CgLib", variableName); + Assertions.assertEquals("Test__CgLib", variableName); } @Test public void javaClassNameToVariableName3() { String variableName = JavaAssistUtils.javaClassNameToVariableName("Test$"); - Assert.assertEquals("Test_", variableName); + Assertions.assertEquals("Test_", variableName); } @Test public void javaClassNameToVariableName_same_ref() { String className = "Test"; String variableName = JavaAssistUtils.javaClassNameToVariableName(className); - Assert.assertSame(className, variableName); + Assertions.assertSame(className, variableName); } @Test public void getParameterDescription() { String[] parameters = {"a", "b"}; String variableName = JavaAssistUtils.getParameterDescription(parameters); - Assert.assertEquals("(a, b)", variableName); + Assertions.assertEquals("(a, b)", variableName); } @Test public void getParameterDescription_single() { String[] parameters = {"a"}; String variableName = JavaAssistUtils.getParameterDescription(parameters); - Assert.assertEquals("(a)", variableName); + Assertions.assertEquals("(a)", variableName); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/NameValueListTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/NameValueListTest.java index 7a138564761d..5051e7a958bb 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/NameValueListTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/NameValueListTest.java @@ -14,9 +14,9 @@ */ package com.navercorp.pinpoint.profiler.util; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author poap @@ -24,7 +24,7 @@ public class NameValueListTest { private NameValueList list; - @Before + @BeforeEach public void beforeTest() { list = new NameValueList<>(); list.add("one", 1); @@ -34,41 +34,41 @@ public void beforeTest() { @Test public void add() { - Assert.assertEquals(list.add("one", 11).intValue(), 1); - Assert.assertEquals(list.add("two", 22).intValue(), 2); - Assert.assertEquals(list.add("three", 33).intValue(), 3); - Assert.assertNull(list.add("four", 4)); - Assert.assertEquals(list.add("one", 111).intValue(), 11); - Assert.assertEquals(list.add("two", 222).intValue(), 22); - Assert.assertEquals(list.add("three", 333).intValue(), 33); - Assert.assertEquals(list.add("four", 44).intValue(), 4); - Assert.assertNull(list.add("five", 5)); + Assertions.assertEquals(list.add("one", 11).intValue(), 1); + Assertions.assertEquals(list.add("two", 22).intValue(), 2); + Assertions.assertEquals(list.add("three", 33).intValue(), 3); + Assertions.assertNull(list.add("four", 4)); + Assertions.assertEquals(list.add("one", 111).intValue(), 11); + Assertions.assertEquals(list.add("two", 222).intValue(), 22); + Assertions.assertEquals(list.add("three", 333).intValue(), 33); + Assertions.assertEquals(list.add("four", 44).intValue(), 4); + Assertions.assertNull(list.add("five", 5)); } @Test public void get() { - Assert.assertEquals(list.get("one").intValue(), 1); - Assert.assertEquals(list.get("two").intValue(), 2); - Assert.assertEquals(list.get("three").intValue(), 3); - Assert.assertNull(list.get("four")); + Assertions.assertEquals(list.get("one").intValue(), 1); + Assertions.assertEquals(list.get("two").intValue(), 2); + Assertions.assertEquals(list.get("three").intValue(), 3); + Assertions.assertNull(list.get("four")); } @Test public void remove() { - Assert.assertEquals(list.remove("one").intValue(), 1); - Assert.assertEquals(list.remove("two").intValue(), 2); - Assert.assertEquals(list.remove("three").intValue(), 3); - Assert.assertNull(list.remove("four")); - Assert.assertNull(list.remove("three")); - Assert.assertNull(list.remove("two")); - Assert.assertNull(list.remove("four")); + Assertions.assertEquals(list.remove("one").intValue(), 1); + Assertions.assertEquals(list.remove("two").intValue(), 2); + Assertions.assertEquals(list.remove("three").intValue(), 3); + Assertions.assertNull(list.remove("four")); + Assertions.assertNull(list.remove("three")); + Assertions.assertNull(list.remove("two")); + Assertions.assertNull(list.remove("four")); } @Test public void clear() { list.clear(); - Assert.assertNull(list.get("one")); - Assert.assertNull(list.get("two")); - Assert.assertNull(list.get("three")); + Assertions.assertNull(list.get("one")); + Assertions.assertNull(list.get("two")); + Assertions.assertNull(list.get("three")); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/PropertyRollbackTemplateTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/PropertyRollbackTemplateTest.java index a4ddaf41d40f..e66ad24fb673 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/PropertyRollbackTemplateTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/PropertyRollbackTemplateTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.profiler.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -39,7 +39,7 @@ public void run() { } }); - Assert.assertTrue(properties.isEmpty()); + Assertions.assertTrue(properties.isEmpty()); } @Test @@ -56,7 +56,7 @@ public void run() { } }); - Assert.assertEquals(properties.get("a"), "A"); + Assertions.assertEquals(properties.get("a"), "A"); } @Test @@ -72,6 +72,6 @@ public void run() { } }); - Assert.assertNull(properties.get("a")); + Assertions.assertNull(properties.get("a")); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/QueryStringUtilTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/QueryStringUtilTest.java index 8c8868d20df1..6490fd80e22f 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/QueryStringUtilTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/QueryStringUtilTest.java @@ -16,9 +16,8 @@ package com.navercorp.pinpoint.profiler.util; -import org.junit.Assert; -import org.junit.Test; - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -28,7 +27,7 @@ public class QueryStringUtilTest { public void testRemoveAllMultiSpace() throws Exception { String s = QueryStringUtil.removeAllMultiSpace("a b"); - Assert.assertEquals("a b", s); + Assertions.assertEquals("a b", s); } @Test @@ -36,16 +35,16 @@ public void testRemoveCarriageReturn() { String testStr; // single carriage return testStr = "\r"; - Assert.assertEquals(" ", QueryStringUtil.removeCarriageReturn(testStr)); + Assertions.assertEquals(" ", QueryStringUtil.removeCarriageReturn(testStr)); // single line feed testStr = "\n"; - Assert.assertEquals(" ", QueryStringUtil.removeCarriageReturn(testStr)); + Assertions.assertEquals(" ", QueryStringUtil.removeCarriageReturn(testStr)); // combined CRLF testStr = "\r\r\n\n\r\r\n"; - Assert.assertEquals(" ", QueryStringUtil.removeCarriageReturn(testStr)); + Assertions.assertEquals(" ", QueryStringUtil.removeCarriageReturn(testStr)); // random string CRLF -> space testStr = "this is awesome CRs\r\rand awesome LFs\n\nwhat if we combine it?\r\n\r\n\r\nwow\r\nso standard\n\rmuch naver\n"; - Assert.assertEquals("this is awesome CRs and awesome LFs what if we combine it? wow so standard much naver ", QueryStringUtil.removeCarriageReturn(testStr)); + Assertions.assertEquals("this is awesome CRs and awesome LFs what if we combine it? wow so standard much naver ", QueryStringUtil.removeCarriageReturn(testStr)); } @Test @@ -53,15 +52,15 @@ public void testRemoveAllMultiSpace2() { String testStr; // single spaces testStr = " "; - Assert.assertEquals(" ", QueryStringUtil.removeAllMultiSpace(testStr)); + Assertions.assertEquals(" ", QueryStringUtil.removeAllMultiSpace(testStr)); // multiple spaces testStr = " "; - Assert.assertEquals(" ", QueryStringUtil.removeAllMultiSpace(testStr)); + Assertions.assertEquals(" ", QueryStringUtil.removeAllMultiSpace(testStr)); // random string with left/right side multiple space testStr = " you may want to strip this message XD "; - Assert.assertEquals(" you may want to strip this message XD ", QueryStringUtil.removeAllMultiSpace(testStr)); + Assertions.assertEquals(" you may want to strip this message XD ", QueryStringUtil.removeAllMultiSpace(testStr)); // random string with multiple spaces testStr = " bad example of design by making hu ge s p a c e "; - Assert.assertEquals(" bad example of design by making hu ge s p a c e ", QueryStringUtil.removeAllMultiSpace(QueryStringUtil.removeCarriageReturn(testStr))); + Assertions.assertEquals(" bad example of design by making hu ge s p a c e ", QueryStringUtil.removeAllMultiSpace(QueryStringUtil.removeCarriageReturn(testStr))); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/RuntimeMXBeanUtilsTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/RuntimeMXBeanUtilsTest.java index ae6d24f87c77..b98f03a5d36e 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/RuntimeMXBeanUtilsTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/RuntimeMXBeanUtilsTest.java @@ -16,13 +16,8 @@ package com.navercorp.pinpoint.profiler.util; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; - - -import java.util.Date; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -32,12 +27,12 @@ public class RuntimeMXBeanUtilsTest { @Test public void vmStartTime() { long vmStartTime = RuntimeMXBeanUtils.getVmStartTime(); - Assert.assertNotSame(0, vmStartTime); + Assertions.assertNotSame(0, vmStartTime); } @Test public void pid() { int pid = RuntimeMXBeanUtils.getPid(); - Assert.assertTrue(pid > 0); + Assertions.assertTrue(pid > 0); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/StringMatchUtilsTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/StringMatchUtilsTest.java index 97c647ca91d5..b0297ac786cb 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/StringMatchUtilsTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/StringMatchUtilsTest.java @@ -1,56 +1,56 @@ package com.navercorp.pinpoint.profiler.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class StringMatchUtilsTest { @Test public void indexOf() { - Assert.assertEquals(0, StringMatchUtils.indexOf("abc", "a".toCharArray())); - Assert.assertEquals(1, StringMatchUtils.indexOf("abc", "b".toCharArray())); - Assert.assertEquals(2, StringMatchUtils.indexOf("abc", "c".toCharArray())); - Assert.assertEquals(-1, StringMatchUtils.indexOf("abc", "d".toCharArray())); + Assertions.assertEquals(0, StringMatchUtils.indexOf("abc", "a".toCharArray())); + Assertions.assertEquals(1, StringMatchUtils.indexOf("abc", "b".toCharArray())); + Assertions.assertEquals(2, StringMatchUtils.indexOf("abc", "c".toCharArray())); + Assertions.assertEquals(-1, StringMatchUtils.indexOf("abc", "d".toCharArray())); } @Test public void contains() { - Assert.assertTrue(StringMatchUtils.contains('a', "abc".toCharArray())); - Assert.assertTrue(StringMatchUtils.contains('c', "c".toCharArray())); - Assert.assertFalse(StringMatchUtils.contains('a', "bcd".toCharArray())); + Assertions.assertTrue(StringMatchUtils.contains('a', "abc".toCharArray())); + Assertions.assertTrue(StringMatchUtils.contains('c', "c".toCharArray())); + Assertions.assertFalse(StringMatchUtils.contains('a', "bcd".toCharArray())); } @Test public void lastCountMatches1() { - Assert.assertEquals(0, StringMatchUtils.endsWithCountMatches("abc", "[]")); - Assert.assertEquals(1, StringMatchUtils.endsWithCountMatches("abc[]", "[]")); - Assert.assertEquals(2, StringMatchUtils.endsWithCountMatches("abc[][]", "[]")); - Assert.assertEquals(3, StringMatchUtils.endsWithCountMatches("[][][]", "[]")); + Assertions.assertEquals(0, StringMatchUtils.endsWithCountMatches("abc", "[]")); + Assertions.assertEquals(1, StringMatchUtils.endsWithCountMatches("abc[]", "[]")); + Assertions.assertEquals(2, StringMatchUtils.endsWithCountMatches("abc[][]", "[]")); + Assertions.assertEquals(3, StringMatchUtils.endsWithCountMatches("[][][]", "[]")); } @Test public void lastCountMatches2() { - Assert.assertEquals(0, StringMatchUtils.endsWithCountMatches("[][]]", "[]")); - Assert.assertEquals(0, StringMatchUtils.endsWithCountMatches("[]]]", "[]")); + Assertions.assertEquals(0, StringMatchUtils.endsWithCountMatches("[][]]", "[]")); + Assertions.assertEquals(0, StringMatchUtils.endsWithCountMatches("[]]]", "[]")); } @Test public void lastCountMatches_invalid() { - Assert.assertEquals(1, StringMatchUtils.endsWithCountMatches("[][]abc[]", "[]")); - Assert.assertEquals(0, StringMatchUtils.endsWithCountMatches("[][]abc", "[]")); - Assert.assertEquals(0, StringMatchUtils.endsWithCountMatches("[]abc]", "[]")); + Assertions.assertEquals(1, StringMatchUtils.endsWithCountMatches("[][]abc[]", "[]")); + Assertions.assertEquals(0, StringMatchUtils.endsWithCountMatches("[][]abc", "[]")); + Assertions.assertEquals(0, StringMatchUtils.endsWithCountMatches("[]abc]", "[]")); - Assert.assertEquals(0, StringMatchUtils.endsWithCountMatches("a", "[][]")); + Assertions.assertEquals(0, StringMatchUtils.endsWithCountMatches("a", "[][]")); } @Test public void startCountMatches1() { - Assert.assertEquals(0, StringMatchUtils.startsWithCountMatches("abc", '[')); - Assert.assertEquals(1, StringMatchUtils.startsWithCountMatches("[abc", '[')); - Assert.assertEquals(2, StringMatchUtils.startsWithCountMatches("[[abc", '[')); - Assert.assertEquals(3, StringMatchUtils.startsWithCountMatches("[[[abc", '[')); + Assertions.assertEquals(0, StringMatchUtils.startsWithCountMatches("abc", '[')); + Assertions.assertEquals(1, StringMatchUtils.startsWithCountMatches("[abc", '[')); + Assertions.assertEquals(2, StringMatchUtils.startsWithCountMatches("[[abc", '[')); + Assertions.assertEquals(3, StringMatchUtils.startsWithCountMatches("[[[abc", '[')); } @Test @@ -58,7 +58,7 @@ public void appendAndReplace() { StringBuilder buffer = new StringBuilder(); StringMatchUtils.appendAndReplace("a.b.c", 0, '.', '/', buffer); - Assert.assertEquals("a/b/c", buffer.toString()); + Assertions.assertEquals("a/b/c", buffer.toString()); } @Test @@ -66,6 +66,6 @@ public void appendAndReplace_offset() { StringBuilder buffer = new StringBuilder(); StringMatchUtils.appendAndReplace("a.b.c", 2, '.', '/', buffer); - Assert.assertEquals("b/c", buffer.toString()); + Assertions.assertEquals("b/c", buffer.toString()); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/ThreadDumpUtilsTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/ThreadDumpUtilsTest.java index ed5b3f5b7c1e..9cb40a37cdc2 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/ThreadDumpUtilsTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/ThreadDumpUtilsTest.java @@ -18,10 +18,11 @@ import com.navercorp.pinpoint.profiler.context.thrift.ThreadStateThriftMessageConverter; import com.navercorp.pinpoint.thrift.dto.command.TThreadState; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + /** * @author Woonduk Kang(emeroad) */ @@ -35,22 +36,22 @@ public void toTThreadState() { ThreadStateThriftMessageConverter threadStateThriftMessageConverter = new ThreadStateThriftMessageConverter(); TThreadState newState = threadStateThriftMessageConverter.toMessage(Thread.State.NEW); - Assert.assertEquals(newState, TThreadState.NEW); + Assertions.assertEquals(newState, TThreadState.NEW); TThreadState runnable = threadStateThriftMessageConverter.toMessage(Thread.State.RUNNABLE); - Assert.assertEquals(runnable, TThreadState.RUNNABLE); + Assertions.assertEquals(runnable, TThreadState.RUNNABLE); TThreadState blocked = threadStateThriftMessageConverter.toMessage(Thread.State.BLOCKED); - Assert.assertEquals(blocked, TThreadState.BLOCKED); + Assertions.assertEquals(blocked, TThreadState.BLOCKED); TThreadState waiting = threadStateThriftMessageConverter.toMessage(Thread.State.WAITING); - Assert.assertEquals(waiting, TThreadState.WAITING); + Assertions.assertEquals(waiting, TThreadState.WAITING); TThreadState timedWaiting = threadStateThriftMessageConverter.toMessage(Thread.State.TIMED_WAITING); - Assert.assertEquals(timedWaiting, TThreadState.TIMED_WAITING); + Assertions.assertEquals(timedWaiting, TThreadState.TIMED_WAITING); TThreadState terminated = threadStateThriftMessageConverter.toMessage(Thread.State.TERMINATED); - Assert.assertEquals(terminated, TThreadState.TERMINATED); + Assertions.assertEquals(terminated, TThreadState.TERMINATED); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/ThreadLocalScopePoolTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/ThreadLocalScopePoolTest.java index 37e8f44759c5..4344a3a881e7 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/ThreadLocalScopePoolTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/ThreadLocalScopePoolTest.java @@ -16,13 +16,12 @@ package com.navercorp.pinpoint.profiler.util; -import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScopeInvocation; -import org.junit.Assert; -import org.junit.Test; - import com.navercorp.pinpoint.bootstrap.instrument.DefaultInterceptorScopeDefinition; import com.navercorp.pinpoint.bootstrap.interceptor.scope.AttachmentFactory; import com.navercorp.pinpoint.bootstrap.interceptor.scope.ExecutionPolicy; +import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScopeInvocation; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class ThreadLocalScopePoolTest { @@ -31,54 +30,54 @@ public void testGetScope() { ScopePool pool = new ThreadLocalScopePool(); InterceptorScopeInvocation scope = pool.getScope(new DefaultInterceptorScopeDefinition("test")); - Assert.assertTrue(scope instanceof ThreadLocalScope); + Assertions.assertTrue(scope instanceof ThreadLocalScope); - Assert.assertEquals("name", "test", scope.getName()); + Assertions.assertEquals(scope.getName(), "test", "name"); } @Test - public void testAttachment() { + public void testAttachment() { ScopePool pool = new ThreadLocalScopePool(); InterceptorScopeInvocation scope = pool.getScope(new DefaultInterceptorScopeDefinition("test")); scope.tryEnter(ExecutionPolicy.BOUNDARY); scope.tryEnter(ExecutionPolicy.BOUNDARY); - - Assert.assertNull(scope.getAttachment()); + + Assertions.assertNull(scope.getAttachment()); scope.setAttachment("test"); - + scope.canLeave(ExecutionPolicy.BOUNDARY); - Assert.assertEquals(scope.getAttachment(), "test"); - - Assert.assertTrue(scope.canLeave(ExecutionPolicy.BOUNDARY)); + Assertions.assertEquals(scope.getAttachment(), "test"); + + Assertions.assertTrue(scope.canLeave(ExecutionPolicy.BOUNDARY)); scope.leave(ExecutionPolicy.BOUNDARY); - - Assert.assertEquals("name", "test", scope.getName()); + + Assertions.assertEquals(scope.getName(), "test", "name"); } @Test public void testGetOrCreate() { ScopePool pool = new ThreadLocalScopePool(); - InterceptorScopeInvocation scope= pool.getScope(new DefaultInterceptorScopeDefinition("test")); - + InterceptorScopeInvocation scope = pool.getScope(new DefaultInterceptorScopeDefinition("test")); + scope.tryEnter(ExecutionPolicy.BOUNDARY); scope.tryEnter(ExecutionPolicy.BOUNDARY); - Assert.assertNull(scope.getAttachment()); - Assert.assertEquals(scope.getOrCreateAttachment(new AttachmentFactory() { + Assertions.assertNull(scope.getAttachment()); + Assertions.assertEquals(scope.getOrCreateAttachment(new AttachmentFactory() { @Override public Object createAttachment() { return "test"; } }), "test"); - + scope.canLeave(ExecutionPolicy.BOUNDARY); - Assert.assertEquals(scope.getAttachment(), "test"); - Assert.assertTrue(scope.canLeave(ExecutionPolicy.BOUNDARY)); + Assertions.assertEquals(scope.getAttachment(), "test"); + Assertions.assertTrue(scope.canLeave(ExecutionPolicy.BOUNDARY)); scope.leave(ExecutionPolicy.BOUNDARY); - - Assert.assertEquals("name", "test", scope.getName()); + + Assertions.assertEquals(scope.getName(), "test", "name"); } } \ No newline at end of file diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/ThreadLocalScopeTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/ThreadLocalScopeTest.java index 84919a3cd00e..8052ea0883b6 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/ThreadLocalScopeTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/ThreadLocalScopeTest.java @@ -16,12 +16,11 @@ package com.navercorp.pinpoint.profiler.util; -import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScopeInvocation; -import org.junit.Assert; -import org.junit.Test; - import com.navercorp.pinpoint.bootstrap.instrument.DefaultInterceptorScopeDefinition; import com.navercorp.pinpoint.bootstrap.interceptor.scope.ExecutionPolicy; +import com.navercorp.pinpoint.bootstrap.interceptor.scope.InterceptorScopeInvocation; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -30,28 +29,30 @@ public class ThreadLocalScopeTest { @Test public void pushPop() { InterceptorScopeInvocation scope = new ThreadLocalScope(new DefaultInterceptorScopeDefinition("test")); - Assert.assertTrue(scope.tryEnter(ExecutionPolicy.BOUNDARY)); - Assert.assertFalse(scope.tryEnter(ExecutionPolicy.BOUNDARY)); - Assert.assertFalse(scope.tryEnter(ExecutionPolicy.BOUNDARY)); - - Assert.assertTrue(scope.isActive()); - - Assert.assertFalse(scope.canLeave(ExecutionPolicy.BOUNDARY)); - Assert.assertFalse(scope.canLeave(ExecutionPolicy.BOUNDARY)); - Assert.assertTrue(scope.canLeave(ExecutionPolicy.BOUNDARY)); + Assertions.assertTrue(scope.tryEnter(ExecutionPolicy.BOUNDARY)); + Assertions.assertFalse(scope.tryEnter(ExecutionPolicy.BOUNDARY)); + Assertions.assertFalse(scope.tryEnter(ExecutionPolicy.BOUNDARY)); + + Assertions.assertTrue(scope.isActive()); + + Assertions.assertFalse(scope.canLeave(ExecutionPolicy.BOUNDARY)); + Assertions.assertFalse(scope.canLeave(ExecutionPolicy.BOUNDARY)); + Assertions.assertTrue(scope.canLeave(ExecutionPolicy.BOUNDARY)); scope.leave(ExecutionPolicy.BOUNDARY); } - @Test(expected=IllegalStateException.class) + @Test public void pushPopError() { - InterceptorScopeInvocation scope = new ThreadLocalScope(new DefaultInterceptorScopeDefinition("test")); - scope.leave(ExecutionPolicy.BOUNDARY); + Assertions.assertThrows(IllegalStateException.class, () -> { + InterceptorScopeInvocation scope = new ThreadLocalScope(new DefaultInterceptorScopeDefinition("test")); + scope.leave(ExecutionPolicy.BOUNDARY); + }); } @Test public void getName() { InterceptorScopeInvocation scope = new ThreadLocalScope(new DefaultInterceptorScopeDefinition("test")); - Assert.assertEquals(scope.getName(), "test"); + Assertions.assertEquals(scope.getName(), "test"); } } diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/TypeUtilsTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/TypeUtilsTest.java index b72443b946a2..d3e99bea8f29 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/TypeUtilsTest.java +++ b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/TypeUtilsTest.java @@ -17,35 +17,36 @@ package com.navercorp.pinpoint.profiler.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.lang.annotation.Annotation; import java.lang.reflect.Method; - /** * @author Woonduk Kang(emeroad) */ public class TypeUtilsTest { @Test public void testGetWrapperOf() { - Assert.assertSame(TypeUtils.getWrapperOf(boolean.class), Boolean.class); - Assert.assertSame(TypeUtils.getWrapperOf(byte.class), Byte.class); - Assert.assertSame(TypeUtils.getWrapperOf(char.class), Character.class); - Assert.assertSame(TypeUtils.getWrapperOf(short.class), Short.class); - Assert.assertSame(TypeUtils.getWrapperOf(int.class), Integer.class); - Assert.assertSame(TypeUtils.getWrapperOf(long.class), Long.class); - - Assert.assertSame(TypeUtils.getWrapperOf(float.class), Float.class); - Assert.assertSame(TypeUtils.getWrapperOf(float.class), Float.class); - Assert.assertSame(TypeUtils.getWrapperOf(double.class), Double.class); - Assert.assertSame(TypeUtils.getWrapperOf(void.class), Void.class); + Assertions.assertSame(TypeUtils.getWrapperOf(boolean.class), Boolean.class); + Assertions.assertSame(TypeUtils.getWrapperOf(byte.class), Byte.class); + Assertions.assertSame(TypeUtils.getWrapperOf(char.class), Character.class); + Assertions.assertSame(TypeUtils.getWrapperOf(short.class), Short.class); + Assertions.assertSame(TypeUtils.getWrapperOf(int.class), Integer.class); + Assertions.assertSame(TypeUtils.getWrapperOf(long.class), Long.class); + + Assertions.assertSame(TypeUtils.getWrapperOf(float.class), Float.class); + Assertions.assertSame(TypeUtils.getWrapperOf(float.class), Float.class); + Assertions.assertSame(TypeUtils.getWrapperOf(double.class), Double.class); + Assertions.assertSame(TypeUtils.getWrapperOf(void.class), Void.class); } - @Test(expected = IllegalArgumentException.class) + @Test public void testGetWrapperOf_unknown_type() { - TypeUtils.getWrapperOf(this.getClass()); + Assertions.assertThrows(IllegalArgumentException.class, () -> { + TypeUtils.getWrapperOf(this.getClass()); + }); } @Test @@ -54,7 +55,7 @@ public void testFindAnnotation() throws Exception { Annotation[] annotations = method.getAnnotations(); Test annotation = TypeUtils.findAnnotation(annotations, Test.class); - Assert.assertEquals(annotation.annotationType(), Test.class); + Assertions.assertEquals(annotation.annotationType(), Test.class); } } \ No newline at end of file diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/ClassPreLoaderTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/ClassPreLoaderTest.java index 5cae6b898353..663b747f23ce 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/ClassPreLoaderTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/ClassPreLoaderTest.java @@ -16,9 +16,7 @@ package com.navercorp.pinpoint.rpc; -import org.junit.Test; - -import com.navercorp.pinpoint.rpc.ClassPreLoader; +import org.junit.jupiter.api.Test; /** * @author emeroad diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/FutureTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/FutureTest.java index 920ca5123753..6ad130e185e4 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/FutureTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/FutureTest.java @@ -16,14 +16,10 @@ package com.navercorp.pinpoint.rpc; -import java.util.concurrent.atomic.AtomicBoolean; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import com.navercorp.pinpoint.rpc.DefaultFuture; -import com.navercorp.pinpoint.rpc.Future; -import com.navercorp.pinpoint.rpc.FutureListener; +import java.util.concurrent.atomic.AtomicBoolean; /** * @author emeroad @@ -40,13 +36,13 @@ public void simpleTest1() { future.setListener(listener1); // future.addListener(listener2); - Assert.assertFalse(listener1.isFinished()); -// Assert.assertFalse(listener2.isFinished()); + Assertions.assertFalse(listener1.isFinished()); +// Assertions.assertFalse(listener2.isFinished()); future.setResult("Hello"); - Assert.assertTrue(listener1.isFinished()); -// Assert.assertTrue(listener2.isFinished()); + Assertions.assertTrue(listener1.isFinished()); +// Assertions.assertTrue(listener2.isFinished()); } @Test @@ -59,7 +55,7 @@ public void simpleTest2() { future.setListener(listener); - Assert.assertTrue(listener.isFinished()); + Assertions.assertTrue(listener.isFinished()); } static class SimpleListener implements FutureListener { diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/buffer/ByteBufferFactoryTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/buffer/ByteBufferFactoryTest.java index 72e445d742a7..ad274f230b7f 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/buffer/ByteBufferFactoryTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/buffer/ByteBufferFactoryTest.java @@ -1,6 +1,7 @@ package com.navercorp.pinpoint.rpc.buffer; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -28,10 +29,11 @@ public void heapByteBufferFactoryTest() { assertBufferType(buffer, false); } - @Test(expected = IllegalArgumentException.class) + @Test public void unknownByteBufferFactoryTest() { - ByteBufferFactory byteBufferFactory = ByteBufferFactoryLocator.getFactory("unknown"); - + Assertions.assertThrows(IllegalArgumentException.class, () -> { + ByteBufferFactory byteBufferFactory = ByteBufferFactoryLocator.getFactory("unknown"); + }); } private void assertBufferOrder(ByteBuffer byteBuffer, ByteOrder order) { diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/ClientMessageListenerTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/ClientMessageListenerTest.java index 597caf472e00..c67999b49329 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/ClientMessageListenerTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/ClientMessageListenerTest.java @@ -26,8 +26,8 @@ import org.awaitility.Awaitility; import org.awaitility.core.ConditionFactory; import org.hamcrest.Matchers; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.concurrent.Callable; @@ -111,15 +111,15 @@ public List call() { } }, Matchers.hasSize(greaterThan(0))); - Assert.assertEquals(message, new String(echoMessageListener.getSendPacketRepository().get(0).getPayload())); + Assertions.assertEquals(message, new String(echoMessageListener.getSendPacketRepository().get(0).getPayload())); } private void assertRequestMessage(PinpointSocket writableServer, String message, EchoClientListener echoMessageListener) { byte[] response = PinpointRPCTestUtils.request(writableServer, message.getBytes()); - Assert.assertEquals(message, new String(response)); + Assertions.assertEquals(message, new String(response)); if (echoMessageListener != null) { - Assert.assertEquals(message, new String(echoMessageListener.getRequestPacketRepository().get(0).getPayload())); + Assertions.assertEquals(message, new String(echoMessageListener.getRequestPacketRepository().get(0).getPayload())); } } diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/ConnectFutureTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/ConnectFutureTest.java index 2771244adf17..130599134de3 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/ConnectFutureTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/ConnectFutureTest.java @@ -17,10 +17,10 @@ package com.navercorp.pinpoint.rpc.client; import com.navercorp.pinpoint.rpc.client.ConnectFuture.Result; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; @@ -36,12 +36,12 @@ public void setResultTest() { ConnectFuture future = new ConnectFuture(); future.setResult(Result.FAIL); future.setResult(Result.SUCCESS); - Assert.assertEquals(Result.FAIL, future.getResult()); + Assertions.assertEquals(Result.FAIL, future.getResult()); future = new ConnectFuture(); future.setResult(Result.SUCCESS); future.setResult(Result.FAIL); - Assert.assertEquals(Result.SUCCESS, future.getResult()); + Assertions.assertEquals(Result.SUCCESS, future.getResult()); } @Test @@ -53,7 +53,7 @@ public void awaitTest1() throws InterruptedException { future.await(); - Assert.assertEquals(Result.SUCCESS, future.getResult()); + Assertions.assertEquals(Result.SUCCESS, future.getResult()); } @Test @@ -65,7 +65,7 @@ public void awaitTest2() throws InterruptedException { future.awaitUninterruptibly(); - Assert.assertEquals(Result.SUCCESS, future.getResult()); + Assertions.assertEquals(Result.SUCCESS, future.getResult()); } @Test @@ -77,7 +77,7 @@ public void awaitTest3() throws InterruptedException { future.await(TimeUnit.SECONDS.toMillis(1), TimeUnit.MILLISECONDS); - Assert.assertEquals(Result.SUCCESS, future.getResult()); + Assertions.assertEquals(Result.SUCCESS, future.getResult()); } @Test @@ -89,12 +89,12 @@ public void notCompletedTest() throws InterruptedException { thread.start(); boolean isReady = future.await(waitTime / 2, TimeUnit.MILLISECONDS); - Assert.assertFalse(isReady); - Assert.assertNull(future.getResult()); + Assertions.assertFalse(isReady); + Assertions.assertNull(future.getResult()); isReady = future.await(waitTime, TimeUnit.MILLISECONDS); - Assert.assertTrue(isReady); - Assert.assertEquals(Result.SUCCESS, future.getResult()); + Assertions.assertTrue(isReady); + Assertions.assertEquals(Result.SUCCESS, future.getResult()); } class SetResultRunnable implements Runnable { diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/DnsSocketAddressProviderTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/DnsSocketAddressProviderTest.java index 3cee9b7d2a62..fe214d02b6c5 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/DnsSocketAddressProviderTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/DnsSocketAddressProviderTest.java @@ -16,14 +16,13 @@ package com.navercorp.pinpoint.rpc.client; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.UnknownHostException; - /** * @author Woonduk Kang(emeroad) */ @@ -34,8 +33,8 @@ public void resolve_success() { String hostName = "127.0.0.1"; int port = 80; DnsSocketAddressProvider localhost = new DnsSocketAddressProvider(hostName, port); - Assert.assertEquals(localhost.resolve(), new InetSocketAddress(hostName, port)); - Assert.assertEquals(localhost.resolve(), new InetSocketAddress(hostName, port)); + Assertions.assertEquals(localhost.resolve(), new InetSocketAddress(hostName, port)); + Assertions.assertEquals(localhost.resolve(), new InetSocketAddress(hostName, port)); } @@ -45,8 +44,8 @@ public void resolve_fail() { String hostName = "empty"; int port = 80; DnsSocketAddressProvider empty = new DnsSocketAddressProvider(hostName, port); - Assert.assertEquals(empty.resolve(), new InetSocketAddress(hostName, port)); - Assert.assertEquals(empty.resolve(), new InetSocketAddress(hostName, port)); + Assertions.assertEquals(empty.resolve(), new InetSocketAddress(hostName, port)); + Assertions.assertEquals(empty.resolve(), new InetSocketAddress(hostName, port)); } @@ -61,6 +60,7 @@ public void resolve_update() { int port = 80; DnsSocketAddressProvider empty = new DnsSocketAddressProvider("empty", port) { private int i = 0; + @Override InetAddress getByName(String host) throws UnknownHostException { if (i == 0) { @@ -71,7 +71,7 @@ InetAddress getByName(String host) throws UnknownHostException { } } }; - Assert.assertEquals(empty.resolve(), new InetSocketAddress(host1, port)); - Assert.assertEquals(empty.resolve(), new InetSocketAddress(host2, port)); + Assertions.assertEquals(empty.resolve(), new InetSocketAddress(host1, port)); + Assertions.assertEquals(empty.resolve(), new InetSocketAddress(host2, port)); } } \ No newline at end of file diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/HealthCheckTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/HealthCheckTest.java index 5793aa890d94..aff5ad2ce267 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/HealthCheckTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/HealthCheckTest.java @@ -24,9 +24,9 @@ import com.navercorp.pinpoint.test.client.TestRawSocket; import com.navercorp.pinpoint.test.server.TestPinpointServerAcceptor; import com.navercorp.pinpoint.test.server.TestServerMessageListenerFactory; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.io.IOException; @@ -52,7 +52,7 @@ public void legacyHealthCheckTest1() throws Exception { testPinpointServerAcceptor.close(); } - Assert.assertFalse(serverMessageListener.hasReceivedPing()); + Assertions.assertFalse(serverMessageListener.hasReceivedPing()); } @Test @@ -72,7 +72,7 @@ public void legacyHealthCheckTest2() throws Exception { testPinpointServerAcceptor.close(); } - Assert.assertTrue(serverMessageListener.hasReceivedPing()); + Assertions.assertTrue(serverMessageListener.hasReceivedPing()); } @Test @@ -93,7 +93,7 @@ public void healthCheckTest() throws Exception { testPinpointServerAcceptor.close(); } - Assert.assertTrue(serverMessageListener.hasReceivedPing()); + Assertions.assertTrue(serverMessageListener.hasReceivedPing()); } @Test @@ -108,14 +108,14 @@ public void healthCheckSimplePingTest() throws Exception { try { testRawSocket.connect(bindPort); sendPingAndReceivePongPacket(testRawSocket, new PingSimplePacket()); - Assert.fail(); + Assertions.fail(); } catch (Exception e) { } finally { testRawSocket.close(); testPinpointServerAcceptor.close(); } - Assert.assertFalse(serverMessageListener.hasReceivedPing()); + Assertions.assertFalse(serverMessageListener.hasReceivedPing()); } @Test @@ -138,18 +138,18 @@ public void stateSyncFailTest() throws Exception { isSuccess = true; sendPingAndReceivePongPacket(testRawSocket, new PingPayloadPacket(1, (byte) 1, (byte) 1)); - Assert.fail(); + Assertions.fail(); } catch (Exception e) { - Assert.assertTrue(isSuccess); + Assertions.assertTrue(isSuccess); } finally { testRawSocket.close(); testPinpointServerAcceptor.close(); } - Assert.assertFalse(serverMessageListener.hasReceivedPing()); + Assertions.assertFalse(serverMessageListener.hasReceivedPing()); } - @Ignore + @Disabled @Test public void expiredHealthCheckTest() throws Exception { TestServerMessageListenerFactory testServerMessageListenerFactory = new TestServerMessageListenerFactory(TestServerMessageListenerFactory.HandshakeType.DUPLEX, true); @@ -165,19 +165,19 @@ public void expiredHealthCheckTest() throws Exception { Thread.sleep(35 * 60 * 1000); sendPingAndReceivePongPacket(testRawSocket, new PingPayloadPacket(1, (byte) 1, (byte) 1)); - Assert.fail(); + Assertions.fail(); } catch (Exception ignored) { } finally { testRawSocket.close(); testPinpointServerAcceptor.close(); } - Assert.assertFalse(serverMessageListener.hasReceivedPing()); + Assertions.assertFalse(serverMessageListener.hasReceivedPing()); } private void sendPingAndReceivePongPacket(TestRawSocket testRawSocket, Packet pingPacket) throws IOException, ProtocolException { testRawSocket.sendPingPacket(pingPacket); - Assert.assertNotNull(testRawSocket.readPongPacket(3000)); + Assertions.assertNotNull(testRawSocket.readPongPacket(3000)); } } diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/PinpointClientFactoryTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/PinpointClientFactoryTest.java index 9f6ee30ee0e4..1a8046aa137d 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/PinpointClientFactoryTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/PinpointClientFactoryTest.java @@ -24,15 +24,15 @@ import com.navercorp.pinpoint.test.server.TestPinpointServerAcceptor; import com.navercorp.pinpoint.test.server.TestServerMessageListenerFactory; import com.navercorp.pinpoint.testcase.util.SocketUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.awaitility.Awaitility; import org.jboss.netty.channel.ChannelFuture; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.ConnectException; @@ -50,14 +50,14 @@ public class PinpointClientFactoryTest { private Logger logger = LogManager.getLogger(this.getClass()); private static DefaultPinpointClientFactory clientFactory; - - @BeforeClass + + @BeforeAll public static void setUp() throws IOException { clientFactory = new DefaultPinpointClientFactory(); clientFactory.setPingDelay(100); } - - @AfterClass + + @AfterAll public static void tearDown() { if (clientFactory != null) { clientFactory.release(); @@ -69,10 +69,10 @@ public void connectFail() { try { int availableTcpPort = SocketUtils.findAvailableTcpPort(47000); clientFactory.connect("127.0.0.1", availableTcpPort); - Assert.fail(); + Assertions.fail(); } catch (PinpointSocketException e) { - Assert.assertTrue(ConnectException.class.isInstance(e.getCause())); - } + Assertions.assertTrue(ConnectException.class.isInstance(e.getCause())); + } } @Test @@ -82,9 +82,9 @@ public void reconnectFail() throws InterruptedException { InetSocketAddress remoteAddress = new InetSocketAddress("127.0.0.1", availableTcpPort); ChannelFuture reconnect = clientFactory.reconnect(remoteAddress); reconnect.await(); - Assert.assertFalse(reconnect.isSuccess()); - Assert.assertTrue(ConnectException.class.isInstance(reconnect.getCause())); - + Assertions.assertFalse(reconnect.isSuccess()); + Assertions.assertTrue(ConnectException.class.isInstance(reconnect.getCause())); + Thread.sleep(1000); } @@ -148,11 +148,11 @@ public void pingAndRequestResponse() throws IOException, InterruptedException { try { PinpointClient client = clientFactory.connect("127.0.0.1", bindPort); - + byte[] randomByte = TestByteUtils.createRandomByte(10); byte[] response = PinpointRPCTestUtils.request(client, randomByte); - - Assert.assertArrayEquals(randomByte, response); + + Assertions.assertArrayEquals(randomByte, response); PinpointRPCTestUtils.close(client); } finally { testPinpointServerAcceptor.close(); @@ -188,7 +188,7 @@ public void requestAndResponse() throws IOException, InterruptedException { byte[] randomByte = TestByteUtils.createRandomByte(20); byte[] response = PinpointRPCTestUtils.request(client, randomByte); - Assert.assertArrayEquals(randomByte, response); + Assertions.assertArrayEquals(randomByte, response); PinpointRPCTestUtils.close(client); } finally { testPinpointServerAcceptor.close(); @@ -204,44 +204,46 @@ public void connectTimeout() { pinpointClientFactory = new DefaultPinpointClientFactory(); pinpointClientFactory.setConnectTimeout(timeout); int connectTimeout = pinpointClientFactory.getConnectTimeout(); - - Assert.assertEquals(timeout, connectTimeout); + + Assertions.assertEquals(timeout, connectTimeout); } finally { pinpointClientFactory.release(); } } - @Test(expected = PinpointSocketException.class) - @Ignore + @Disabled + @Test public void throwWriteBufferFullExceptionTest() { - TestPinpointServerAcceptor testPinpointServerAcceptor = new TestPinpointServerAcceptor(); - int bindPort = testPinpointServerAcceptor.bind(); - - int defaultWriteBufferHighWaterMark = clientFactory.getWriteBufferHighWaterMark(); - int defaultWriteBufferLowWaterMark = clientFactory.getWriteBufferLowWaterMark(); - try { - clientFactory.setWriteBufferHighWaterMark(2); - clientFactory.setWriteBufferLowWaterMark(1); - - PinpointClient client = clientFactory.connect("127.0.0.1", bindPort); - - List futureList = new ArrayList(); - for (int i = 0; i < 30; i++) { - Future requestFuture = client.request(new byte[20]); - futureList.add(requestFuture); - } - - for (Future future : futureList) { - future.getResult(); + Assertions.assertThrows(PinpointSocketException.class, () -> { + TestPinpointServerAcceptor testPinpointServerAcceptor = new TestPinpointServerAcceptor(); + int bindPort = testPinpointServerAcceptor.bind(); + + int defaultWriteBufferHighWaterMark = clientFactory.getWriteBufferHighWaterMark(); + int defaultWriteBufferLowWaterMark = clientFactory.getWriteBufferLowWaterMark(); + try { + clientFactory.setWriteBufferHighWaterMark(2); + clientFactory.setWriteBufferLowWaterMark(1); + + PinpointClient client = clientFactory.connect("127.0.0.1", bindPort); + + List futureList = new ArrayList(); + for (int i = 0; i < 30; i++) { + Future requestFuture = client.request(new byte[20]); + futureList.add(requestFuture); + } + + for (Future future : futureList) { + future.getResult(); + } + + PinpointRPCTestUtils.close(client); + } finally { + clientFactory.setWriteBufferHighWaterMark(defaultWriteBufferHighWaterMark); + clientFactory.setWriteBufferLowWaterMark(defaultWriteBufferLowWaterMark); + + testPinpointServerAcceptor.close(); } - - PinpointRPCTestUtils.close(client); - } finally { - clientFactory.setWriteBufferHighWaterMark(defaultWriteBufferHighWaterMark); - clientFactory.setWriteBufferLowWaterMark(defaultWriteBufferLowWaterMark); - - testPinpointServerAcceptor.close(); - } + }); } diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/PinpointClientStateTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/PinpointClientStateTest.java index c472367bcd99..5d204954ed2a 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/PinpointClientStateTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/PinpointClientStateTest.java @@ -24,17 +24,15 @@ import com.navercorp.pinpoint.test.server.TestServerMessageListenerFactory; import com.navercorp.pinpoint.testcase.util.SocketUtils; import org.awaitility.Awaitility; -import org.awaitility.core.ConditionFactory; import org.hamcrest.Matchers; import org.jboss.netty.channel.Channel; import org.jboss.netty.channel.ChannelFuture; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.InetSocketAddress; import java.net.SocketAddress; import java.util.Objects; import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; /** * @author Taejin Koo diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/ReconnectTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/ReconnectTest.java index b364e13a8447..6d4c7deb9818 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/ReconnectTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/ReconnectTest.java @@ -24,14 +24,14 @@ import com.navercorp.pinpoint.test.server.TestPinpointServerAcceptor; import com.navercorp.pinpoint.test.server.TestServerMessageListenerFactory; import com.navercorp.pinpoint.testcase.util.SocketUtils; -import org.awaitility.Awaitility; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.awaitility.Awaitility; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.lang.management.ManagementFactory; @@ -55,7 +55,7 @@ public class ReconnectTest { private final TestServerMessageListenerFactory testServerMessageListenerFactory = new TestServerMessageListenerFactory(TestServerMessageListenerFactory.HandshakeType.DUPLEX); - @BeforeClass + @BeforeAll public static void setUp() throws IOException { clientFactory = new DefaultPinpointClientFactory(); clientFactory.setReconnectDelay(200); @@ -64,7 +64,7 @@ public static void setUp() throws IOException { clientFactory.setRequestTimeoutMillis(200); } - @AfterClass + @AfterAll public static void tearDown() { if (clientFactory != null) { clientFactory.release(); @@ -103,19 +103,19 @@ public void reconnectPerformed(PinpointClient client) { byte[] randomByte = TestByteUtils.createRandomByte(10); byte[] response = PinpointRPCTestUtils.request(client, randomByte); - Assert.assertArrayEquals(randomByte, response); + Assertions.assertArrayEquals(randomByte, response); PinpointRPCTestUtils.close(client); } finally { TestPinpointServerAcceptor.staticClose(newTestPinpointServerAcceptor); } - Assert.assertTrue(reconnectPerformed.get()); + Assertions.assertTrue(reconnectPerformed.get()); } // it takes very long time. // @Test - @Ignore + @Disabled public void reconnectStressTest() throws IOException, InterruptedException { int count = 3; @@ -142,7 +142,7 @@ public void reconnectStressTest() throws IOException, InterruptedException { byte[] randomByte = TestByteUtils.createRandomByte(10); byte[] response = PinpointRPCTestUtils.request(client, randomByte); - Assert.assertArrayEquals(randomByte, response); + Assertions.assertArrayEquals(randomByte, response); PinpointRPCTestUtils.close(client); testPinpointServerAcceptor.close(); @@ -150,7 +150,7 @@ public void reconnectStressTest() throws IOException, InterruptedException { Thread.sleep(10000); - Assert.assertEquals(threadCount, tbean.getThreadCount()); + Assertions.assertEquals(threadCount, tbean.getThreadCount()); } @@ -173,7 +173,7 @@ public void scheduledConnect() throws IOException, InterruptedException { byte[] randomByte = TestByteUtils.createRandomByte(10); byte[] response = PinpointRPCTestUtils.request(client, randomByte); - Assert.assertArrayEquals(randomByte, response); + Assertions.assertArrayEquals(randomByte, response); } finally { PinpointRPCTestUtils.close(client); clientFactory.release(); @@ -211,19 +211,19 @@ public void scheduledConnectStateTest() { Future future = client.sendAsync(new byte[10]); future.await(); future.getResult(); - Assert.fail(); + Assertions.fail(); } catch (PinpointSocketException e) { } try { client.sendSync(new byte[10]); - Assert.fail(); + Assertions.fail(); } catch (PinpointSocketException e) { } try { PinpointRPCTestUtils.request(client, new byte[10]); - Assert.fail(); + Assertions.fail(); } catch (PinpointSocketException e) { } @@ -268,7 +268,7 @@ public void serverCloseAndWrite() throws IOException, InterruptedException { response.await(); try { response.getResult(); - Assert.fail("expected exception"); + Assertions.fail("expected exception"); } catch (Exception e) { } diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/RequestManagerTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/RequestManagerTest.java index bc3d487e16e5..4f229c8ebbce 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/RequestManagerTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/client/RequestManagerTest.java @@ -19,14 +19,14 @@ import com.navercorp.pinpoint.rpc.DefaultFuture; import com.navercorp.pinpoint.rpc.Future; import com.navercorp.pinpoint.rpc.ResponseMessage; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.jboss.netty.util.HashedWheelTimer; import org.jboss.netty.util.Timer; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; @@ -40,13 +40,13 @@ public class RequestManagerTest { private Timer timer; private RequestManager requestManager; - @Before + @BeforeEach public void setUp() throws Exception { this.timer = new HashedWheelTimer(10, TimeUnit.MICROSECONDS); this.requestManager = new RequestManager(timer, 3000); } - @After + @AfterEach public void tearDown() throws Exception { if (this.timer != null) { this.timer.stop(); @@ -61,10 +61,10 @@ public void testRegisterRequest() throws Exception { final int requestId = requestManager.nextRequestId(); final Future future = requestManager.register(requestId, 50); - Assert.assertTrue(future.await(200)); - Assert.assertTrue(future.isReady()); - Assert.assertFalse(future.isSuccess()); - Assert.assertTrue(future.getCause().getMessage().contains("timeout")); + Assertions.assertTrue(future.await(200)); + Assertions.assertTrue(future.isReady()); + Assertions.assertFalse(future.isSuccess()); + Assertions.assertTrue(future.getCause().getMessage().contains("timeout")); logger.debug(future.getCause().getMessage()); } @@ -77,7 +77,7 @@ public void testRemoveMessageFuture() throws Exception { future.setFailure(new RuntimeException()); Future nullFuture = requestManager.removeMessageFuture(requestId); - Assert.assertNull(nullFuture); + Assertions.assertNull(nullFuture); } } diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/cluster/RoleTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/cluster/RoleTest.java index 4f74b9d587c2..290ddd37db1a 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/cluster/RoleTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/cluster/RoleTest.java @@ -16,9 +16,8 @@ package com.navercorp.pinpoint.rpc.cluster; -import org.junit.Assert; -import org.junit.Test; - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -26,7 +25,7 @@ public class RoleTest { @Test public void getValue() throws Exception { - Assert.assertEquals(Role.getValue("ROUTER"), Role.ROUTER); + Assertions.assertEquals(Role.getValue("ROUTER"), Role.ROUTER); } } \ No newline at end of file diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/common/CyclicStateCheckerTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/common/CyclicStateCheckerTest.java index fadf4d69e9e2..e9636cfa89b1 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/common/CyclicStateCheckerTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/common/CyclicStateCheckerTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.rpc.common; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Taejin Koo @@ -29,16 +29,16 @@ public void stateCheckerTest1() { CyclicStateChecker stateChecker = new CyclicStateChecker(3); stateChecker.markAndCheckCondition(); - Assert.assertFalse(stateChecker.checkCondition()); + Assertions.assertFalse(stateChecker.checkCondition()); stateChecker.markAndCheckCondition(); - Assert.assertFalse(stateChecker.checkCondition()); + Assertions.assertFalse(stateChecker.checkCondition()); stateChecker.markAndCheckCondition(); - Assert.assertTrue(stateChecker.checkCondition()); + Assertions.assertTrue(stateChecker.checkCondition()); stateChecker.markAndCheckCondition(); - Assert.assertTrue(stateChecker.checkCondition()); + Assertions.assertTrue(stateChecker.checkCondition()); } @Test @@ -46,22 +46,22 @@ public void stateCheckerTest2() { CyclicStateChecker stateChecker = new CyclicStateChecker(3); stateChecker.markAndCheckCondition(); - Assert.assertFalse(stateChecker.checkCondition()); + Assertions.assertFalse(stateChecker.checkCondition()); stateChecker.markAndCheckCondition(); - Assert.assertFalse(stateChecker.checkCondition()); + Assertions.assertFalse(stateChecker.checkCondition()); stateChecker.unmark(); - Assert.assertFalse(stateChecker.checkCondition()); + Assertions.assertFalse(stateChecker.checkCondition()); stateChecker.markAndCheckCondition(); - Assert.assertFalse(stateChecker.checkCondition()); + Assertions.assertFalse(stateChecker.checkCondition()); stateChecker.markAndCheckCondition(); - Assert.assertFalse(stateChecker.checkCondition()); + Assertions.assertFalse(stateChecker.checkCondition()); stateChecker.markAndCheckCondition(); - Assert.assertTrue(stateChecker.checkCondition()); + Assertions.assertTrue(stateChecker.checkCondition()); } } \ No newline at end of file diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/message/SendPacketTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/message/SendPacketTest.java index 36b0f45c3ce0..561f5ed74b1f 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/message/SendPacketTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/message/SendPacketTest.java @@ -19,8 +19,8 @@ import com.navercorp.pinpoint.rpc.packet.SendPacket; import org.jboss.netty.buffer.ChannelBuffer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -35,7 +35,7 @@ public void testToBuffer() throws Exception { short packetType = channelBuffer.readShort(); SendPacket packet = (SendPacket) SendPacket.readBuffer(packetType, channelBuffer); - Assert.assertArrayEquals(bytes, packet.getPayload()); + Assertions.assertArrayEquals(bytes, packet.getPayload()); } diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/packet/HandshakeResponseCodeTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/packet/HandshakeResponseCodeTest.java index 9f6459bb26bb..8a4745bf0e7c 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/packet/HandshakeResponseCodeTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/packet/HandshakeResponseCodeTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.rpc.packet; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -25,7 +25,7 @@ public class HandshakeResponseCodeTest { @Test public void getValue() throws Exception { - Assert.assertEquals(HandshakeResponseCode.getValue(0, 1), HandshakeResponseCode.SIMPLEX_COMMUNICATION); + Assertions.assertEquals(HandshakeResponseCode.getValue(0, 1), HandshakeResponseCode.SIMPLEX_COMMUNICATION); } } \ No newline at end of file diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/packet/PongPacketTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/packet/PongPacketTest.java index 1b6e522efc38..5f6c50f1a786 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/packet/PongPacketTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/packet/PongPacketTest.java @@ -16,13 +16,9 @@ package com.navercorp.pinpoint.rpc.packet; -import org.junit.Assert; - import org.jboss.netty.buffer.ChannelBuffer; -import org.junit.Test; - -import com.navercorp.pinpoint.rpc.packet.PacketType; -import com.navercorp.pinpoint.rpc.packet.PongPacket; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -34,7 +30,7 @@ public void testToBuffer() throws Exception { ChannelBuffer channelBuffer = pongPacket.toBuffer(); short pongCode = channelBuffer.readShort(); - Assert.assertEquals(PacketType.CONTROL_PONG, pongCode); + Assertions.assertEquals(PacketType.CONTROL_PONG, pongCode); } diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/ControlPacketServerTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/ControlPacketServerTest.java index 6fa02d5aa2d7..69567f625a59 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/ControlPacketServerTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/ControlPacketServerTest.java @@ -21,8 +21,8 @@ import com.navercorp.pinpoint.rpc.util.PinpointRPCTestUtils; import com.navercorp.pinpoint.test.client.TestRawSocket; import com.navercorp.pinpoint.test.server.TestPinpointServerAcceptor; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.Collections; @@ -45,8 +45,8 @@ public void registerAgentTest1() throws Exception { sendAndReceiveSimplePacket(testRawSocket); - int code= sendAndReceiveRegisterPacket(testRawSocket); - Assert.assertEquals(2, code); + int code = sendAndReceiveRegisterPacket(testRawSocket); + Assertions.assertEquals(2, code); sendAndReceiveSimplePacket(testRawSocket); } finally { @@ -67,8 +67,8 @@ public void registerAgentTest2() throws Exception { sendAndReceiveSimplePacket(testRawSocket); - int code= sendAndReceiveRegisterPacket(testRawSocket, PinpointRPCTestUtils.getParams()); - Assert.assertEquals(0, code); + int code = sendAndReceiveRegisterPacket(testRawSocket, PinpointRPCTestUtils.getParams()); + Assertions.assertEquals(0, code); sendAndReceiveSimplePacket(testRawSocket); } finally { @@ -87,10 +87,10 @@ public void registerAgentTest3() throws Exception { try { testRawSocket.connect(bindPort); int code = sendAndReceiveRegisterPacket(testRawSocket); - Assert.assertEquals(2, code); + Assertions.assertEquals(2, code); code = sendAndReceiveRegisterPacket(testRawSocket); - Assert.assertEquals(2, code); + Assertions.assertEquals(2, code); sendAndReceiveSimplePacket(testRawSocket); } finally { @@ -113,12 +113,12 @@ public void registerAgentTest4() throws Exception { sendAndReceiveSimplePacket(testRawSocket); int code = sendAndReceiveRegisterPacket(testRawSocket, PinpointRPCTestUtils.getParams()); - Assert.assertEquals(0, code); + Assertions.assertEquals(0, code); sendAndReceiveSimplePacket(testRawSocket); code = sendAndReceiveRegisterPacket(testRawSocket, PinpointRPCTestUtils.getParams()); - Assert.assertEquals(1, code); + Assertions.assertEquals(1, code); sendAndReceiveSimplePacket(testRawSocket); } finally { @@ -139,7 +139,7 @@ private int sendAndReceiveRegisterPacket(TestRawSocket testRawSocket, Map 0); + Assertions.assertTrue(eventHandler.getErrorCount() > 0); } finally { testRawSocket.close(); PinpointRPCTestUtils.close(serverAcceptor); @@ -102,7 +101,7 @@ private int sendAndReceiveRegisterPacket(TestRawSocket testRawSocket, Map writableServerList) { @@ -144,8 +144,8 @@ private PinpointSocket getWritableServer(String applicationName, String agentId, for (PinpointSocket writableServer : writableServerList) { - if (writableServer instanceof PinpointServer) { - Map agentProperties = ((PinpointServer)writableServer).getChannelProperties(); + if (writableServer instanceof PinpointServer) { + Map agentProperties = ((PinpointServer) writableServer).getChannelProperties(); if (!applicationName.equals(agentProperties.get(HandshakePropertyType.APPLICATION_NAME.getName()))) { continue; diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/HealthCheckManagerTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/HealthCheckManagerTest.java index d66720ab1e5c..5acedeb9e54f 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/HealthCheckManagerTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/HealthCheckManagerTest.java @@ -24,13 +24,16 @@ import org.jboss.netty.channel.group.ChannelGroup; import org.jboss.netty.channel.group.DefaultChannelGroup; import org.jboss.netty.util.Timer; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.timeout; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; /** * @author Taejin Koo @@ -39,12 +42,12 @@ public class HealthCheckManagerTest { private static Timer timer; - @BeforeClass + @BeforeAll public static void setUp() { timer = TimerFactory.createHashedWheelTimer("PingPacketSenderTestTimer", 50, TimeUnit.MILLISECONDS, 512); } - @AfterClass + @AfterAll public static void tearDown() { if (timer != null) { timer.stop(); diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/PinpointServerSocketTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/PinpointServerSocketTest.java index 3af9df0caec0..53d63eb970e0 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/PinpointServerSocketTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/PinpointServerSocketTest.java @@ -18,7 +18,7 @@ import com.navercorp.pinpoint.rpc.DiscardServerHandler; import com.navercorp.pinpoint.test.server.TestPinpointServerAcceptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.net.Socket; diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/PinpointServerStateTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/PinpointServerStateTest.java index 3a4cc1e72e44..e2d587d0e750 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/PinpointServerStateTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/PinpointServerStateTest.java @@ -25,8 +25,8 @@ import com.navercorp.pinpoint.test.server.TestPinpointServerAcceptor; import com.navercorp.pinpoint.test.server.TestServerMessageListenerFactory; import org.awaitility.Awaitility; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.concurrent.Callable; @@ -54,12 +54,12 @@ public void closeByPeerTest() { PinpointSocket pinpointServer = testPinpointServerAcceptor.getConnectedPinpointSocketList().get(0); if (pinpointServer instanceof PinpointServer) { - Assert.assertEquals(SocketStateCode.RUN_DUPLEX, ((PinpointServer) pinpointServer).getCurrentStateCode()); + Assertions.assertEquals(SocketStateCode.RUN_DUPLEX, ((PinpointServer) pinpointServer).getCurrentStateCode()); testPinpointClient.disconnect(); assertPinpointServerState(SocketStateCode.CLOSED_BY_CLIENT, (PinpointServer) pinpointServer); } else { - Assert.fail(); + Assertions.fail(); } } finally { testPinpointClient.closeAll(); @@ -79,7 +79,7 @@ public void closeTest() { testPinpointServerAcceptor.assertAwaitClientConnected(1000); PinpointSocket pinpointServer = testPinpointServerAcceptor.getConnectedPinpointSocketList().get(0); - Assert.assertEquals(SocketStateCode.RUN_DUPLEX, ((PinpointServer) pinpointServer).getCurrentStateCode()); + Assertions.assertEquals(SocketStateCode.RUN_DUPLEX, ((PinpointServer) pinpointServer).getCurrentStateCode()); testPinpointServerAcceptor.close(); assertPinpointServerState(SocketStateCode.CLOSED_BY_SERVER, (PinpointServer) pinpointServer); @@ -104,10 +104,10 @@ public void unexpectedCloseByPeerTest() throws IOException, ProtocolException { PinpointSocket pinpointServer = testPinpointServerAcceptor.getConnectedPinpointSocketList().get(0); if (!(pinpointServer instanceof PinpointServer)) { testRawSocket.close(); - Assert.fail(); + Assertions.fail(); } - Assert.assertEquals(SocketStateCode.RUN_DUPLEX, ((PinpointServer) pinpointServer).getCurrentStateCode()); + Assertions.assertEquals(SocketStateCode.RUN_DUPLEX, ((PinpointServer) pinpointServer).getCurrentStateCode()); testRawSocket.close(); assertPinpointServerState(SocketStateCode.UNEXPECTED_CLOSE_BY_CLIENT, (PinpointServer) pinpointServer); } finally { @@ -127,7 +127,7 @@ public void unexpectedCloseTest() { testPinpointServerAcceptor.assertAwaitClientConnected(1000); PinpointSocket pinpointServer = testPinpointServerAcceptor.getConnectedPinpointSocketList().get(0); - Assert.assertEquals(SocketStateCode.RUN_DUPLEX, ((PinpointServer) pinpointServer).getCurrentStateCode()); + Assertions.assertEquals(SocketStateCode.RUN_DUPLEX, ((PinpointServer) pinpointServer).getCurrentStateCode()); ((DefaultPinpointServer) pinpointServer).stop(true); assertPinpointServerState(SocketStateCode.UNEXPECTED_CLOSE_BY_SERVER, (PinpointServer) pinpointServer); diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/PipelineFactoryTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/PipelineFactoryTest.java index ee7c844d3cd7..3d79cc39d4d3 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/PipelineFactoryTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/server/PipelineFactoryTest.java @@ -30,10 +30,9 @@ import org.jboss.netty.channel.ChannelPipeline; import org.jboss.netty.channel.Channels; import org.jboss.netty.handler.codec.frame.FrameDecoder; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.function.ThrowingRunnable; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.Socket; @@ -50,7 +49,7 @@ public class PipelineFactoryTest { private static final char START_KEY = '!'; - @BeforeClass + @BeforeAll public static void setUp() throws IOException { bindPort = SocketUtils.findAvailableTcpPort(); } @@ -76,7 +75,7 @@ public void testBind() throws Exception { try { assertMessageReceivedCount(2, discardServerHandler); - Assert.fail(); + Assertions.fail(); } catch (ConditionTimeoutException e) { // ignore } diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/stream/StreamChannelManagerTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/stream/StreamChannelManagerTest.java index 91565bdcb403..042d29dd5579 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/stream/StreamChannelManagerTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/stream/StreamChannelManagerTest.java @@ -28,10 +28,9 @@ import com.navercorp.pinpoint.test.client.TestPinpointClient; import com.navercorp.pinpoint.test.server.TestPinpointServerAcceptor; import com.navercorp.pinpoint.test.server.TestServerMessageListenerFactory; - import org.awaitility.Awaitility; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.List; @@ -66,7 +65,7 @@ public void streamSuccessTest1() throws IOException, InterruptedException, Strea } clientListener.getLatch().await(); - Assert.assertEquals(sendCount, clientListener.getReceivedMessage().size()); + Assertions.assertEquals(sendCount, clientListener.getReceivedMessage().size()); clientStreamChannel.close(); } finally { @@ -99,7 +98,7 @@ public void streamSuccessTest2() throws IOException, InterruptedException, Strea } clientListener.getLatch().await(); - Assert.assertEquals(sendCount, clientListener.getReceivedMessage().size()); + Assertions.assertEquals(sendCount, clientListener.getReceivedMessage().size()); clientStreamChannel.close(); @@ -109,8 +108,8 @@ public void streamSuccessTest2() throws IOException, InterruptedException, Strea } clientListener2.getLatch().await(); - Assert.assertEquals(sendCount, clientListener.getReceivedMessage().size()); - Assert.assertEquals(8, clientListener2.getReceivedMessage().size()); + Assertions.assertEquals(sendCount, clientListener.getReceivedMessage().size()); + Assertions.assertEquals(8, clientListener2.getReceivedMessage().size()); clientStreamChannel2.close(); } finally { @@ -132,7 +131,7 @@ public void streamSuccessTest3() throws IOException, InterruptedException, Strea testPinpointServerAcceptor.assertAwaitClientConnected(1000); List writableServerList = testPinpointServerAcceptor.getConnectedPinpointSocketList(); - Assert.assertEquals(1, writableServerList.size()); + Assertions.assertEquals(1, writableServerList.size()); PinpointSocket writableServer = writableServerList.get(0); @@ -147,11 +146,11 @@ public void streamSuccessTest3() throws IOException, InterruptedException, Strea } clientListener.getLatch().await(); - Assert.assertEquals(sendCount, clientListener.getReceivedMessage().size()); + Assertions.assertEquals(sendCount, clientListener.getReceivedMessage().size()); clientStreamChannel.close(); } else { - Assert.fail(); + Assertions.fail(); } } finally { testPinpointClient.closeAll(); @@ -159,22 +158,24 @@ public void streamSuccessTest3() throws IOException, InterruptedException, Strea } } - @Test(expected = StreamException.class) + @Test public void streamClosedTest1() throws IOException, InterruptedException, StreamException { - TestPinpointServerAcceptor testPinpointServerAcceptor = new TestPinpointServerAcceptor(testServerMessageListenerFactory); - int bindPort = testPinpointServerAcceptor.bind(); + Assertions.assertThrows(StreamException.class, () -> { + TestPinpointServerAcceptor testPinpointServerAcceptor = new TestPinpointServerAcceptor(testServerMessageListenerFactory); + int bindPort = testPinpointServerAcceptor.bind(); - TestPinpointClient testPinpointClient = new TestPinpointClient(); - try { - testPinpointClient.connect(bindPort); + TestPinpointClient testPinpointClient = new TestPinpointClient(); + try { + testPinpointClient.connect(bindPort); - RecordedStreamChannelMessageListener clientListener = new RecordedStreamChannelMessageListener(4); + RecordedStreamChannelMessageListener clientListener = new RecordedStreamChannelMessageListener(4); - testPinpointClient.openStream(new byte[0], clientListener); - } finally { - testPinpointClient.closeAll(); - testPinpointServerAcceptor.close(); - } + testPinpointClient.openStream(new byte[0], clientListener); + } finally { + testPinpointClient.closeAll(); + testPinpointServerAcceptor.close(); + } + }); } @Test @@ -191,7 +192,7 @@ public void streamClosedTest2() throws IOException, InterruptedException, Stream RecordedStreamChannelMessageListener clientListener = new RecordedStreamChannelMessageListener(4); ClientStreamChannel clientStreamChannel = testPinpointClient.openStream(new byte[0], clientListener); - Assert.assertEquals(1, bo.getStreamChannelContextSize()); + Assertions.assertEquals(1, bo.getStreamChannelContextSize()); clientStreamChannel.close(); @@ -203,7 +204,7 @@ public Integer call() throws Exception { } }, is(0)); - Assert.assertEquals(0, bo.getStreamChannelContextSize()); + Assertions.assertEquals(0, bo.getStreamChannelContextSize()); } finally { testPinpointClient.closeAll(); testPinpointServerAcceptor.close(); @@ -213,46 +214,48 @@ public Integer call() throws Exception { // ServerSocket to Client Stream // ServerStreamChannel first close. - @Test(expected = PinpointSocketException.class) + @Test public void streamClosedTest3() throws IOException, InterruptedException, StreamException { - TestPinpointServerAcceptor testPinpointServerAcceptor = new TestPinpointServerAcceptor(testServerMessageListenerFactory); - int bindPort = testPinpointServerAcceptor.bind(); + Assertions.assertThrows(PinpointSocketException.class, () -> { + TestPinpointServerAcceptor testPinpointServerAcceptor = new TestPinpointServerAcceptor(testServerMessageListenerFactory); + int bindPort = testPinpointServerAcceptor.bind(); - SimpleStreamBO bo = new SimpleStreamBO(); + SimpleStreamBO bo = new SimpleStreamBO(); - ServerListener serverStreamChannelMessageHandler = new ServerListener(bo); - TestPinpointClient testPinpointClient = new TestPinpointClient(SimpleMessageListener.INSTANCE, serverStreamChannelMessageHandler); - testPinpointClient.connect(bindPort); - try { - testPinpointServerAcceptor.assertAwaitClientConnected(1000); + ServerListener serverStreamChannelMessageHandler = new ServerListener(bo); + TestPinpointClient testPinpointClient = new TestPinpointClient(SimpleMessageListener.INSTANCE, serverStreamChannelMessageHandler); + testPinpointClient.connect(bindPort); + try { + testPinpointServerAcceptor.assertAwaitClientConnected(1000); - List writableServerList = testPinpointServerAcceptor.getConnectedPinpointSocketList(); - Assert.assertEquals(1, writableServerList.size()); + List writableServerList = testPinpointServerAcceptor.getConnectedPinpointSocketList(); + Assertions.assertEquals(1, writableServerList.size()); - PinpointSocket writableServer = writableServerList.get(0); + PinpointSocket writableServer = writableServerList.get(0); - if (writableServer instanceof PinpointServer) { - RecordedStreamChannelMessageListener clientListener = new RecordedStreamChannelMessageListener(4); + if (writableServer instanceof PinpointServer) { + RecordedStreamChannelMessageListener clientListener = new RecordedStreamChannelMessageListener(4); - ClientStreamChannel clientStreamChannel = ((PinpointServer) writableServer).openStreamAndAwait(new byte[0], clientListener, 3000); + ClientStreamChannel clientStreamChannel = ((PinpointServer) writableServer).openStreamAndAwait(new byte[0], clientListener, 3000); - StreamChannel streamChannel = serverStreamChannelMessageHandler.bo.serverStreamChannelList.get(0); + StreamChannel streamChannel = serverStreamChannelMessageHandler.bo.serverStreamChannelList.get(0); - streamChannel.close(); + streamChannel.close(); - sendRandomBytes(bo); + sendRandomBytes(bo); - Thread.sleep(100); + Thread.sleep(100); - clientStreamChannel.close(); - } else { - Assert.fail(); - } + clientStreamChannel.close(); + } else { + Assertions.fail(); + } - } finally { - testPinpointClient.closeAll(); - testPinpointServerAcceptor.close(); - } + } finally { + testPinpointClient.closeAll(); + testPinpointServerAcceptor.close(); + } + }); } private void sendRandomBytes(SimpleStreamBO bo) { diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/stream/StreamChannelStateCodeTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/stream/StreamChannelStateCodeTest.java index 7b87546a1518..dc56b18dbf99 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/stream/StreamChannelStateCodeTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/stream/StreamChannelStateCodeTest.java @@ -16,10 +16,10 @@ package com.navercorp.pinpoint.rpc.stream; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** @@ -27,11 +27,12 @@ */ public class StreamChannelStateCodeTest { private final Logger logger = LogManager.getLogger(this.getClass()); + @Test public void Initialization_error_EnumSet() { logger.debug("StreamChannelStateCode:{}", StreamChannelStateCode.NEW); - Assert.assertTrue(StreamChannelStateCode.OPEN.canChangeState(StreamChannelStateCode.NEW)); + Assertions.assertTrue(StreamChannelStateCode.OPEN.canChangeState(StreamChannelStateCode.NEW)); } diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/stream/StreamChannelStateTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/stream/StreamChannelStateTest.java index 0715fffdaa5b..47c3c69f877d 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/stream/StreamChannelStateTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/stream/StreamChannelStateTest.java @@ -16,67 +16,66 @@ package com.navercorp.pinpoint.rpc.stream; -import org.junit.Assert; - -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class StreamChannelStateTest { @Test public void functionTest1() { StreamChannelState state = new StreamChannelState(); - Assert.assertEquals(StreamChannelStateCode.NEW, state.getCurrentState()); + Assertions.assertEquals(StreamChannelStateCode.NEW, state.getCurrentState()); state.to(StreamChannelStateCode.OPEN); - Assert.assertEquals(StreamChannelStateCode.OPEN, state.getCurrentState()); + Assertions.assertEquals(StreamChannelStateCode.OPEN, state.getCurrentState()); state.to(StreamChannelStateCode.CONNECT_AWAIT); - Assert.assertEquals(StreamChannelStateCode.CONNECT_AWAIT, state.getCurrentState()); + Assertions.assertEquals(StreamChannelStateCode.CONNECT_AWAIT, state.getCurrentState()); state.to(StreamChannelStateCode.CONNECTED); - Assert.assertEquals(StreamChannelStateCode.CONNECTED, state.getCurrentState()); + Assertions.assertEquals(StreamChannelStateCode.CONNECTED, state.getCurrentState()); state.to(StreamChannelStateCode.CLOSED); - Assert.assertEquals(StreamChannelStateCode.CLOSED, state.getCurrentState()); + Assertions.assertEquals(StreamChannelStateCode.CLOSED, state.getCurrentState()); } @Test public void functionTest2() { StreamChannelState state = new StreamChannelState(); - Assert.assertEquals(StreamChannelStateCode.NEW, state.getCurrentState()); + Assertions.assertEquals(StreamChannelStateCode.NEW, state.getCurrentState()); state.to(StreamChannelStateCode.OPEN); - Assert.assertEquals(StreamChannelStateCode.OPEN, state.getCurrentState()); + Assertions.assertEquals(StreamChannelStateCode.OPEN, state.getCurrentState()); state.to(StreamChannelStateCode.CONNECT_ARRIVED); - Assert.assertEquals(StreamChannelStateCode.CONNECT_ARRIVED, state.getCurrentState()); + Assertions.assertEquals(StreamChannelStateCode.CONNECT_ARRIVED, state.getCurrentState()); state.to(StreamChannelStateCode.CONNECTED); - Assert.assertEquals(StreamChannelStateCode.CONNECTED, state.getCurrentState()); + Assertions.assertEquals(StreamChannelStateCode.CONNECTED, state.getCurrentState()); state.to(StreamChannelStateCode.CLOSED); - Assert.assertEquals(StreamChannelStateCode.CLOSED, state.getCurrentState()); + Assertions.assertEquals(StreamChannelStateCode.CLOSED, state.getCurrentState()); } @Test public void functionTest3() { StreamChannelState state = new StreamChannelState(); - Assert.assertEquals(StreamChannelStateCode.NEW, state.getCurrentState()); + Assertions.assertEquals(StreamChannelStateCode.NEW, state.getCurrentState()); boolean result = state.to(StreamChannelStateCode.CONNECTED); - Assert.assertFalse(result); + Assertions.assertFalse(result); } @Test public void functionTest4() { StreamChannelState state = new StreamChannelState(); - Assert.assertEquals(StreamChannelStateCode.NEW, state.getCurrentState()); + Assertions.assertEquals(StreamChannelStateCode.NEW, state.getCurrentState()); state.to(StreamChannelStateCode.OPEN); - Assert.assertEquals(StreamChannelStateCode.OPEN, state.getCurrentState()); + Assertions.assertEquals(StreamChannelStateCode.OPEN, state.getCurrentState()); boolean result = state.to(StreamChannelStateCode.CONNECTED); - Assert.assertFalse(result); + Assertions.assertFalse(result); } } diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/stream/StreamChannelTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/stream/StreamChannelTest.java index 14b4cc9f0133..c803cfc52fdb 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/stream/StreamChannelTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/stream/StreamChannelTest.java @@ -17,10 +17,9 @@ package com.navercorp.pinpoint.rpc.stream; import com.navercorp.pinpoint.rpc.RecordedStreamChannelMessageListener; - import org.jboss.netty.channel.Channel; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; /** @@ -34,26 +33,28 @@ public void stateChangeTest() throws Exception { NettyClientStreamChannel sc = new NettyClientStreamChannel(mockChannel, 1, new StreamChannelRepository(), new RecordedStreamChannelMessageListener(0)); sc.init(); - Assert.assertEquals(StreamChannelStateCode.OPEN, sc.getCurrentState()); + Assertions.assertEquals(StreamChannelStateCode.OPEN, sc.getCurrentState()); boolean isChanged = sc.changeStateConnected(); - Assert.assertFalse(isChanged); - Assert.assertEquals(StreamChannelStateCode.ILLEGAL_STATE, sc.getCurrentState()); + Assertions.assertFalse(isChanged); + Assertions.assertEquals(StreamChannelStateCode.ILLEGAL_STATE, sc.getCurrentState()); } - @Test(expected = StreamException.class) + @Test public void testName() throws Exception { - Channel mockChannel = Mockito.mock(Channel.class); - Mockito.when(mockChannel.write(Mockito.any())).thenReturn(null); + Assertions.assertThrows(StreamException.class, () -> { + Channel mockChannel = Mockito.mock(Channel.class); + Mockito.when(mockChannel.write(Mockito.any())).thenReturn(null); - RecordedStreamChannelMessageListener recordEventHandler = new RecordedStreamChannelMessageListener(0); + RecordedStreamChannelMessageListener recordEventHandler = new RecordedStreamChannelMessageListener(0); - NettyClientStreamChannel sc = new NettyClientStreamChannel(mockChannel, 1, new StreamChannelRepository(), recordEventHandler); + NettyClientStreamChannel sc = new NettyClientStreamChannel(mockChannel, 1, new StreamChannelRepository(), recordEventHandler); - sc.init(); - Assert.assertEquals(StreamChannelStateCode.OPEN, recordEventHandler.getCurrentState()); + sc.init(); + Assertions.assertEquals(StreamChannelStateCode.OPEN, recordEventHandler.getCurrentState()); - sc.connectAndAwait(new byte[0], 3000); + sc.connectAndAwait(new byte[0], 3000); + }); } } diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/util/CopyUtilsTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/util/CopyUtilsTest.java index 1cb7faeac819..a969f9aca91c 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/util/CopyUtilsTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/util/CopyUtilsTest.java @@ -16,14 +16,12 @@ package com.navercorp.pinpoint.rpc.util; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + import java.util.HashMap; import java.util.Map; -import org.junit.Assert; - -import org.junit.Test; - - public class CopyUtilsTest { @Test @@ -31,16 +29,16 @@ public void copyUtilsTest() { Map original = createSimpleMap("key", 2); Map copied = CopyUtils.mediumCopyMap(original); - Assert.assertEquals(2, copied.get("key")); - Assert.assertEquals(2, original.get("key")); + Assertions.assertEquals(2, copied.get("key")); + Assertions.assertEquals(2, original.get("key")); original.put("key", 4); copied.put("key", 3); copied.put("new", "new"); - Assert.assertEquals(3, copied.get("key")); - Assert.assertEquals("new", copied.get("new")); - Assert.assertEquals(4, original.get("key")); + Assertions.assertEquals(3, copied.get("key")); + Assertions.assertEquals("new", copied.get("new")); + Assertions.assertEquals(4, original.get("key")); } @Test @@ -52,10 +50,10 @@ public void copyUtilsTest2() { Map copied = CopyUtils.mediumCopyMap(original); - Assert.assertEquals(2, copied.get("key")); - Assert.assertEquals("inner", ((Map) copied.get("map")).get("innerKey")); - Assert.assertEquals(2, original.get("key")); - Assert.assertEquals("inner", ((Map) original.get("map")).get("innerKey")); + Assertions.assertEquals(2, copied.get("key")); + Assertions.assertEquals("inner", ((Map) copied.get("map")).get("innerKey")); + Assertions.assertEquals(2, original.get("key")); + Assertions.assertEquals("inner", ((Map) original.get("map")).get("innerKey")); original.put("key", 3); copied.put("key", 4); @@ -64,12 +62,12 @@ public void copyUtilsTest2() { Map copiedInnerMap = (Map) copied.get("map"); copiedInnerMap.put("test", "test"); - Assert.assertEquals(4, copied.get("key")); - Assert.assertEquals("inner", ((Map) copied.get("map")).get("innerKey")); - Assert.assertEquals("test", ((Map) copied.get("map")).get("test")); - Assert.assertEquals(3, original.get("key")); - Assert.assertEquals("key", ((Map) original.get("map")).get("innerKey")); - Assert.assertFalse(((Map) original.get("map")).containsKey("test")); + Assertions.assertEquals(4, copied.get("key")); + Assertions.assertEquals("inner", ((Map) copied.get("map")).get("innerKey")); + Assertions.assertEquals("test", ((Map) copied.get("map")).get("test")); + Assertions.assertEquals(3, original.get("key")); + Assertions.assertEquals("key", ((Map) original.get("map")).get("innerKey")); + Assertions.assertFalse(((Map) original.get("map")).containsKey("test")); } private Map createSimpleMap(Object key, Object value) { diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/util/IDGeneratorTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/util/IDGeneratorTest.java index e1793107201a..0292da87e36d 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/util/IDGeneratorTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/util/IDGeneratorTest.java @@ -16,11 +16,8 @@ package com.navercorp.pinpoint.rpc.util; -import org.junit.Assert; - -import org.junit.Test; - -import com.navercorp.pinpoint.rpc.util.IDGenerator; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class IDGeneratorTest { @@ -28,15 +25,15 @@ public class IDGeneratorTest { public void generatorTest() { IDGenerator generator = new IDGenerator(); - Assert.assertEquals(1, generator.generate()); - Assert.assertEquals(2, generator.generate()); - Assert.assertEquals(3, generator.generate()); + Assertions.assertEquals(1, generator.generate()); + Assertions.assertEquals(2, generator.generate()); + Assertions.assertEquals(3, generator.generate()); generator = new IDGenerator(2, 3); - Assert.assertEquals(2, generator.generate()); - Assert.assertEquals(5, generator.generate()); - Assert.assertEquals(8, generator.generate()); + Assertions.assertEquals(2, generator.generate()); + Assertions.assertEquals(5, generator.generate()); + Assertions.assertEquals(8, generator.generate()); } } diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/util/ListUtilsTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/util/ListUtilsTest.java index 8c1f55635823..cbcf0ea20465 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/util/ListUtilsTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/util/ListUtilsTest.java @@ -15,10 +15,10 @@ */ package com.navercorp.pinpoint.rpc.util; -import java.util.ArrayList; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import org.junit.Assert; -import org.junit.Test; +import java.util.ArrayList; public class ListUtilsTest { @@ -26,25 +26,25 @@ public class ListUtilsTest { public void testAddIfValueNotNull() { ArrayList strings = new ArrayList<>(); - Assert.assertTrue(ListUtils.addIfValueNotNull(strings, "foo")); - Assert.assertEquals("foo", strings.get(0)); + Assertions.assertTrue(ListUtils.addIfValueNotNull(strings, "foo")); + Assertions.assertEquals("foo", strings.get(0)); - Assert.assertFalse(ListUtils.addIfValueNotNull(strings, null)); + Assertions.assertFalse(ListUtils.addIfValueNotNull(strings, null)); } @Test public void testAddAllIfAllValuesNotNull() { ArrayList strings = new ArrayList<>(); - Assert.assertTrue( + Assertions.assertTrue( ListUtils.addAllIfAllValuesNotNull( strings, new String[]{"a", "b", "c"})); - Assert.assertEquals("a", strings.get(0)); - Assert.assertEquals("b", strings.get(1)); - Assert.assertEquals("c", strings.get(2)); + Assertions.assertEquals("a", strings.get(0)); + Assertions.assertEquals("b", strings.get(1)); + Assertions.assertEquals("c", strings.get(2)); - Assert.assertFalse(ListUtils.addAllIfAllValuesNotNull(strings, null)); - Assert.assertFalse(ListUtils + Assertions.assertFalse(ListUtils.addAllIfAllValuesNotNull(strings, null)); + Assertions.assertFalse(ListUtils .addAllIfAllValuesNotNull(strings, new String[]{null})); } @@ -52,18 +52,18 @@ public void testAddAllIfAllValuesNotNull() { public void testGetFirst() { ArrayList strings = new ArrayList<>(); - Assert.assertNull(ListUtils.getFirst(null)); - Assert.assertNull(ListUtils.getFirst(strings)); + Assertions.assertNull(ListUtils.getFirst(null)); + Assertions.assertNull(ListUtils.getFirst(strings)); - Assert.assertEquals("dValue", ListUtils.getFirst(null, "dValue")); - Assert.assertEquals("dValue", ListUtils.getFirst(strings, "dValue")); + Assertions.assertEquals("dValue", ListUtils.getFirst(null, "dValue")); + Assertions.assertEquals("dValue", ListUtils.getFirst(strings, "dValue")); strings.add("foo"); strings.add("bar"); strings.add("baz"); - Assert.assertEquals("foo", ListUtils.getFirst(strings)); - Assert.assertEquals("foo", ListUtils.getFirst(strings, "dValue")); + Assertions.assertEquals("foo", ListUtils.getFirst(strings)); + Assertions.assertEquals("foo", ListUtils.getFirst(strings, "dValue")); } @Test @@ -73,10 +73,10 @@ public void testIsFirst() { strings.add("bar"); strings.add("baz"); - Assert.assertTrue(ListUtils.isFirst(null, null)); - Assert.assertTrue(ListUtils.isFirst(strings, "foo")); + Assertions.assertTrue(ListUtils.isFirst(null, null)); + Assertions.assertTrue(ListUtils.isFirst(strings, "foo")); - Assert.assertFalse(ListUtils.isFirst(strings, "bar")); + Assertions.assertFalse(ListUtils.isFirst(strings, "bar")); } @Test @@ -86,27 +86,27 @@ public void testGet() { strings.add("bar"); strings.add("baz"); - Assert.assertEquals("foo", ListUtils.get(strings, 0, "dValue")); - Assert.assertEquals("bar", ListUtils.get(strings, 1, "dValue")); - Assert.assertEquals("dValue", ListUtils.get(null, 0, "dValue")); + Assertions.assertEquals("foo", ListUtils.get(strings, 0, "dValue")); + Assertions.assertEquals("bar", ListUtils.get(strings, 1, "dValue")); + Assertions.assertEquals("dValue", ListUtils.get(null, 0, "dValue")); } @Test public void testGetLast() { ArrayList strings = new ArrayList<>(); - Assert.assertNull(ListUtils.getLast(null)); - Assert.assertNull(ListUtils.getLast(strings)); + Assertions.assertNull(ListUtils.getLast(null)); + Assertions.assertNull(ListUtils.getLast(strings)); - Assert.assertEquals("dValue", ListUtils.getLast(null, "dValue")); - Assert.assertEquals("dValue", ListUtils.getLast(strings, "dValue")); + Assertions.assertEquals("dValue", ListUtils.getLast(null, "dValue")); + Assertions.assertEquals("dValue", ListUtils.getLast(strings, "dValue")); strings.add("foo"); strings.add("bar"); strings.add("baz"); - Assert.assertEquals("baz", ListUtils.getLast(strings)); - Assert.assertEquals("baz", ListUtils.getLast(strings, "dValue")); + Assertions.assertEquals("baz", ListUtils.getLast(strings)); + Assertions.assertEquals("baz", ListUtils.getLast(strings, "dValue")); } @Test @@ -116,10 +116,10 @@ public void testIsLast() { strings.add("bar"); strings.add("baz"); - Assert.assertTrue(ListUtils.isLast(null, null)); - Assert.assertTrue(ListUtils.isLast(strings, "baz")); + Assertions.assertTrue(ListUtils.isLast(null, null)); + Assertions.assertTrue(ListUtils.isLast(strings, "baz")); - Assert.assertFalse(ListUtils.isLast(strings, "foo")); - Assert.assertFalse(ListUtils.isLast(strings, "bar")); + Assertions.assertFalse(ListUtils.isLast(strings, "foo")); + Assertions.assertFalse(ListUtils.isLast(strings, "bar")); } } diff --git a/rpc/src/test/java/com/navercorp/pinpoint/rpc/util/MapUtilsTest.java b/rpc/src/test/java/com/navercorp/pinpoint/rpc/util/MapUtilsTest.java index 3342a4ced209..777d8ad2872c 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/rpc/util/MapUtilsTest.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/rpc/util/MapUtilsTest.java @@ -15,10 +15,10 @@ */ package com.navercorp.pinpoint.rpc.util; -import java.util.HashMap; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import org.junit.Assert; -import org.junit.Test; +import java.util.HashMap; public class MapUtilsTest { @@ -29,15 +29,15 @@ public void testGetString() { hashMap.put("bar", "222"); hashMap.put(1, "333"); - Assert.assertNull(MapUtils.getString(null, "foo")); - Assert.assertNull(MapUtils.getString(hashMap, "1")); + Assertions.assertNull(MapUtils.getString(null, "foo")); + Assertions.assertNull(MapUtils.getString(hashMap, "1")); - Assert.assertEquals("222", MapUtils.getString(hashMap, "bar")); - Assert.assertEquals("222", + Assertions.assertEquals("222", MapUtils.getString(hashMap, "bar")); + Assertions.assertEquals("222", MapUtils.getString(hashMap, "bar", "dValue")); - Assert.assertEquals("dValue", + Assertions.assertEquals("dValue", MapUtils.getString(null, "foo", "dValue")); - Assert.assertEquals("dValue", + Assertions.assertEquals("dValue", MapUtils.getString(hashMap, "1", "dValue")); } @@ -47,13 +47,13 @@ public void testGetBoolean() { hashMap.put("foo", true); hashMap.put("bar", "111"); - Assert.assertTrue(MapUtils.getBoolean(hashMap, "foo")); - Assert.assertTrue(MapUtils.getBoolean(hashMap, "foo", true)); - Assert.assertTrue(MapUtils.getBoolean(null, "foo", true)); - Assert.assertTrue(MapUtils.getBoolean(hashMap, "bar", true)); + Assertions.assertTrue(MapUtils.getBoolean(hashMap, "foo")); + Assertions.assertTrue(MapUtils.getBoolean(hashMap, "foo", true)); + Assertions.assertTrue(MapUtils.getBoolean(null, "foo", true)); + Assertions.assertTrue(MapUtils.getBoolean(hashMap, "bar", true)); - Assert.assertFalse(MapUtils.getBoolean(null, "foo")); - Assert.assertFalse(MapUtils.getBoolean(hashMap, "bar")); + Assertions.assertFalse(MapUtils.getBoolean(null, "foo")); + Assertions.assertFalse(MapUtils.getBoolean(hashMap, "bar")); } @Test @@ -63,16 +63,16 @@ public void testGetInteger() { hashMap.put("bar", "222"); hashMap.put("baz", 333); - Assert.assertNull(MapUtils.getInteger(null, "foo")); - Assert.assertNull(MapUtils.getInteger(hashMap, "bar")); + Assertions.assertNull(MapUtils.getInteger(null, "foo")); + Assertions.assertNull(MapUtils.getInteger(hashMap, "bar")); - Assert.assertEquals(new Integer(333), + Assertions.assertEquals(new Integer(333), MapUtils.getInteger(hashMap, "baz")); - Assert.assertEquals(new Integer(333), + Assertions.assertEquals(new Integer(333), MapUtils.getInteger(hashMap, "baz", 88)); - Assert.assertEquals(new Integer(88), + Assertions.assertEquals(new Integer(88), MapUtils.getInteger(null, "foo", 88)); - Assert.assertEquals(new Integer(88), + Assertions.assertEquals(new Integer(88), MapUtils.getInteger(hashMap, "bar", 88)); } @@ -83,12 +83,12 @@ public void testGetLong() { hashMap.put("bar", "222"); hashMap.put("baz", 2L); - Assert.assertNull(MapUtils.getLong(null, "foo")); - Assert.assertNull(MapUtils.getLong(hashMap, "bar")); + Assertions.assertNull(MapUtils.getLong(null, "foo")); + Assertions.assertNull(MapUtils.getLong(hashMap, "bar")); - Assert.assertEquals(2L, MapUtils.getLong(hashMap, "baz"), 0); - Assert.assertEquals(2L, MapUtils.getLong(hashMap, "baz", 88L), 0); - Assert.assertEquals(88L, MapUtils.getLong(null, "foo", 88L), 0); - Assert.assertEquals(88L, MapUtils.getLong(hashMap, "bar", 88L), 0); + Assertions.assertEquals(2L, MapUtils.getLong(hashMap, "baz"), 0); + Assertions.assertEquals(2L, MapUtils.getLong(hashMap, "baz", 88L), 0); + Assertions.assertEquals(88L, MapUtils.getLong(null, "foo", 88L), 0); + Assertions.assertEquals(88L, MapUtils.getLong(hashMap, "bar", 88L), 0); } } diff --git a/rpc/src/test/java/com/navercorp/pinpoint/test/server/TestServerMessageListenerFactory.java b/rpc/src/test/java/com/navercorp/pinpoint/test/server/TestServerMessageListenerFactory.java index fa6f151c424f..6326b20f6d74 100644 --- a/rpc/src/test/java/com/navercorp/pinpoint/test/server/TestServerMessageListenerFactory.java +++ b/rpc/src/test/java/com/navercorp/pinpoint/test/server/TestServerMessageListenerFactory.java @@ -24,10 +24,10 @@ import com.navercorp.pinpoint.rpc.server.PinpointServer; import com.navercorp.pinpoint.rpc.server.ServerMessageListener; import com.navercorp.pinpoint.rpc.server.ServerMessageListenerFactory; -import org.awaitility.Awaitility; -import org.junit.Assert; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.awaitility.Awaitility; +import org.junit.jupiter.api.Assertions; import java.util.Map; import java.util.Objects; @@ -162,7 +162,7 @@ private void awaitAssertExpectedCount(int expectedCount, AtomicInteger handlePin Awaitility.waitAtMost(maxWaitTime, TimeUnit.MILLISECONDS) .untilAtomic(handlePingCount, is(expectedCount)); } else { - Assert.assertTrue(expectedCount == handlePingCount.get()); + Assertions.assertTrue(expectedCount == handlePingCount.get()); } } diff --git a/test/src/test/java/com/navercorp/pinpoint/test/plugin/DependencyResolverTest.java b/test/src/test/java/com/navercorp/pinpoint/test/plugin/DependencyResolverTest.java index ab195cc75c0a..bd18d24b30c4 100644 --- a/test/src/test/java/com/navercorp/pinpoint/test/plugin/DependencyResolverTest.java +++ b/test/src/test/java/com/navercorp/pinpoint/test/plugin/DependencyResolverTest.java @@ -3,9 +3,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -14,22 +14,21 @@ */ package com.navercorp.pinpoint.test.plugin; -import static org.junit.Assert.*; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.eclipse.aether.artifact.Artifact; +import org.eclipse.aether.resolution.ArtifactResolutionException; +import org.eclipse.aether.resolution.DependencyResolutionException; +import org.junit.jupiter.api.Test; import java.io.File; import java.util.List; import java.util.Map; -import org.eclipse.aether.artifact.Artifact; -import org.eclipse.aether.resolution.ArtifactResolutionException; -import org.eclipse.aether.resolution.DependencyResolutionException; -import org.junit.Test; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; +import static org.junit.jupiter.api.Assertions.assertFalse; /** * @author Jongho Moon - * */ public class DependencyResolverTest { private final Logger logger = LogManager.getLogger(this.getClass()); @@ -40,7 +39,7 @@ public void test() { DependencyResolver resolver = factory.get(); resolver.resolveDependencySets("junit:junit:[4.12,4.13)"); } - + @Test public void testClassifier() { DependencyResolverFactory factory = new DependencyResolverFactory(); diff --git a/test/src/test/java/com/navercorp/pinpoint/test/plugin/ExceptionReaderTest.java b/test/src/test/java/com/navercorp/pinpoint/test/plugin/ExceptionReaderTest.java index e3b639149e64..44543d0edf8c 100644 --- a/test/src/test/java/com/navercorp/pinpoint/test/plugin/ExceptionReaderTest.java +++ b/test/src/test/java/com/navercorp/pinpoint/test/plugin/ExceptionReaderTest.java @@ -1,9 +1,9 @@ package com.navercorp.pinpoint.test.plugin; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.List; @@ -27,9 +27,9 @@ public void test() { Exception readException = reader.read(parsedMessage[1], parsedMessage[2], error); logger.debug("reader", readException); - Assert.assertEquals(getExceptionClass(readException), RuntimeException.class.getName()); + Assertions.assertEquals(getExceptionClass(readException), RuntimeException.class.getName()); Throwable cause = readException.getCause(); - Assert.assertEquals(getExceptionClass(cause), Exception.class.getName()); + Assertions.assertEquals(getExceptionClass(cause), Exception.class.getName()); } diff --git a/test/src/test/java/com/navercorp/pinpoint/test/plugin/LibraryFinderTest.java b/test/src/test/java/com/navercorp/pinpoint/test/plugin/LibraryFinderTest.java index 587731cb2c31..bd3bbfe15587 100644 --- a/test/src/test/java/com/navercorp/pinpoint/test/plugin/LibraryFinderTest.java +++ b/test/src/test/java/com/navercorp/pinpoint/test/plugin/LibraryFinderTest.java @@ -1,9 +1,8 @@ package com.navercorp.pinpoint.test.plugin; import com.navercorp.pinpoint.common.Version; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.File; import java.net.MalformedURLException; @@ -36,7 +35,7 @@ public void filter() throws MalformedURLException { result.add(Paths.get(url.getPath())); } } - Assert.assertEquals(2, result.size()); + Assertions.assertEquals(2, result.size()); } @Test @@ -48,15 +47,15 @@ public void globTest() throws MalformedURLException { String matchPath = "pinpoint-*-plugin-" + Version.VERSION + ".jar"; Path result = globMatches(jarPath, matchPath); - Assert.assertNull(result); + Assertions.assertNull(result); matchPath = "*" + File.separator + "pinpoint-*-plugin-" + Version.VERSION + ".jar"; result = globMatches(jarPath, matchPath); - Assert.assertNull(result); + Assertions.assertNull(result); matchPath = "**" + File.separator + "pinpoint-*-plugin-" + Version.VERSION + ".jar"; result = globMatches(jarPath, matchPath); - Assert.assertEquals(Paths.get(jarPath), result); + Assertions.assertEquals(Paths.get(jarPath), result); } private Path globMatches(String jarPath, String matchPath) throws MalformedURLException { diff --git a/test/src/test/java/com/navercorp/pinpoint/test/plugin/MavenCentralTest.java b/test/src/test/java/com/navercorp/pinpoint/test/plugin/MavenCentralTest.java index bfe6f85956ff..385fabe6bd36 100644 --- a/test/src/test/java/com/navercorp/pinpoint/test/plugin/MavenCentralTest.java +++ b/test/src/test/java/com/navercorp/pinpoint/test/plugin/MavenCentralTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.test.plugin; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -26,6 +26,6 @@ public class MavenCentralTest { @Test public void getAddress() { - Assert.assertEquals(MavenCentral.MAVEN_CENTRAL_SECURE, MavenCentral.getAddress()); + Assertions.assertEquals(MavenCentral.MAVEN_CENTRAL_SECURE, MavenCentral.getAddress()); } } \ No newline at end of file diff --git a/test/src/test/java/com/navercorp/pinpoint/test/plugin/shared/ReflectionDependencyResolverTest.java b/test/src/test/java/com/navercorp/pinpoint/test/plugin/shared/ReflectionDependencyResolverTest.java index aa7503e71a33..241364c011d1 100644 --- a/test/src/test/java/com/navercorp/pinpoint/test/plugin/shared/ReflectionDependencyResolverTest.java +++ b/test/src/test/java/com/navercorp/pinpoint/test/plugin/shared/ReflectionDependencyResolverTest.java @@ -16,12 +16,10 @@ package com.navercorp.pinpoint.test.plugin.shared; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.File; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -35,6 +33,6 @@ public class ReflectionDependencyResolverTest { public void get() throws Exception { ReflectionDependencyResolver dependencyResolver = new ReflectionDependencyResolver(Thread.currentThread().getContextClassLoader(), new String[]{}); List files = dependencyResolver.lookup(Collections.singletonList("commons-logging:commons-logging:1.2")); - Assert.assertEquals(files.size(), 1); + Assertions.assertEquals(files.size(), 1); } } \ No newline at end of file diff --git a/test/src/test/java/com/navercorp/pinpoint/test/plugin/shared/SharedTestBeforeAllInvokerTest.java b/test/src/test/java/com/navercorp/pinpoint/test/plugin/shared/SharedTestBeforeAllInvokerTest.java index e79b8116799f..01cbaee0bb7c 100644 --- a/test/src/test/java/com/navercorp/pinpoint/test/plugin/shared/SharedTestBeforeAllInvokerTest.java +++ b/test/src/test/java/com/navercorp/pinpoint/test/plugin/shared/SharedTestBeforeAllInvokerTest.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.test.plugin.shared; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.lang.reflect.Method; import java.util.List; @@ -14,11 +14,11 @@ public void invoke() throws Throwable { SharedTestBeforeAllInvoker mock = new SharedTestBeforeAllInvoker(TestClass.class); List methods = mock.getMethods(TestClass.class, mock::beforeAllFilter); - Assert.assertEquals(1, methods.size()); - Assert.assertEquals("setBeforeAllResult", methods.get(0).getName()); + Assertions.assertEquals(1, methods.size()); + Assertions.assertEquals("setBeforeAllResult", methods.get(0).getName()); mock.invoke(new Properties()); - Assert.assertNotNull(TestClass.properties); + Assertions.assertNotNull(TestClass.properties); } @Test @@ -26,11 +26,11 @@ public void invoke_extends() throws Throwable { SharedTestBeforeAllInvoker mock = new SharedTestBeforeAllInvoker(ChildTestClass.class); List methods = mock.getMethods(ChildTestClass.class, mock::beforeAllFilter); - Assert.assertEquals(1, methods.size()); - Assert.assertEquals("setBeforeAllResult", methods.get(0).getName()); + Assertions.assertEquals(1, methods.size()); + Assertions.assertEquals("setBeforeAllResult", methods.get(0).getName()); mock.invoke(new Properties()); - Assert.assertNotNull(ChildTestClass.properties); + Assertions.assertNotNull(ChildTestClass.properties); } public static class TestClass { diff --git a/test/src/test/java/com/navercorp/pinpoint/test/plugin/shared/TestParameterParserTest.java b/test/src/test/java/com/navercorp/pinpoint/test/plugin/shared/TestParameterParserTest.java index c7e9575981f3..0735df39e839 100644 --- a/test/src/test/java/com/navercorp/pinpoint/test/plugin/shared/TestParameterParserTest.java +++ b/test/src/test/java/com/navercorp/pinpoint/test/plugin/shared/TestParameterParserTest.java @@ -16,13 +16,12 @@ package com.navercorp.pinpoint.test.plugin.shared; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; - /** * @author Woonduk Kang(emeroad) */ @@ -32,9 +31,9 @@ public class TestParameterParserTest { public void parse() { TestParameterParser parser = new TestParameterParser(); List parameters = parser.parse(new String[] {"testId=dependency1"}); - Assert.assertEquals(parameters.size(), 1); + Assertions.assertEquals(parameters.size(), 1); TestParameter one = parameters.get(0); - Assert.assertEquals(one.getTestId(), "testId" ); - Assert.assertEquals(one.getMavenDependencies(), Arrays.asList("dependency1") ); + Assertions.assertEquals(one.getTestId(), "testId" ); + Assertions.assertEquals(one.getMavenDependencies(), Arrays.asList("dependency1") ); } } \ No newline at end of file diff --git a/test/src/test/java/com/navercorp/pinpoint/test/plugin/util/StringUtilsTest.java b/test/src/test/java/com/navercorp/pinpoint/test/plugin/util/StringUtilsTest.java index 3c16cae9647d..951fb9d2b074 100644 --- a/test/src/test/java/com/navercorp/pinpoint/test/plugin/util/StringUtilsTest.java +++ b/test/src/test/java/com/navercorp/pinpoint/test/plugin/util/StringUtilsTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.test.plugin.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -29,6 +29,6 @@ public class StringUtilsTest { @Test public void join() { String join = StringUtils.join(Arrays.asList("1", "2"), ","); - Assert.assertEquals(join, "1,2"); + Assertions.assertEquals(join, "1,2"); } } \ No newline at end of file diff --git a/test/src/test/java/com/navercorp/pinpoint/test/plugin/util/TestPluginVersionTest.java b/test/src/test/java/com/navercorp/pinpoint/test/plugin/util/TestPluginVersionTest.java index 5a1a5d0ef9df..2f8e9c650c78 100644 --- a/test/src/test/java/com/navercorp/pinpoint/test/plugin/util/TestPluginVersionTest.java +++ b/test/src/test/java/com/navercorp/pinpoint/test/plugin/util/TestPluginVersionTest.java @@ -1,11 +1,13 @@ package com.navercorp.pinpoint.test.plugin.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertNotNull; public class TestPluginVersionTest { @Test public void test() { - org.junit.Assert.assertNotNull(TestPluginVersion.getVersion()); + assertNotNull(TestPluginVersion.getVersion()); } } \ No newline at end of file diff --git a/thrift/src/test/java/com/navercorp/pinpoint/io/util/TypeLocatorBuilderTest.java b/thrift/src/test/java/com/navercorp/pinpoint/io/util/TypeLocatorBuilderTest.java index 532a27f263a7..69b883afbd89 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/io/util/TypeLocatorBuilderTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/io/util/TypeLocatorBuilderTest.java @@ -19,10 +19,8 @@ import com.navercorp.pinpoint.thrift.dto.TSpan; import com.navercorp.pinpoint.thrift.dto.TSpanEvent; import org.apache.thrift.TBase; -import org.junit.Assert; -import org.junit.Test; - -import static org.junit.Assert.*; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -48,51 +46,53 @@ public void addBodyFactory() { }); TypeLocator> build = typeLocatorBuilder.build(); - Assert.assertNotNull(build.bodyLookup((short) 1)); - Assert.assertNull(build.bodyLookup((short) 5)); + Assertions.assertNotNull(build.bodyLookup((short) 1)); + Assertions.assertNull(build.bodyLookup((short) 5)); - Assert.assertEquals(build.headerLookup((short) 1).getType(), 1); - Assert.assertEquals(build.headerLookup((short) 3).getType(), 3); + Assertions.assertEquals(build.headerLookup((short) 1).getType(), 1); + Assertions.assertEquals(build.headerLookup((short) 3).getType(), 3); } - @Test(expected = IllegalStateException.class) + @Test public void addBodyFactory_duplicated_type_code() { - TypeLocatorBuilder> typeLocatorBuilder = new TypeLocatorBuilder>(); - - typeLocatorBuilder.addBodyFactory((short) 1, new BodyFactory>() { - @Override - public TBase getObject() { - return new TSpan(); - } + Assertions.assertThrows(IllegalStateException.class, () -> { + TypeLocatorBuilder> typeLocatorBuilder = new TypeLocatorBuilder>(); + + typeLocatorBuilder.addBodyFactory((short) 1, new BodyFactory>() { + @Override + public TBase getObject() { + return new TSpan(); + } + }); + + typeLocatorBuilder.addBodyFactory((short) 1, new BodyFactory>() { + @Override + public TBase getObject() { + return new TSpanEvent(); + } + }); }); - - typeLocatorBuilder.addBodyFactory((short) 1, new BodyFactory>() { - @Override - public TBase getObject() { - return new TSpanEvent(); - } - }); - } - @Test(expected = IllegalStateException.class) + @Test public void addBodyFactory_duplicated_body_class() { - TypeLocatorBuilder> typeLocatorBuilder = new TypeLocatorBuilder>(); - - typeLocatorBuilder.addBodyFactory((short) 1, new BodyFactory>() { - @Override - public TBase getObject() { - return new TSpan(); - } + Assertions.assertThrows(IllegalStateException.class, () -> { + TypeLocatorBuilder> typeLocatorBuilder = new TypeLocatorBuilder>(); + + typeLocatorBuilder.addBodyFactory((short) 1, new BodyFactory>() { + @Override + public TBase getObject() { + return new TSpan(); + } + }); + + typeLocatorBuilder.addBodyFactory((short) 3, new BodyFactory>() { + @Override + public TBase getObject() { + return new TSpan(); + } + }); }); - - typeLocatorBuilder.addBodyFactory((short) 3, new BodyFactory>() { - @Override - public TBase getObject() { - return new TSpan(); - } - }); - } } \ No newline at end of file diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/dto/SpanVersionTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/dto/SpanVersionTest.java index d7a520d23e5b..290685220331 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/dto/SpanVersionTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/dto/SpanVersionTest.java @@ -17,8 +17,8 @@ package com.navercorp.pinpoint.thrift.dto; import com.navercorp.pinpoint.io.SpanVersion; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -27,10 +27,10 @@ public class SpanVersionTest { @Test public void supportedVersionRange() { - Assert.assertTrue(SpanVersion.supportedVersionRange(SpanVersion.TRACE_V1)); - Assert.assertTrue(SpanVersion.supportedVersionRange(SpanVersion.TRACE_V2)); + Assertions.assertTrue(SpanVersion.supportedVersionRange(SpanVersion.TRACE_V1)); + Assertions.assertTrue(SpanVersion.supportedVersionRange(SpanVersion.TRACE_V2)); - Assert.assertFalse(SpanVersion.supportedVersionRange((byte) -1)); - Assert.assertFalse(SpanVersion.supportedVersionRange((byte) 100)); + Assertions.assertFalse(SpanVersion.supportedVersionRange((byte) -1)); + Assertions.assertFalse(SpanVersion.supportedVersionRange((byte) 100)); } } \ No newline at end of file diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/ByteArrayOutputStreamTransportTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/ByteArrayOutputStreamTransportTest.java index 9ebfddb2300e..6719b0da5859 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/ByteArrayOutputStreamTransportTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/ByteArrayOutputStreamTransportTest.java @@ -16,23 +16,23 @@ package com.navercorp.pinpoint.thrift.io; -import static org.junit.Assert.*; +import org.apache.thrift.transport.TTransportException; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; import java.util.Arrays; -import org.apache.thrift.transport.TTransportException; -import org.junit.Before; -import org.junit.Test; - -import com.navercorp.pinpoint.thrift.io.ByteArrayOutputStreamTransport; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class ByteArrayOutputStreamTransportTest { private ByteArrayOutputStream out; private ByteArrayOutputStreamTransport transport; private byte[] buf = "foo".getBytes(); - @Before + @BeforeEach public void before() { out = new ByteArrayOutputStream(); transport = new ByteArrayOutputStreamTransport(out); @@ -54,18 +54,22 @@ public void write() throws TTransportException { public void flush() throws TTransportException { transport.write(buf, 0, buf.length); assertEquals(buf.length, out.size()); - + transport.flush(); assertEquals(0, out.size()); } - @Test(expected = TTransportException.class) + @Test public void read() throws TTransportException { - transport.read(buf, 0, 1); + Assertions.assertThrows(TTransportException.class, () -> { + transport.read(buf, 0, 1); + }); } - @Test(expected = UnsupportedOperationException.class) + @Test public void consumeBuffer() throws TTransportException { - transport.consumeBuffer(1); + Assertions.assertThrows(UnsupportedOperationException.class, () -> { + transport.consumeBuffer(1); + }); } } \ No newline at end of file diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/ChunkHeaderBufferedTBaseSerializerTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/ChunkHeaderBufferedTBaseSerializerTest.java index f034e84ef023..357c5e890f4e 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/ChunkHeaderBufferedTBaseSerializerTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/ChunkHeaderBufferedTBaseSerializerTest.java @@ -16,18 +16,17 @@ package com.navercorp.pinpoint.thrift.io; -import static org.junit.Assert.*; - -import java.util.concurrent.atomic.AtomicInteger; - import com.navercorp.pinpoint.io.util.TypeLocator; +import com.navercorp.pinpoint.thrift.dto.TSpanChunk; import org.apache.thrift.TBase; import org.apache.thrift.TException; import org.apache.thrift.protocol.TCompactProtocol; import org.apache.thrift.protocol.TProtocolFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import com.navercorp.pinpoint.thrift.dto.TSpanChunk; +import java.util.concurrent.atomic.AtomicInteger; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class ChunkHeaderBufferedTBaseSerializerTest { diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/ChunkHeaderTBaseDeserializerTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/ChunkHeaderTBaseDeserializerTest.java index 563901986b3d..aa5e1b3f294a 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/ChunkHeaderTBaseDeserializerTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/ChunkHeaderTBaseDeserializerTest.java @@ -16,18 +16,18 @@ package com.navercorp.pinpoint.thrift.io; -import static org.junit.Assert.*; - -import java.util.List; import com.navercorp.pinpoint.io.request.Message; import com.navercorp.pinpoint.io.util.TypeLocator; +import com.navercorp.pinpoint.thrift.dto.TSpanChunk; import org.apache.thrift.TBase; import org.apache.thrift.protocol.TCompactProtocol; import org.apache.thrift.protocol.TProtocolFactory; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import com.navercorp.pinpoint.thrift.dto.TSpanChunk; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; public class ChunkHeaderTBaseDeserializerTest { private static final TypeLocator> DEFAULT_TBASE_LOCATOR = DefaultTBaseLocator.getTypeLocator(); diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/DefaultTBaseLocatorTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/DefaultTBaseLocatorTest.java index 901fa404cd22..cc7f6465df1a 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/DefaultTBaseLocatorTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/DefaultTBaseLocatorTest.java @@ -18,10 +18,8 @@ import com.navercorp.pinpoint.io.util.TypeLocator; import org.apache.thrift.TBase; -import org.junit.Assert; -import org.junit.Test; - -import static org.junit.Assert.*; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) @@ -31,6 +29,6 @@ public class DefaultTBaseLocatorTest { @Test public void getTypeLocator() { TypeLocator> typeLocator = DefaultTBaseLocator.getTypeLocator(); - Assert.assertNotNull(typeLocator.bodyLookup(DefaultTBaseLocator.SPAN)); + Assertions.assertNotNull(typeLocator.bodyLookup(DefaultTBaseLocator.SPAN)); } } \ No newline at end of file diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/HeaderTBaseDeserializerFactoryTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/HeaderTBaseDeserializerFactoryTest.java index 3b3498a42ce5..cb37ba159597 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/HeaderTBaseDeserializerFactoryTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/HeaderTBaseDeserializerFactoryTest.java @@ -16,11 +16,8 @@ package com.navercorp.pinpoint.thrift.io; -import org.junit.Assert; - -import org.junit.Test; - -import com.navercorp.pinpoint.thrift.io.HeaderTBaseSerializerFactory; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class HeaderTBaseDeserializerFactoryTest { @@ -28,18 +25,18 @@ public class HeaderTBaseDeserializerFactoryTest { public void optionTest1() { HeaderTBaseSerializerFactory factory = new HeaderTBaseSerializerFactory(); - Assert.assertTrue(factory.isSafetyGuaranteed()); + Assertions.assertTrue(factory.isSafetyGuaranteed()); } @Test public void optionTest2() { HeaderTBaseSerializerFactory factory = new HeaderTBaseSerializerFactory(true, 1); - Assert.assertTrue(factory.isSafetyGuaranteed()); + Assertions.assertTrue(factory.isSafetyGuaranteed()); } @Test public void optionTest() { HeaderTBaseSerializerFactory factory = new HeaderTBaseSerializerFactory(false, 1); - Assert.assertFalse(factory.isSafetyGuaranteed()); + Assertions.assertFalse(factory.isSafetyGuaranteed()); } } diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/HeaderTBaseSerializerTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/HeaderTBaseSerializerTest.java index fd5c5689c995..3ff1a6b8b5b6 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/HeaderTBaseSerializerTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/HeaderTBaseSerializerTest.java @@ -18,14 +18,12 @@ import com.navercorp.pinpoint.io.request.Message; import com.navercorp.pinpoint.thrift.dto.TAgentInfo; - - +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TBase; import org.apache.thrift.TException; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -66,7 +64,7 @@ private void test(HeaderTBaseSerializer serializer, HeaderTBaseDeserializer dese TAgentInfo deserialize = (TAgentInfo) message.getData(); logger.debug("deserializer:{}", deserialize.getClass()); - Assert.assertEquals(deserialize, tAgentInfo); + Assertions.assertEquals(deserialize, tAgentInfo); } public void dump(byte[] data) { diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/HeaderTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/HeaderTest.java index fbb98a6b649c..4bedfacff8ba 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/HeaderTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/HeaderTest.java @@ -18,11 +18,9 @@ import com.navercorp.pinpoint.io.header.Header; import com.navercorp.pinpoint.io.header.v1.HeaderV1; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; - - +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; /** * @author emeroad diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/HeaderUtilsTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/HeaderUtilsTest.java index 6209cee1c7ea..2258293e3487 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/HeaderUtilsTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/HeaderUtilsTest.java @@ -19,11 +19,11 @@ import com.navercorp.pinpoint.io.header.Header; import com.navercorp.pinpoint.io.header.InvalidHeaderException; import com.navercorp.pinpoint.io.header.v1.HeaderV1; -import org.apache.thrift.TException; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.thrift.TException; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -35,18 +35,19 @@ public class HeaderUtilsTest { @Test public void validateSignature() throws TException { Header header = new HeaderV1((short) 1); - Assert.assertEquals(HeaderUtils.validateSignature(header.getSignature()), HeaderUtils.OK); + Assertions.assertEquals(HeaderUtils.validateSignature(header.getSignature()), HeaderUtils.OK); logger.debug(header.toString()); } - @Test(expected = InvalidHeaderException.class) + @Test public void validateSignature_error() throws TException { - Header error = new HeaderV1((byte) 0x11, (byte) 0x20, (short) 1); - Assert.assertNotEquals(HeaderUtils.validateSignature(error.getSignature()), HeaderUtils.OK); - + Assertions.assertThrows(InvalidHeaderException.class, () -> { + Header error = new HeaderV1((byte) 0x11, (byte) 0x20, (short) 1); + Assertions.assertNotEquals(HeaderUtils.validateSignature(error.getSignature()), HeaderUtils.OK); - logger.debug(error.toString()); + logger.debug(error.toString()); + }); } } diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/PacketUtilsTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/PacketUtilsTest.java index c35a3c905228..05a7c868be62 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/PacketUtilsTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/PacketUtilsTest.java @@ -16,10 +16,8 @@ package com.navercorp.pinpoint.thrift.io; - -import org.junit.Assert; -import org.junit.Test; - +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.DatagramPacket; import java.util.Arrays; @@ -35,27 +33,27 @@ public void testSliceData1() { byte[] bytes1 = PacketUtils.sliceData(packet, 0); - Assert.assertEquals(bytes1.length, 5); + Assertions.assertEquals(bytes1.length, 5); } @Test public void testSliceData2() { DatagramPacket packet = createPacket(10); - Arrays.fill(packet.getData(), 1, 8, (byte)'a'); + Arrays.fill(packet.getData(), 1, 8, (byte) 'a'); byte[] bytes1 = PacketUtils.sliceData(packet, 0); - Assert.assertArrayEquals(bytes1, packet.getData()); + Assertions.assertArrayEquals(bytes1, packet.getData()); } @Test public void testSliceData3() { DatagramPacket packet = createPacket(10); - Arrays.fill(packet.getData(), 1, 8, (byte)'a'); + Arrays.fill(packet.getData(), 1, 8, (byte) 'a'); packet.setLength(4); byte[] bytes1 = PacketUtils.sliceData(packet, 0); - Assert.assertArrayEquals(bytes1, Arrays.copyOf(packet.getData(), 4)); + Assertions.assertArrayEquals(bytes1, Arrays.copyOf(packet.getData(), 4)); } private DatagramPacket createPacket(int size) { diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/PinpointByteArrayOutputStreamTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/PinpointByteArrayOutputStreamTest.java index ea531efef4b6..028e8cc0dc59 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/PinpointByteArrayOutputStreamTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/PinpointByteArrayOutputStreamTest.java @@ -16,13 +16,12 @@ package com.navercorp.pinpoint.thrift.io; -import java.io.IOException; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import org.junit.Assert; -import org.junit.Test; +import java.io.IOException; /** - * * @author Taejin Koo */ public class PinpointByteArrayOutputStreamTest { @@ -35,14 +34,16 @@ public void test1() throws IOException { pbaos.write(TEST_STRING.getBytes()); - Assert.assertEquals(TEST_STRING, pbaos.toString()); + Assertions.assertEquals(TEST_STRING, pbaos.toString()); } - - @Test(expected = BufferOverflowException.class) + + @Test public void test2() throws IOException { - PinpointByteArrayOutputStream pbaos = new PinpointByteArrayOutputStream(8, false); + Assertions.assertThrows(BufferOverflowException.class, () -> { + PinpointByteArrayOutputStream pbaos = new PinpointByteArrayOutputStream(8, false); - pbaos.write(TEST_STRING.getBytes()); + pbaos.write(TEST_STRING.getBytes()); + }); } - + } diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/ReplaceListCompactProtocolTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/ReplaceListCompactProtocolTest.java index 07c2115730d7..a14fb7a050da 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/ReplaceListCompactProtocolTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/ReplaceListCompactProtocolTest.java @@ -16,7 +16,11 @@ package com.navercorp.pinpoint.thrift.io; -import static org.junit.Assert.*; +import com.navercorp.pinpoint.thrift.dto.TSpan; +import com.navercorp.pinpoint.thrift.dto.TSpanEvent; +import org.apache.thrift.protocol.TCompactProtocol; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -26,12 +30,7 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.thrift.protocol.TCompactProtocol; -import org.junit.Before; -import org.junit.Test; - -import com.navercorp.pinpoint.thrift.dto.TSpan; -import com.navercorp.pinpoint.thrift.dto.TSpanEvent; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ReplaceListCompactProtocolTest { @@ -39,7 +38,7 @@ public class ReplaceListCompactProtocolTest { final byte[] buf = new byte[1024]; - @Before + @BeforeEach public void before() { // add dummy span-event list List spanEventList = new ArrayList<>(); @@ -74,7 +73,7 @@ public void writeTo(OutputStream out) throws IOException { protocol01.addReplaceField("spanEventList", nodes01); span.write(protocol01); assertEquals(1, writeTo01.get()); - + TReplaceListProtocol protocol02 = new TReplaceListProtocol(new TCompactProtocol(transport)); protocol02.addReplaceField("spanEventList", nodes02); diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/TBaseStreamNodeTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/TBaseStreamNodeTest.java index a8763373b7cd..4e5faa60f3c4 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/TBaseStreamNodeTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/TBaseStreamNodeTest.java @@ -16,16 +16,12 @@ package com.navercorp.pinpoint.thrift.io; -import static org.junit.Assert.*; +import org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; import java.util.Arrays; -import org.junit.Test; - -import com.navercorp.pinpoint.thrift.io.ByteArrayOutputStreamTransport; -import com.navercorp.pinpoint.thrift.io.TBaseStreamNode; -import com.navercorp.pinpoint.thrift.io.UnsafeByteArrayOutputStream; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TBaseStreamNodeTest { diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/TBaseStreamTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/TBaseStreamTest.java index 097df8193fa0..6621e85d4650 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/TBaseStreamTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/TBaseStreamTest.java @@ -16,21 +16,21 @@ package com.navercorp.pinpoint.thrift.io; -import static org.junit.Assert.*; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.lang.RandomStringUtils; -import org.apache.thrift.protocol.TCompactProtocol; -import org.apache.thrift.protocol.TProtocolFactory; -import org.junit.Test; - import com.navercorp.pinpoint.thrift.dto.TSpan; import com.navercorp.pinpoint.thrift.dto.TSpanChunk; import com.navercorp.pinpoint.thrift.dto.TSpanEvent; -import org.apache.logging.log4j.Logger; +import org.apache.commons.lang.RandomStringUtils; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.apache.thrift.protocol.TCompactProtocol; +import org.apache.thrift.protocol.TProtocolFactory; +import org.junit.jupiter.api.Test; + +import java.util.ArrayList; +import java.util.List; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; public class TBaseStreamTest { @@ -43,7 +43,7 @@ public class TBaseStreamTest { private static final short SERVICE_TYPE = Short.valueOf("1"); private static final TProtocolFactory DEFAULT_PROTOCOL_FACTORY = new TCompactProtocol.Factory(); - + @Test public void clear() throws Exception { TBaseStream stream = new TBaseStream(DEFAULT_PROTOCOL_FACTORY); diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/TCommandRegistryTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/TCommandRegistryTest.java index 1f487837c962..69ce910d7f26 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/TCommandRegistryTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/TCommandRegistryTest.java @@ -23,8 +23,8 @@ import com.navercorp.pinpoint.thrift.dto.command.TCommandTransferResponse; import org.apache.thrift.TBase; import org.apache.thrift.TException; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author koo.taejin @@ -35,34 +35,34 @@ public class TCommandRegistryTest { public void registryTest1() { TypeLocator> registry = TCommandRegistry.build(TCommandTypeVersion.UNKNOWN); - Assert.assertFalse(registry.isSupport(TCommandType.RESULT.getCode())); - Assert.assertFalse(registry.isSupport(TCommandType.THREAD_DUMP.getCode())); + Assertions.assertFalse(registry.isSupport(TCommandType.RESULT.getCode())); + Assertions.assertFalse(registry.isSupport(TCommandType.THREAD_DUMP.getCode())); - Assert.assertFalse(registry.isSupport(TResult.class)); - Assert.assertFalse(registry.isSupport(TCommandThreadDump.class)); + Assertions.assertFalse(registry.isSupport(TResult.class)); + Assertions.assertFalse(registry.isSupport(TCommandThreadDump.class)); } public void registryTest2() throws TException { TypeLocator> registry = TCommandRegistry.build(TCommandTypeVersion.UNKNOWN); - Assert.assertNull(registry.headerLookup(new TResult())); + Assertions.assertNull(registry.headerLookup(new TResult())); } public void registryTest3() throws TException { TypeLocator> registry = TCommandRegistry.build(TCommandTypeVersion.UNKNOWN); - Assert.assertNull(registry.bodyLookup(TCommandType.RESULT.getCode())); + Assertions.assertNull(registry.bodyLookup(TCommandType.RESULT.getCode())); } @Test public void registryTest4() { TypeLocator> registry = TCommandRegistry.build(TCommandTypeVersion.V_1_0_2_SNAPSHOT); - Assert.assertTrue(registry.isSupport(TCommandType.RESULT.getCode())); - Assert.assertTrue(registry.isSupport(TCommandType.THREAD_DUMP.getCode())); + Assertions.assertTrue(registry.isSupport(TCommandType.RESULT.getCode())); + Assertions.assertTrue(registry.isSupport(TCommandType.THREAD_DUMP.getCode())); - Assert.assertTrue(registry.isSupport(TResult.class)); - Assert.assertTrue(registry.isSupport(TCommandThreadDump.class)); + Assertions.assertTrue(registry.isSupport(TResult.class)); + Assertions.assertTrue(registry.isSupport(TCommandThreadDump.class)); } @Test @@ -70,7 +70,7 @@ public void registryTest5() throws TException { TypeLocator> registry = TCommandRegistry.build(TCommandTypeVersion.V_1_0_2_SNAPSHOT); Header header = registry.headerLookup(new TResult()); - Assert.assertNotNull(header); + Assertions.assertNotNull(header); } @Test @@ -78,10 +78,10 @@ public void registryTest6() throws TException { TypeLocator> registry = TCommandRegistry.build(TCommandTypeVersion.V_1_0_2_SNAPSHOT); TBase tBase = registry.bodyLookup(TCommandType.RESULT.getCode()); - Assert.assertEquals(tBase.getClass(), TResult.class); + Assertions.assertEquals(tBase.getClass(), TResult.class); tBase = registry.bodyLookup(TCommandType.THREAD_DUMP.getCode()); - Assert.assertEquals(tBase.getClass(), TCommandThreadDump.class); + Assertions.assertEquals(tBase.getClass(), TCommandThreadDump.class); } @Test @@ -89,21 +89,21 @@ public void isSupportTest() throws TException { TypeLocator> registry = TCommandRegistry.build(TCommandTypeVersion.V_1_0_2_SNAPSHOT); boolean isSupport = registry.isSupport(TResult.class); - Assert.assertTrue(isSupport); + Assertions.assertTrue(isSupport); isSupport = registry.isSupport(TCommandTransferResponse.class); - Assert.assertFalse(isSupport); + Assertions.assertFalse(isSupport); } -// @Test + // @Test public void isSupportTest_Inheritance() throws TException { TypeLocator> registry = TCommandRegistry.build(TCommandTypeVersion.V_1_0_2_SNAPSHOT); boolean isSupport = registry.isSupport(TResultEx.class); - Assert.assertTrue(isSupport); + Assertions.assertTrue(isSupport); isSupport = registry.isSupport(TCommandTransferResponse.class); - Assert.assertFalse(isSupport); + Assertions.assertFalse(isSupport); } class TResultEx extends TResult { diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/TCommandTypeVersionTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/TCommandTypeVersionTest.java index 2ded7f00d215..50b7f93bfcff 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/TCommandTypeVersionTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/TCommandTypeVersionTest.java @@ -16,14 +16,10 @@ package com.navercorp.pinpoint.thrift.io; -import java.util.List; - -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import org.junit.Test; - -import com.navercorp.pinpoint.thrift.io.TCommandType; -import com.navercorp.pinpoint.thrift.io.TCommandTypeVersion; +import java.util.List; /** * @author koo.taejin @@ -36,9 +32,9 @@ public void versionTest1() { List supportTypeList = version.getSupportCommandList(); - Assert.assertEquals(2, supportTypeList.size()); - Assert.assertTrue(supportTypeList.contains(TCommandType.THREAD_DUMP)); - Assert.assertTrue(supportTypeList.contains(TCommandType.RESULT)); + Assertions.assertEquals(2, supportTypeList.size()); + Assertions.assertTrue(supportTypeList.contains(TCommandType.THREAD_DUMP)); + Assertions.assertTrue(supportTypeList.contains(TCommandType.RESULT)); } @Test @@ -47,16 +43,16 @@ public void versionTest2() { List supportTypeList = version.getSupportCommandList(); - Assert.assertEquals(0, supportTypeList.size()); + Assertions.assertEquals(0, supportTypeList.size()); } @Test public void versionTest3() { TCommandTypeVersion version = TCommandTypeVersion.getVersion("1.0.0"); - Assert.assertEquals(TCommandTypeVersion.UNKNOWN, version); + Assertions.assertEquals(TCommandTypeVersion.UNKNOWN, version); version = TCommandTypeVersion.getVersion(TCommandTypeVersion.V_1_0_2_SNAPSHOT.getVersionName()); - Assert.assertEquals(TCommandTypeVersion.V_1_0_2_SNAPSHOT, version); + Assertions.assertEquals(TCommandTypeVersion.V_1_0_2_SNAPSHOT, version); } diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/UnsafeByteArrayOutputStreamTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/UnsafeByteArrayOutputStreamTest.java index 23f77fb49e76..175c4e44e13a 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/UnsafeByteArrayOutputStreamTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/io/UnsafeByteArrayOutputStreamTest.java @@ -16,17 +16,16 @@ package com.navercorp.pinpoint.thrift.io; -import java.io.IOException; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; -import org.junit.Assert; -import org.junit.Test; +import java.io.IOException; /** - * * @author Taejin Koo */ public class UnsafeByteArrayOutputStreamTest { - + private final String TEST_STRING1 = "hello pinpoint"; private final String TEST_STRING2 = "hi pinpoint"; @@ -35,22 +34,24 @@ public void test1() throws IOException { UnsafeByteArrayOutputStream ubaos = new UnsafeByteArrayOutputStream(32); ubaos.write(TEST_STRING1.getBytes()); - Assert.assertEquals(TEST_STRING1, ubaos.toString()); + Assertions.assertEquals(TEST_STRING1, ubaos.toString()); ubaos.reset(); ubaos.write(TEST_STRING2.getBytes()); - Assert.assertEquals(TEST_STRING2, ubaos.toString()); + Assertions.assertEquals(TEST_STRING2, ubaos.toString()); byte[] data = ubaos.toByteArray(); - Assert.assertEquals(TEST_STRING2 + "int", new String(data).trim()); + Assertions.assertEquals(TEST_STRING2 + "int", new String(data).trim()); } - - @Test (expected = BufferOverflowException.class) + + @Test public void test2() throws IOException { - UnsafeByteArrayOutputStream ubaos = new UnsafeByteArrayOutputStream(8, false); + Assertions.assertThrows(BufferOverflowException.class, () -> { + UnsafeByteArrayOutputStream ubaos = new UnsafeByteArrayOutputStream(8, false); - ubaos.write(TEST_STRING1.getBytes()); + ubaos.write(TEST_STRING1.getBytes()); + }); } - + } diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/util/TCompactProtocolByteSizeTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/util/TCompactProtocolByteSizeTest.java index a1a567885d7e..9d59d25b12b1 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/util/TCompactProtocolByteSizeTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/util/TCompactProtocolByteSizeTest.java @@ -16,13 +16,13 @@ package com.navercorp.pinpoint.thrift.util; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; import org.apache.thrift.protocol.TCompactProtocol; import org.apache.thrift.protocol.TProtocol; import org.apache.thrift.transport.TIOStreamTransport; -import org.junit.Test; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; +import org.junit.jupiter.api.Test; import java.io.ByteArrayOutputStream; import java.util.concurrent.TimeUnit; diff --git a/thrift/src/test/java/com/navercorp/pinpoint/thrift/util/TCompactProtocolTest.java b/thrift/src/test/java/com/navercorp/pinpoint/thrift/util/TCompactProtocolTest.java index c897674be61f..0f1c0ebfaa7c 100644 --- a/thrift/src/test/java/com/navercorp/pinpoint/thrift/util/TCompactProtocolTest.java +++ b/thrift/src/test/java/com/navercorp/pinpoint/thrift/util/TCompactProtocolTest.java @@ -17,12 +17,12 @@ package com.navercorp.pinpoint.thrift.util; import com.navercorp.pinpoint.common.util.BytesUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; import org.apache.thrift.protocol.TCompactProtocol; import org.apache.thrift.transport.TMemoryBuffer; -import org.junit.Test; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; +import org.junit.jupiter.api.Test; /** * @author Woonduk Kang(emeroad) diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ApplicationMapBuilderTest.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ApplicationMapBuilderTest.java index 77f88af032d4..ad9c83fd4027 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ApplicationMapBuilderTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ApplicationMapBuilderTest.java @@ -36,10 +36,10 @@ import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.vo.ResponseHistograms; import com.navercorp.pinpoint.web.vo.ResponseTime; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -77,7 +77,7 @@ public class ApplicationMapBuilderTest { private long buildTimeoutMillis = 1000; - @Before + @BeforeEach public void setUp() { MapResponseDao mapResponseDao = mock(MapResponseDao.class); mapResponseNodeHistogramDataSource = new MapResponseNodeHistogramDataSource(mapResponseDao); @@ -150,7 +150,7 @@ public List> answer(InvocationOnMock invocation) throws Th }).when(agentInfoService).getAgentStatus(any()); } - @After + @AfterEach public void cleanUp() { shutdownExecutor(serialExecutor); shutdownExecutor(parallelExecutor); @@ -186,12 +186,12 @@ public void testNoCallData() { .includeServerInfo(serverInstanceListFactory) .build(application, buildTimeoutMillis); - Assert.assertEquals(1, applicationMap.getNodes().size()); - Assert.assertEquals(1, applicationMap.getNodes().size()); - Assert.assertEquals(1, applicationMap_parallelAppenders.getNodes().size()); - Assert.assertEquals(0, applicationMap.getLinks().size()); - Assert.assertEquals(0, applicationMap.getLinks().size()); - Assert.assertEquals(0, applicationMap_parallelAppenders.getLinks().size()); + Assertions.assertEquals(1, applicationMap.getNodes().size()); + Assertions.assertEquals(1, applicationMap.getNodes().size()); + Assertions.assertEquals(1, applicationMap_parallelAppenders.getNodes().size()); + Assertions.assertEquals(0, applicationMap.getLinks().size()); + Assertions.assertEquals(0, applicationMap.getLinks().size()); + Assertions.assertEquals(0, applicationMap_parallelAppenders.getLinks().size()); ApplicationMapVerifier verifier = new ApplicationMapVerifier(applicationMap); verifier.verify(applicationMap); @@ -217,12 +217,12 @@ public void testEmptyCallData() { .includeServerInfo(serverInstanceListFactory) .build(linkDataDuplexMap, buildTimeoutMillis); - Assert.assertTrue(applicationMap.getNodes().isEmpty()); - Assert.assertTrue(applicationMap.getNodes().isEmpty()); - Assert.assertTrue(applicationMap_parallelAppenders.getNodes().isEmpty()); - Assert.assertTrue(applicationMap.getLinks().isEmpty()); - Assert.assertTrue(applicationMap.getLinks().isEmpty()); - Assert.assertTrue(applicationMap_parallelAppenders.getLinks().isEmpty()); + Assertions.assertTrue(applicationMap.getNodes().isEmpty()); + Assertions.assertTrue(applicationMap.getNodes().isEmpty()); + Assertions.assertTrue(applicationMap_parallelAppenders.getNodes().isEmpty()); + Assertions.assertTrue(applicationMap.getLinks().isEmpty()); + Assertions.assertTrue(applicationMap.getLinks().isEmpty()); + Assertions.assertTrue(applicationMap_parallelAppenders.getLinks().isEmpty()); ApplicationMapVerifier verifier = new ApplicationMapVerifier(applicationMap); verifier.verify(applicationMap); @@ -318,10 +318,10 @@ private void runTest(int callerDepth, int calleeDepth) { .includeNodeHistogram(nodeHistogramFactory_MapResponseDao) .includeServerInfo(serverInstanceListFactory) .build(linkDataDuplexMap, buildTimeoutMillis); - Assert.assertEquals(expectedNumNodes, applicationMap_MapResponseDao.getNodes().size()); - Assert.assertEquals(expectedNumNodes, applicationMap_MapResponseDao_parallelAppenders.getNodes().size()); - Assert.assertEquals(expectedNumLinks, applicationMap_MapResponseDao.getLinks().size()); - Assert.assertEquals(expectedNumLinks, applicationMap_MapResponseDao_parallelAppenders.getLinks().size()); + Assertions.assertEquals(expectedNumNodes, applicationMap_MapResponseDao.getNodes().size()); + Assertions.assertEquals(expectedNumNodes, applicationMap_MapResponseDao_parallelAppenders.getNodes().size()); + Assertions.assertEquals(expectedNumLinks, applicationMap_MapResponseDao.getLinks().size()); + Assertions.assertEquals(expectedNumLinks, applicationMap_MapResponseDao_parallelAppenders.getLinks().size()); ApplicationMapVerifier verifier_MapResponseDao = new ApplicationMapVerifier(applicationMap_MapResponseDao); verifier_MapResponseDao.verify(applicationMap_MapResponseDao); verifier_MapResponseDao.verify(applicationMap_MapResponseDao_parallelAppenders); @@ -335,10 +335,10 @@ private void runTest(int callerDepth, int calleeDepth) { .includeNodeHistogram(nodeHistogramFactory_ResponseHistogramBuilder) .includeServerInfo(serverInstanceListFactory) .build(linkDataDuplexMap, buildTimeoutMillis); - Assert.assertEquals(expectedNumNodes, applicationMap_ResponseHistogramBuilder.getNodes().size()); - Assert.assertEquals(expectedNumNodes, applicationMap_ResponseHistogramBuilder_parallelAppenders.getNodes().size()); - Assert.assertEquals(expectedNumLinks, applicationMap_ResponseHistogramBuilder.getLinks().size()); - Assert.assertEquals(expectedNumLinks, applicationMap_ResponseHistogramBuilder_parallelAppenders.getLinks().size()); + Assertions.assertEquals(expectedNumNodes, applicationMap_ResponseHistogramBuilder.getNodes().size()); + Assertions.assertEquals(expectedNumNodes, applicationMap_ResponseHistogramBuilder_parallelAppenders.getNodes().size()); + Assertions.assertEquals(expectedNumLinks, applicationMap_ResponseHistogramBuilder.getLinks().size()); + Assertions.assertEquals(expectedNumLinks, applicationMap_ResponseHistogramBuilder_parallelAppenders.getLinks().size()); ApplicationMapVerifier verifier_ResponseHistogramBuilder = new ApplicationMapVerifier(applicationMap_ResponseHistogramBuilder); verifier_ResponseHistogramBuilder.verify(applicationMap_ResponseHistogramBuilder); verifier_ResponseHistogramBuilder.verify(applicationMap_ResponseHistogramBuilder_parallelAppenders); diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ApplicationMapTest.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ApplicationMapTest.java index b55594be3cf2..da1ff19edbb2 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ApplicationMapTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ApplicationMapTest.java @@ -16,14 +16,14 @@ package com.navercorp.pinpoint.web.applicationmap; +import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.applicationmap.link.LinkList; import com.navercorp.pinpoint.web.applicationmap.nodes.NodeList; -import com.navercorp.pinpoint.common.server.util.time.Range; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; import java.io.IOException; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ApplicationMapVerifier.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ApplicationMapVerifier.java index 3b20f4201894..6a5746bd861d 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ApplicationMapVerifier.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ApplicationMapVerifier.java @@ -23,7 +23,7 @@ import com.navercorp.pinpoint.web.applicationmap.nodes.ServerInstance; import com.navercorp.pinpoint.web.applicationmap.nodes.ServerInstanceList; import com.navercorp.pinpoint.web.vo.LinkKey; -import org.junit.Assert; +import org.junit.jupiter.api.Assertions; import java.util.ArrayList; import java.util.Collection; @@ -53,7 +53,7 @@ private void verifyNodes(Collection otherNodes) { String nodeNameToFind = otherNode.getNodeName(); Node thisNode = findNode(thisNodes, nodeNameToFind); if (thisNode == null) { - Assert.fail(otherNode + " not in " + thisNodes); + Assertions.fail(otherNode + " not in " + thisNodes); } verifyNode(thisNode, otherNode); } @@ -70,9 +70,9 @@ private Node findNode(Collection nodes, String nodeNameToFind) { } private void verifyNode(Node node1, Node node2) { - Assert.assertEquals(node1.getApplication(), node2.getApplication()); - Assert.assertEquals(node1.getApplicationTextName(), node2.getApplicationTextName()); - Assert.assertEquals(node1.getServiceType(), node2.getServiceType()); + Assertions.assertEquals(node1.getApplication(), node2.getApplication()); + Assertions.assertEquals(node1.getApplicationTextName(), node2.getApplicationTextName()); + Assertions.assertEquals(node1.getServiceType(), node2.getServiceType()); verifyServerInstanceList(node1.getServerInstanceList(), node2.getServerInstanceList()); verifyNodeHistogram(node1.getNodeHistogram(), node2.getNodeHistogram()); @@ -84,21 +84,21 @@ private void verifyServerInstanceList(ServerInstanceList serverInstanceList1, Se return; } - Assert.assertEquals(serverInstanceList1.getInstanceCount(), serverInstanceList2.getInstanceCount()); + Assertions.assertEquals(serverInstanceList1.getInstanceCount(), serverInstanceList2.getInstanceCount()); - Assert.assertTrue(serverInstanceList1.getAgentIdList().containsAll(serverInstanceList2.getAgentIdList())); - Assert.assertEquals(serverInstanceList1.getAgentIdList().size(), serverInstanceList2.getAgentIdList().size()); + Assertions.assertTrue(serverInstanceList1.getAgentIdList().containsAll(serverInstanceList2.getAgentIdList())); + Assertions.assertEquals(serverInstanceList1.getAgentIdList().size(), serverInstanceList2.getAgentIdList().size()); Map> serverInstancesMap1 = serverInstanceList1.getServerInstanceList(); Map> serverInstancesMap2 = serverInstanceList2.getServerInstanceList(); - Assert.assertEquals(serverInstancesMap1.size(), serverInstancesMap2.size()); + Assertions.assertEquals(serverInstancesMap1.size(), serverInstancesMap2.size()); for (Map.Entry> e : serverInstancesMap1.entrySet()) { String hostName = e.getKey(); List serverInstances1 = e.getValue(); List serverInstances2 = serverInstancesMap2.get(hostName); - Assert.assertNotNull(serverInstances2); - Assert.assertTrue(serverInstances1.containsAll(serverInstances2)); - Assert.assertEquals(serverInstances1.size(), serverInstances2.size()); + Assertions.assertNotNull(serverInstances2); + Assertions.assertTrue(serverInstances1.containsAll(serverInstances2)); + Assertions.assertEquals(serverInstances1.size(), serverInstances2.size()); } } @@ -112,12 +112,12 @@ private void verifyNodeHistogram(NodeHistogram nodeHistogram1, NodeHistogram nod Map agentHistogramMap1 = nodeHistogram1.getAgentHistogramMap(); Map agentHistogramMap2 = nodeHistogram2.getAgentHistogramMap(); - Assert.assertEquals(agentHistogramMap1.size(), agentHistogramMap2.size()); + Assertions.assertEquals(agentHistogramMap1.size(), agentHistogramMap2.size()); for (Map.Entry e : agentHistogramMap1.entrySet()) { String agentId = e.getKey(); Histogram agentHistogram1 = e.getValue(); Histogram agentHistogram2 = agentHistogramMap2.get(agentId); - Assert.assertNotNull(agentHistogram2); + Assertions.assertNotNull(agentHistogram2); verifyHistogram(agentHistogram1, agentHistogram2); } } @@ -127,18 +127,18 @@ private void verifyHistogram(Histogram histogram1, Histogram histogram2) { if (histogram1 == null && histogram2 == null) { return; } - Assert.assertEquals(histogram1.getHistogramSchema(), histogram2.getHistogramSchema()); - Assert.assertEquals(histogram1.getTotalCount(), histogram2.getTotalCount()); - Assert.assertEquals(histogram1.getSuccessCount(), histogram2.getSuccessCount()); - Assert.assertEquals(histogram1.getErrorCount(), histogram2.getErrorCount()); - Assert.assertEquals(histogram1.getFastCount(), histogram2.getFastCount()); - Assert.assertEquals(histogram1.getFastErrorCount(), histogram2.getFastErrorCount()); - Assert.assertEquals(histogram1.getNormalCount(), histogram2.getNormalCount()); - Assert.assertEquals(histogram1.getNormalErrorCount(), histogram2.getNormalErrorCount()); - Assert.assertEquals(histogram1.getSlowCount(), histogram2.getSlowCount()); - Assert.assertEquals(histogram1.getSlowErrorCount(), histogram2.getSlowErrorCount()); - Assert.assertEquals(histogram1.getVerySlowCount(), histogram2.getVerySlowCount()); - Assert.assertEquals(histogram1.getVerySlowErrorCount(), histogram2.getVerySlowErrorCount()); + Assertions.assertEquals(histogram1.getHistogramSchema(), histogram2.getHistogramSchema()); + Assertions.assertEquals(histogram1.getTotalCount(), histogram2.getTotalCount()); + Assertions.assertEquals(histogram1.getSuccessCount(), histogram2.getSuccessCount()); + Assertions.assertEquals(histogram1.getErrorCount(), histogram2.getErrorCount()); + Assertions.assertEquals(histogram1.getFastCount(), histogram2.getFastCount()); + Assertions.assertEquals(histogram1.getFastErrorCount(), histogram2.getFastErrorCount()); + Assertions.assertEquals(histogram1.getNormalCount(), histogram2.getNormalCount()); + Assertions.assertEquals(histogram1.getNormalErrorCount(), histogram2.getNormalErrorCount()); + Assertions.assertEquals(histogram1.getSlowCount(), histogram2.getSlowCount()); + Assertions.assertEquals(histogram1.getSlowErrorCount(), histogram2.getSlowErrorCount()); + Assertions.assertEquals(histogram1.getVerySlowCount(), histogram2.getVerySlowCount()); + Assertions.assertEquals(histogram1.getVerySlowErrorCount(), histogram2.getVerySlowErrorCount()); } private void verifyLinks(Collection otherLinks) { @@ -148,7 +148,7 @@ private void verifyLinks(Collection otherLinks) { LinkKey linkKeyToFind = otherLink.getLinkKey(); Link thisLink = findLink(thisLinks, linkKeyToFind); if (thisLink == null) { - Assert.fail(otherLink + " not in " + thisLinks); + Assertions.fail(otherLink + " not in " + thisLinks); } verifyLink(thisLink, otherLink); } @@ -174,15 +174,15 @@ private void verifyLink(Link thisLink, Link otherLink) { } private void verifySize(Collection collection1, Collection collection2) { - Assert.assertEquals(new ArrayList<>(collection1).size(), new ArrayList<>(collection2).size()); + Assertions.assertEquals(new ArrayList<>(collection1).size(), new ArrayList<>(collection2).size()); } private void verifyNullable(T nullable1, T nullable2) { if (nullable1 == null && nullable2 != null) { - Assert.fail(); + Assertions.fail(); } if (nullable1 != null && nullable2 == null) { - Assert.fail(); + Assertions.fail(); } } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/LinkListTest.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/LinkListTest.java index cae4fea9f01e..f5f8126e018c 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/LinkListTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/LinkListTest.java @@ -16,21 +16,20 @@ package com.navercorp.pinpoint.web.applicationmap; -import static com.navercorp.pinpoint.common.trace.ServiceTypeProperty.*; - -import java.util.List; - +import com.navercorp.pinpoint.common.server.util.time.Range; +import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.trace.ServiceTypeFactory; import com.navercorp.pinpoint.web.applicationmap.link.CreateType; import com.navercorp.pinpoint.web.applicationmap.link.Link; import com.navercorp.pinpoint.web.applicationmap.link.LinkList; import com.navercorp.pinpoint.web.applicationmap.nodes.Node; -import org.junit.Assert; -import org.junit.Test; - -import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.util.List; + +import static com.navercorp.pinpoint.common.trace.ServiceTypeProperty.RECORD_STATISTICS; /** * @author emeroad @@ -38,12 +37,12 @@ public class LinkListTest { private static final ServiceType TOMCAT = ServiceTypeFactory.of(1010, "TOMCAT", RECORD_STATISTICS); private static final ServiceType BLOC = ServiceTypeFactory.of(1011, "BLOC", RECORD_STATISTICS); - - + + @Test public void testGetLinkList() { LinkList linkList = new LinkList(); - Assert.assertEquals(linkList.getLinkList().size(), 0); + Assertions.assertEquals(linkList.getLinkList().size(), 0); } @Test @@ -54,11 +53,11 @@ public void addLinkList() { LinkList original = new LinkList(); original.addLinkList(copy); - Assert.assertEquals(original.size(), 1); + Assertions.assertEquals(original.size(), 1); // don't copy in case of duplicated node original.addLinkList(copy); - Assert.assertEquals(original.size(), 1); + Assertions.assertEquals(original.size(), 1); } @@ -89,15 +88,15 @@ public void testFindToLink() { // find all links requesting "to" Application toBloc = new Application("to", BLOC); List findToLink = list.findToLink(toBloc); - Assert.assertEquals(findToLink.size(), 1); + Assertions.assertEquals(findToLink.size(), 1); for (Link link : findToLink) { Application to = link.getTo().getApplication(); - Assert.assertEquals(toBloc + " " + to, toBloc, to); + Assertions.assertEquals(toBloc, to, toBloc + " " + to); } List unknown = list.findToLink(new Application("unknown", BLOC)); - Assert.assertEquals(unknown.size(), 0); + Assertions.assertEquals(unknown.size(), 0); } @Test @@ -111,33 +110,33 @@ public void testFindFromLink() { // find all links for "from" to request Application tomcat = new Application("from", TOMCAT); List findFromLink = list.findFromLink(tomcat); - Assert.assertEquals(findFromLink.size(), 2); + Assertions.assertEquals(findFromLink.size(), 2); for (Link link : findFromLink) { Application linkFrom = link.getFrom().getApplication(); - Assert.assertEquals(linkFrom, tomcat); + Assertions.assertEquals(linkFrom, tomcat); } List unknown = list.findFromLink(new Application("unknown", TOMCAT)); - Assert.assertEquals(unknown.size(), 0); + Assertions.assertEquals(unknown.size(), 0); } @Test public void testContainsNode() { Link tomcatToBlocLink = createTomcatToBlocLink(); LinkList list = new LinkList(); - Assert.assertFalse(list.containsNode(tomcatToBlocLink)); + Assertions.assertFalse(list.containsNode(tomcatToBlocLink)); list.addLink(tomcatToBlocLink); - Assert.assertTrue(list.containsNode(tomcatToBlocLink)); + Assertions.assertTrue(list.containsNode(tomcatToBlocLink)); } @Test public void testSize() { LinkList list = new LinkList(); - Assert.assertEquals(list.size(), 0); + Assertions.assertEquals(list.size(), 0); list.addLink(createTomcatToTomcatLink()); - Assert.assertEquals(list.size(), 1); + Assertions.assertEquals(list.size(), 1); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ServerInstanceListTest.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ServerInstanceListTest.java index ed8b0a19ef02..17a3010c5324 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ServerInstanceListTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/ServerInstanceListTest.java @@ -21,9 +21,8 @@ import com.navercorp.pinpoint.web.applicationmap.nodes.ServerBuilder; import com.navercorp.pinpoint.web.applicationmap.nodes.ServerInstanceList; import com.navercorp.pinpoint.web.vo.AgentInfo; - import org.hamcrest.MatcherAssert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.HashSet; import java.util.List; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/appender/histogram/NodeHistogramAppenderTest.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/appender/histogram/NodeHistogramAppenderTest.java index fbf6784abfa2..f5ff916c0487 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/appender/histogram/NodeHistogramAppenderTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/appender/histogram/NodeHistogramAppenderTest.java @@ -16,29 +16,32 @@ package com.navercorp.pinpoint.web.applicationmap.appender.histogram; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.HistogramSlot; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.trace.ServiceTypeFactory; import com.navercorp.pinpoint.common.trace.ServiceTypeProperty; +import com.navercorp.pinpoint.web.applicationmap.appender.histogram.datasource.WasNodeHistogramDataSource; +import com.navercorp.pinpoint.web.applicationmap.histogram.Histogram; +import com.navercorp.pinpoint.web.applicationmap.histogram.NodeHistogram; import com.navercorp.pinpoint.web.applicationmap.link.CreateType; import com.navercorp.pinpoint.web.applicationmap.link.Link; import com.navercorp.pinpoint.web.applicationmap.link.LinkList; import com.navercorp.pinpoint.web.applicationmap.nodes.Node; import com.navercorp.pinpoint.web.applicationmap.nodes.NodeList; -import com.navercorp.pinpoint.web.applicationmap.appender.histogram.datasource.WasNodeHistogramDataSource; -import com.navercorp.pinpoint.web.applicationmap.histogram.Histogram; -import com.navercorp.pinpoint.web.applicationmap.histogram.NodeHistogram; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkCallDataMap; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.util.Map; -import java.util.concurrent.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import static org.mockito.Mockito.mock; @@ -60,14 +63,14 @@ public class NodeHistogramAppenderTest { private long buildTimeoutMillis = 1000; - @Before + @BeforeEach public void setUp() { wasNodeHistogramDataSource = mock(WasNodeHistogramDataSource.class); NodeHistogramFactory nodeHistogramFactory = new DefaultNodeHistogramFactory(wasNodeHistogramDataSource); nodeHistogramAppender = nodeHistogramAppenderFactory.create(nodeHistogramFactory); } - @After + @AfterEach public void cleanUp() { executor.shutdown(); try { @@ -89,7 +92,7 @@ public void emptyNodeList() { // When nodeHistogramAppender.appendNodeHistogram(range, nodeList, linkList, buildTimeoutMillis); // Then - Assert.assertTrue(nodeList.getNodeList().isEmpty()); + Assertions.assertTrue(nodeList.getNodeList().isEmpty()); verifyZeroInteractions(wasNodeHistogramDataSource); } @@ -111,7 +114,7 @@ public void wasNode() { nodeHistogramAppender.appendNodeHistogram(range, nodeList, linkList, buildTimeoutMillis); // Then Node actualNode = nodeList.getNodeList().iterator().next(); - Assert.assertSame(nodeHistogram, actualNode.getNodeHistogram()); + Assertions.assertSame(nodeHistogram, actualNode.getNodeHistogram()); } /** @@ -156,17 +159,17 @@ public void terminalNode() { NodeHistogram nodeHistogram = actualNode.getNodeHistogram(); // verify application-level histogram Histogram applicationHistogram = nodeHistogram.getApplicationHistogram(); - Assert.assertEquals(fastCallCount, applicationHistogram.getFastCount()); - Assert.assertEquals(normalCallCount, applicationHistogram.getNormalCount()); - Assert.assertEquals(slowCallCount, applicationHistogram.getSlowCount()); - Assert.assertEquals(fastCallCount + normalCallCount + slowCallCount, applicationHistogram.getTotalCount()); + Assertions.assertEquals(fastCallCount, applicationHistogram.getFastCount()); + Assertions.assertEquals(normalCallCount, applicationHistogram.getNormalCount()); + Assertions.assertEquals(slowCallCount, applicationHistogram.getSlowCount()); + Assertions.assertEquals(fastCallCount + normalCallCount + slowCallCount, applicationHistogram.getTotalCount()); // verify agent-level histogram Map agentHistogramMap = nodeHistogram.getAgentHistogramMap(); Histogram agentHistogram = agentHistogramMap.get(toNodeAgent); - Assert.assertEquals(fastCallCount, agentHistogram.getFastCount()); - Assert.assertEquals(normalCallCount, agentHistogram.getNormalCount()); - Assert.assertEquals(slowCallCount, agentHistogram.getSlowCount()); - Assert.assertEquals(fastCallCount + normalCallCount + slowCallCount, agentHistogram.getTotalCount()); + Assertions.assertEquals(fastCallCount, agentHistogram.getFastCount()); + Assertions.assertEquals(normalCallCount, agentHistogram.getNormalCount()); + Assertions.assertEquals(slowCallCount, agentHistogram.getSlowCount()); + Assertions.assertEquals(fastCallCount + normalCallCount + slowCallCount, agentHistogram.getTotalCount()); } /** @@ -210,17 +213,17 @@ public void terminalNode_multiple() { NodeHistogram nodeHistogram = actualNode.getNodeHistogram(); // verify application-level histogram Histogram applicationHistogram = nodeHistogram.getApplicationHistogram(); - Assert.assertEquals(callCount1, applicationHistogram.getFastCount()); - Assert.assertEquals(callCount2, applicationHistogram.getNormalCount()); - Assert.assertEquals(callCount1 + callCount2, applicationHistogram.getTotalCount()); + Assertions.assertEquals(callCount1, applicationHistogram.getFastCount()); + Assertions.assertEquals(callCount2, applicationHistogram.getNormalCount()); + Assertions.assertEquals(callCount1 + callCount2, applicationHistogram.getTotalCount()); // verify agent-level histogram Map agentHistogramMap = nodeHistogram.getAgentHistogramMap(); Histogram agent1Histogram = agentHistogramMap.get(toNodeAgent1); - Assert.assertEquals(callCount1, agent1Histogram.getFastCount()); - Assert.assertEquals(callCount1, agent1Histogram.getTotalCount()); + Assertions.assertEquals(callCount1, agent1Histogram.getFastCount()); + Assertions.assertEquals(callCount1, agent1Histogram.getTotalCount()); Histogram agent2Histogram = agentHistogramMap.get(toNodeAgent2); - Assert.assertEquals(callCount2, agent2Histogram.getNormalCount()); - Assert.assertEquals(callCount2, agent2Histogram.getTotalCount()); + Assertions.assertEquals(callCount2, agent2Histogram.getNormalCount()); + Assertions.assertEquals(callCount2, agent2Histogram.getTotalCount()); } /** @@ -273,27 +276,27 @@ public void terminalNodes() { NodeHistogram databaseNodeHistogram = actualDatabaseNode.getNodeHistogram(); // verify application-level histogram Histogram databaseApplicationHistogram = databaseNodeHistogram.getApplicationHistogram(); - Assert.assertEquals(databaseCallSlowCount, databaseApplicationHistogram.getSlowCount()); - Assert.assertEquals(databaseCallSlowCount, databaseApplicationHistogram.getTotalCount()); + Assertions.assertEquals(databaseCallSlowCount, databaseApplicationHistogram.getSlowCount()); + Assertions.assertEquals(databaseCallSlowCount, databaseApplicationHistogram.getTotalCount()); // verify agent-level histogram Map databaseAgentHistogramMap = databaseNodeHistogram.getAgentHistogramMap(); Histogram databaseAgentHistogram = databaseAgentHistogramMap.get(databaseNodeAgent); - Assert.assertEquals(databaseCallSlowCount, databaseAgentHistogram.getSlowCount()); - Assert.assertEquals(databaseCallSlowCount, databaseAgentHistogram.getTotalCount()); + Assertions.assertEquals(databaseCallSlowCount, databaseAgentHistogram.getSlowCount()); + Assertions.assertEquals(databaseCallSlowCount, databaseAgentHistogram.getTotalCount()); // Cache node Node actualCacheNode = nodeList.findNode(cacheNode.getApplication()); NodeHistogram cacheNodeHistogram = actualCacheNode.getNodeHistogram(); // verify application-level histogram Histogram cacheApplicationHistogram = cacheNodeHistogram.getApplicationHistogram(); - Assert.assertEquals(cacheCallFastCount, cacheApplicationHistogram.getFastCount()); - Assert.assertEquals(cacheCallSlowCount, cacheApplicationHistogram.getSlowCount()); - Assert.assertEquals(cacheCallFastCount + cacheCallSlowCount, cacheApplicationHistogram.getTotalCount()); + Assertions.assertEquals(cacheCallFastCount, cacheApplicationHistogram.getFastCount()); + Assertions.assertEquals(cacheCallSlowCount, cacheApplicationHistogram.getSlowCount()); + Assertions.assertEquals(cacheCallFastCount + cacheCallSlowCount, cacheApplicationHistogram.getTotalCount()); // verify agent-level histogram Map cacheAgentHistogramMap = cacheNodeHistogram.getAgentHistogramMap(); Histogram cacheAgentHistogram = cacheAgentHistogramMap.get(cacheNodeAgent); - Assert.assertEquals(cacheCallFastCount, cacheAgentHistogram.getFastCount()); - Assert.assertEquals(cacheCallSlowCount, cacheAgentHistogram.getSlowCount()); - Assert.assertEquals(cacheCallFastCount + cacheCallSlowCount, cacheAgentHistogram.getTotalCount()); + Assertions.assertEquals(cacheCallFastCount, cacheAgentHistogram.getFastCount()); + Assertions.assertEquals(cacheCallSlowCount, cacheAgentHistogram.getSlowCount()); + Assertions.assertEquals(cacheCallFastCount + cacheCallSlowCount, cacheAgentHistogram.getTotalCount()); } /** @@ -335,12 +338,12 @@ public void userNode() { NodeHistogram nodeHistogram = userNode.getNodeHistogram(); // verify application-level histogram Histogram applicationHistogram = nodeHistogram.getApplicationHistogram(); - Assert.assertEquals(fastCallCount, applicationHistogram.getFastCount()); - Assert.assertEquals(normalCallCount, applicationHistogram.getNormalCount()); - Assert.assertEquals(fastCallCount + normalCallCount, applicationHistogram.getTotalCount()); + Assertions.assertEquals(fastCallCount, applicationHistogram.getFastCount()); + Assertions.assertEquals(normalCallCount, applicationHistogram.getNormalCount()); + Assertions.assertEquals(fastCallCount + normalCallCount, applicationHistogram.getTotalCount()); // verify agent-level histogram - there is none for user node Map databaseAgentHistogramMap = nodeHistogram.getAgentHistogramMap(); - Assert.assertTrue(databaseAgentHistogramMap.isEmpty()); + Assertions.assertTrue(databaseAgentHistogramMap.isEmpty()); } private Node createNode(String applicationName, ServiceType serviceType) { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/appender/server/ServerInfoAppenderTest.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/appender/server/ServerInfoAppenderTest.java index e733ab27e14e..e37bd73f7311 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/appender/server/ServerInfoAppenderTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/appender/server/ServerInfoAppenderTest.java @@ -16,20 +16,20 @@ package com.navercorp.pinpoint.web.applicationmap.appender.server; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.trace.ServiceTypeFactory; +import com.navercorp.pinpoint.web.applicationmap.appender.server.datasource.ServerInstanceListDataSource; import com.navercorp.pinpoint.web.applicationmap.nodes.Node; import com.navercorp.pinpoint.web.applicationmap.nodes.NodeList; import com.navercorp.pinpoint.web.applicationmap.nodes.ServerInstanceList; -import com.navercorp.pinpoint.web.applicationmap.appender.server.datasource.ServerInstanceListDataSource; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkData; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataDuplexMap; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -56,14 +56,14 @@ public class ServerInfoAppenderTest { private long timeoutMillis = 1000; - @Before + @BeforeEach public void setUp() { serverInstanceListDataSource = mock(ServerInstanceListDataSource.class); ServerInstanceListFactory serverInstanceListFactory = new DefaultServerInstanceListFactory(serverInstanceListDataSource); serverInfoAppender = serverInfoAppenderFactory.create(serverInstanceListFactory); } - @After + @AfterEach public void cleanUp() { executor.shutdown(); try { @@ -85,7 +85,7 @@ public void nullNodeList() { // When serverInfoAppender.appendServerInfo(range, nodeList, linkDataDuplexMap, timeoutMillis); // Then - Assert.assertNull(nodeList); + Assertions.assertNull(nodeList); verifyZeroInteractions(serverInstanceListDataSource); verifyZeroInteractions(linkDataDuplexMap); } @@ -99,7 +99,7 @@ public void emptyNodeList() { // When serverInfoAppender.appendServerInfo(range, nodeList, linkDataDuplexMap, timeoutMillis); // Then - Assert.assertTrue(nodeList.getNodeList().isEmpty()); + Assertions.assertTrue(nodeList.getNodeList().isEmpty()); verifyZeroInteractions(serverInstanceListDataSource); verifyZeroInteractions(linkDataDuplexMap); } @@ -119,7 +119,7 @@ public void wasNode() { // When serverInfoAppender.appendServerInfo(range, nodeList, linkDataDuplexMap, timeoutMillis); // Then - Assert.assertSame(serverInstanceList, wasNode.getServerInstanceList()); + Assertions.assertSame(serverInstanceList, wasNode.getServerInstanceList()); verifyZeroInteractions(linkDataDuplexMap); } @@ -142,8 +142,8 @@ public void wasNodes() { // When serverInfoAppender.appendServerInfo(range, nodeList, linkDataDuplexMap, timeoutMillis); // Then - Assert.assertSame(serverInstanceList1, wasNode1.getServerInstanceList()); - Assert.assertSame(serverInstanceList2, wasNode2.getServerInstanceList()); + Assertions.assertSame(serverInstanceList1, wasNode1.getServerInstanceList()); + Assertions.assertSame(serverInstanceList2, wasNode2.getServerInstanceList()); verifyZeroInteractions(linkDataDuplexMap); } @@ -169,7 +169,7 @@ public void terminalNode() { // When serverInfoAppender.appendServerInfo(range, nodeList, linkDataDuplexMap, timeoutMillis); // Then - Assert.assertEquals(1, terminalNode.getServerInstanceList().getInstanceCount()); + Assertions.assertEquals(1, terminalNode.getServerInstanceList().getInstanceCount()); } @Test @@ -198,7 +198,7 @@ public void terminalNode_multipleInstances() { // When serverInfoAppender.appendServerInfo(range, nodeList, linkDataDuplexMap, timeoutMillis); // Then - Assert.assertEquals(2, terminalNode.getServerInstanceList().getInstanceCount()); + Assertions.assertEquals(2, terminalNode.getServerInstanceList().getInstanceCount()); } @Test @@ -213,7 +213,7 @@ public void userNode() { // When serverInfoAppender.appendServerInfo(range, nodeList, linkDataDuplexMap, timeoutMillis); // Then - Assert.assertEquals(0, userNode.getServerInstanceList().getInstanceCount()); + Assertions.assertEquals(0, userNode.getServerInstanceList().getInstanceCount()); verifyZeroInteractions(linkDataDuplexMap); } @@ -229,7 +229,7 @@ public void unknownNode() { // When serverInfoAppender.appendServerInfo(range, nodeList, linkDataDuplexMap, timeoutMillis); // Then - Assert.assertEquals(0, unknownNode.getServerInstanceList().getInstanceCount()); + Assertions.assertEquals(0, unknownNode.getServerInstanceList().getInstanceCount()); verifyZeroInteractions(linkDataDuplexMap); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/AgentTimeHistogramTest.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/AgentTimeHistogramTest.java index 40ec09ef6575..71c7bc31c015 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/AgentTimeHistogramTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/AgentTimeHistogramTest.java @@ -30,8 +30,8 @@ import com.navercorp.pinpoint.web.vo.stat.chart.application.DoubleApplicationStatPoint; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringWriter; @@ -82,13 +82,13 @@ public void getSampledAgentApdexScoreListTest() { AgentTimeHistogram histogram = builder.build(responseHistogramList); List sampledApdexScore1 = histogram.getSampledAgentApdexScoreList("test3"); - Assert.assertEquals(sampledApdexScore1.size(), 2); + Assertions.assertEquals(sampledApdexScore1.size(), 2); List sampledApdexScore2 = histogram.getSampledAgentApdexScoreList("test4"); - Assert.assertEquals(sampledApdexScore2.size(), 2); + Assertions.assertEquals(sampledApdexScore2.size(), 2); List wrongSampledApdexScore = histogram.getSampledAgentApdexScoreList("wrongAgentName"); - Assert.assertEquals(wrongSampledApdexScore.size(), 0); + Assertions.assertEquals(wrongSampledApdexScore.size(), 0); } @Test @@ -101,11 +101,11 @@ public void getApplicationApdexScoreListTest() { AgentTimeHistogram histogram = builder.build(responseHistogramList); List applicationStatPointList = histogram.getApplicationApdexScoreList(timeWindow); - Assert.assertEquals(applicationStatPointList.size(), 2); - Assert.assertEquals(applicationStatPointList.get(0).getXVal(), 0); - Assert.assertEquals(applicationStatPointList.get(0).getYValForAvg(), 1.0, 0.001); - Assert.assertEquals(applicationStatPointList.get(1).getXVal(), 1000 * 60); - Assert.assertEquals(applicationStatPointList.get(1).getYValForAvg(), 0.5, 0.001); + Assertions.assertEquals(applicationStatPointList.size(), 2); + Assertions.assertEquals(applicationStatPointList.get(0).getXVal(), 0); + Assertions.assertEquals(applicationStatPointList.get(0).getYValForAvg(), 1.0, 0.001); + Assertions.assertEquals(applicationStatPointList.get(1).getXVal(), 1000 * 60); + Assertions.assertEquals(applicationStatPointList.get(1).getYValForAvg(), 0.5, 0.001); } private List createResponseTime(Application app, String agentName1, String agentName2) { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/ApdexScoreTest.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/ApdexScoreTest.java index cba1a4b58b5d..958887951476 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/ApdexScoreTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/ApdexScoreTest.java @@ -4,8 +4,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.json.JSONException; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.skyscreamer.jsonassert.JSONAssert; import org.skyscreamer.jsonassert.JSONCompareMode; @@ -20,25 +20,25 @@ public class ApdexScoreTest { @Test public void getApdexScore() { ApdexScore apdexScore = new ApdexScore(100, 0, 100); - Assert.assertEquals(1.00, apdexScore.getApdexScore(), 0.001); + Assertions.assertEquals(1.00, apdexScore.getApdexScore(), 0.001); ApdexScore apdexScore1 = new ApdexScore(100, 0, 200); - Assert.assertEquals(0.50, apdexScore1.getApdexScore(), 0.001); + Assertions.assertEquals(0.50, apdexScore1.getApdexScore(), 0.001); ApdexScore apdexScore2 = new ApdexScore(60, 30, 100); - Assert.assertEquals(0.75, apdexScore2.getApdexScore(), 0.001); + Assertions.assertEquals(0.75, apdexScore2.getApdexScore(), 0.001); } @Test public void getApdexScore_floatingPoint() { ApdexScore apdexScore = new ApdexScore(Long.MAX_VALUE - 1, 0, Long.MAX_VALUE); - Assert.assertEquals(0.999, apdexScore.getApdexScore(), 0.001); + Assertions.assertEquals(0.999, apdexScore.getApdexScore(), 0.001); } @Test public void getApdexScore_divide_by_zero() { ApdexScore apdexScore = new ApdexScore(0, 0, 0); - Assert.assertEquals(0, apdexScore.getApdexScore(), 0.001); + Assertions.assertEquals(0, apdexScore.getApdexScore(), 0.001); } @Test diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/ApplicationTimeHistogramTest.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/ApplicationTimeHistogramTest.java index 780e00d7e113..a3a45b58bded 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/ApplicationTimeHistogramTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/ApplicationTimeHistogramTest.java @@ -16,17 +16,16 @@ package com.navercorp.pinpoint.web.applicationmap.histogram; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectWriter; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.view.TimeViewModel; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.vo.ResponseTime; - -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ObjectWriter; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.ArrayList; @@ -45,7 +44,7 @@ public class ApplicationTimeHistogramTest { public void testViewModel() throws IOException { Application app = new Application("test", ServiceType.STAND_ALONE); - ApplicationTimeHistogramBuilder builder = new ApplicationTimeHistogramBuilder(app, Range.between(0, 10*6000)); + ApplicationTimeHistogramBuilder builder = new ApplicationTimeHistogramBuilder(app, Range.between(0, 10 * 6000)); List responseHistogramList = createResponseTime(app); ApplicationTimeHistogram histogram = builder.build(responseHistogramList); @@ -64,8 +63,8 @@ private List createResponseTime(Application app) { one.addResponseTime("test", (short) 1000, 1); responseTimeList.add(one); - ResponseTime two = new ResponseTime(app.getName(), app.getServiceType(), 1000*60); - two .addResponseTime("test", (short) 3000, 1); + ResponseTime two = new ResponseTime(app.getName(), app.getServiceType(), 1000 * 60); + two.addResponseTime("test", (short) 3000, 1); responseTimeList.add(two); return responseTimeList; } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/HistogramTest.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/HistogramTest.java index d74219791227..8719d1d2e385 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/HistogramTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/histogram/HistogramTest.java @@ -21,11 +21,10 @@ import com.navercorp.pinpoint.common.trace.BaseHistogramSchema; import com.navercorp.pinpoint.common.trace.HistogramSchema; import com.navercorp.pinpoint.common.trace.ServiceType; - -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.HashMap; @@ -42,42 +41,42 @@ public class HistogramTest { public void pingSlot() { Histogram histogram = new Histogram(ServiceType.STAND_ALONE); histogram.addCallCount(BaseHistogramSchema.NORMAL_SCHEMA.getPingSlot().getSlotTime(), 1); - Assert.assertEquals(1, histogram.getPingCount()); + Assertions.assertEquals(1, histogram.getPingCount()); - Assert.assertEquals(0, histogram.getErrorCount()); + Assertions.assertEquals(0, histogram.getErrorCount()); } @Test public void maxSlot() { Histogram histogram = new Histogram(ServiceType.STAND_ALONE); histogram.addCallCount(BaseHistogramSchema.NORMAL_SCHEMA.getMaxStatSlot().getSlotTime(), 1000); - Assert.assertEquals(1000, histogram.getMaxElapsed()); + Assertions.assertEquals(1000, histogram.getMaxElapsed()); - Assert.assertEquals(0, histogram.getErrorCount()); + Assertions.assertEquals(0, histogram.getErrorCount()); } @Test public void errorSlot() { Histogram histogram = new Histogram(ServiceType.STAND_ALONE); histogram.addCallCount(BaseHistogramSchema.NORMAL_SCHEMA.getErrorSlot().getSlotTime(), 1); - Assert.assertEquals(1, histogram.getErrorCount()); - Assert.assertEquals(0, histogram.getSuccessCount()); + Assertions.assertEquals(1, histogram.getErrorCount()); + Assertions.assertEquals(0, histogram.getSuccessCount()); } @Test public void slowSlot() { Histogram histogram = new Histogram(ServiceType.STAND_ALONE); histogram.addCallCount(BaseHistogramSchema.NORMAL_SCHEMA.getSlowSlot().getSlotTime(), 1); - Assert.assertEquals(1, histogram.getSlowCount()); - Assert.assertEquals(1, histogram.getSuccessCount()); + Assertions.assertEquals(1, histogram.getSlowCount()); + Assertions.assertEquals(1, histogram.getSuccessCount()); } @Test public void verySlowSlot() { Histogram histogram = new Histogram(ServiceType.STAND_ALONE); histogram.addCallCount(BaseHistogramSchema.NORMAL_SCHEMA.getVerySlowSlot().getSlotTime(), 1); - Assert.assertEquals(1, histogram.getVerySlowCount()); - Assert.assertEquals(1, histogram.getSuccessCount()); + Assertions.assertEquals(1, histogram.getVerySlowCount()); + Assertions.assertEquals(1, histogram.getSuccessCount()); } @Test @@ -87,13 +86,13 @@ public void testDeepCopy() throws Exception { Histogram copy = new Histogram(ServiceType.STAND_ALONE); - Assert.assertEquals(copy.getFastCount(), 0); + Assertions.assertEquals(copy.getFastCount(), 0); copy.add(original); - Assert.assertEquals(original.getFastCount(), copy.getFastCount()); + Assertions.assertEquals(original.getFastCount(), copy.getFastCount()); copy.addCallCount((short) 1000, 100); - Assert.assertEquals(original.getFastCount(), 100); - Assert.assertEquals(copy.getFastCount(), 200); + Assertions.assertEquals(original.getFastCount(), 100); + Assertions.assertEquals(copy.getFastCount(), 200); } @@ -106,7 +105,7 @@ public void testJson() throws Exception { String json = objectMapper.writeValueAsString(original); HashMap hashMap = objectMapper.readValue(json, HashMap.class); - Assert.assertEquals(hashMap.get(schema.getFastSlot().getSlotName()), 100); - Assert.assertEquals(hashMap.get(schema.getErrorSlot().getSlotName()), 0); + Assertions.assertEquals(hashMap.get(schema.getFastSlot().getSlotName()), 100); + Assertions.assertEquals(hashMap.get(schema.getErrorSlot().getSlotName()), 0); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/link/PostfixServerMatcherTest.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/link/PostfixServerMatcherTest.java index 161b4cdb8426..d172a7e35b90 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/link/PostfixServerMatcherTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/link/PostfixServerMatcherTest.java @@ -16,11 +16,12 @@ package com.navercorp.pinpoint.web.applicationmap.link; -import static org.junit.Assert.*; - -import org.junit.Test; - import com.navercorp.pinpoint.web.applicationmap.link.LinkInfo.LinkType; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author minwoo.jung diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/rawdata/AgentHistogramTest.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/rawdata/AgentHistogramTest.java index 07c416293520..99eba7a85ac4 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/rawdata/AgentHistogramTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/rawdata/AgentHistogramTest.java @@ -20,11 +20,10 @@ import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram; import com.navercorp.pinpoint.web.vo.Application; - -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.util.HashMap; @@ -45,14 +44,14 @@ public void testDeepCopy() { agentHistogram.addTimeHistogram(histogram); AgentHistogram copy = new AgentHistogram(agentHistogram); - Assert.assertEquals(copy.getHistogram().getTotalErrorCount(), 1); + Assertions.assertEquals(copy.getHistogram().getTotalErrorCount(), 1); TimeHistogram histogram2 = new TimeHistogram(ServiceType.STAND_ALONE, 0); histogram2.addCallCount(ServiceType.STAND_ALONE.getHistogramSchema().getFastErrorSlot().getSlotTime(), 2); agentHistogram.addTimeHistogram(histogram2); - Assert.assertEquals(agentHistogram.getHistogram().getTotalErrorCount(), 3); + Assertions.assertEquals(agentHistogram.getHistogram().getTotalErrorCount(), 3); - Assert.assertEquals(copy.getHistogram().getTotalErrorCount(), 1); + Assertions.assertEquals(copy.getHistogram().getTotalErrorCount(), 1); } @@ -66,12 +65,12 @@ public void testJsonCompatibility() throws Exception { AgentHistogram copy = new AgentHistogram(agentHistogram); logger.debug(copy.getHistogram().toString()); - Assert.assertEquals(copy.getHistogram().getTotalErrorCount(), 1); + Assertions.assertEquals(copy.getHistogram().getTotalErrorCount(), 1); TimeHistogram histogram2 = new TimeHistogram(ServiceType.STAND_ALONE, 0); histogram2.addCallCount(ServiceType.STAND_ALONE.getHistogramSchema().getFastErrorSlot().getSlotTime(), 2); agentHistogram.addTimeHistogram(histogram2); - Assert.assertEquals(agentHistogram.getHistogram().getTotalErrorCount(), 3); + Assertions.assertEquals(agentHistogram.getHistogram().getTotalErrorCount(), 3); String callJson = mapper.writeValueAsString(agentHistogram); String before = originalJson(agentHistogram); @@ -80,7 +79,7 @@ public void testJsonCompatibility() throws Exception { logger.debug("BEFORE:{}", before); HashMap beforeJsonHashMap = mapper.readValue(before, HashMap.class); logger.debug("{} {}", callJsonHashMap, beforeJsonHashMap); - Assert.assertEquals(callJsonHashMap, beforeJsonHashMap); + Assertions.assertEquals(callJsonHashMap, beforeJsonHashMap); } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkCallDataTest.java b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkCallDataTest.java index 7e1478bf9313..30f81facc26f 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkCallDataTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/applicationmap/rawdata/LinkCallDataTest.java @@ -1,16 +1,15 @@ package com.navercorp.pinpoint.web.applicationmap.rawdata; -import java.util.concurrent.TimeUnit; - -import org.junit.Test; - +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.util.TimeWindow; import com.navercorp.pinpoint.web.util.TimeWindowDownSampler; import com.navercorp.pinpoint.web.vo.LinkKey; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; + +import java.util.concurrent.TimeUnit; public class LinkCallDataTest { private final Logger logger = LogManager.getLogger(this.getClass()); diff --git a/web/src/test/java/com/navercorp/pinpoint/web/authorization/controller/ChartTypeMappingBuilderTest.java b/web/src/test/java/com/navercorp/pinpoint/web/authorization/controller/ChartTypeMappingBuilderTest.java index ec23f6347b16..dfbac9cde656 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/authorization/controller/ChartTypeMappingBuilderTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/authorization/controller/ChartTypeMappingBuilderTest.java @@ -1,8 +1,8 @@ package com.navercorp.pinpoint.web.authorization.controller; import com.navercorp.pinpoint.web.service.stat.ChartTypeSupport; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Map; @@ -12,7 +12,7 @@ public class ChartTypeMappingBuilderTest { public void build() { ChartTypeMappingBuilder builder = new ChartTypeMappingBuilder<>(); Map map = builder.build(List.of(new TestApplicationStatChartService())); - Assert.assertEquals(1, map.size()); + Assertions.assertEquals(1, map.size()); } public static class TestApplicationStatChartService implements ChartTypeSupport { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/CallTreeAssert.java b/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/CallTreeAssert.java index 7837a1bf3d3b..bc2022be3257 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/CallTreeAssert.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/CallTreeAssert.java @@ -20,7 +20,7 @@ import java.util.List; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; /** * @author jaehong.kim diff --git a/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/CallTreeIteratorTest.java b/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/CallTreeIteratorTest.java index 55359f4f2148..71e9619df6f0 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/CallTreeIteratorTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/CallTreeIteratorTest.java @@ -15,13 +15,10 @@ */ package com.navercorp.pinpoint.web.calltree.span; -import static org.junit.Assert.assertEquals; - import org.apache.commons.collections4.CollectionUtils; -import org.junit.Test; - -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.LinkedList; @@ -30,6 +27,8 @@ import java.util.Queue; import java.util.concurrent.LinkedBlockingQueue; +import static org.junit.jupiter.api.Assertions.assertEquals; + /** * @author jaehong.kim */ @@ -472,9 +471,9 @@ private void assertCallTree(CallTree callTree, List stackEvents, boo for (CallTreeNode callTreeNode : callTree) { Align align = callTreeNode.getAlign(); final StackEvent stackEvent = stackEventQueue.poll(); - assertEquals("depth " + index, stackEvent.getDepth(), align.getDepth()); - assertEquals("gap " + index, stackEvent.getGap(), align.getGap()); - assertEquals("exec " + index, stackEvent.getExec(), align.getExecutionMilliseconds()); + assertEquals(stackEvent.getDepth(), align.getDepth(), "depth " + index); + assertEquals(stackEvent.getGap(), align.getGap(), "gap " + index); + assertEquals(stackEvent.getExec(), align.getExecutionMilliseconds(), "exec " + index); index++; } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/CallTreeTest.java b/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/CallTreeTest.java index 85fbc94d34e8..b926818c3e14 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/CallTreeTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/CallTreeTest.java @@ -16,15 +16,14 @@ package com.navercorp.pinpoint.web.calltree.span; -import static org.junit.Assert.*; +import com.navercorp.pinpoint.common.server.bo.SpanBo; +import com.navercorp.pinpoint.common.server.bo.SpanEventBo; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import org.junit.Test; - -import com.navercorp.pinpoint.common.server.bo.SpanBo; -import com.navercorp.pinpoint.common.server.bo.SpanEventBo; +import static org.junit.jupiter.api.Assertions.fail; /** * diff --git a/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/SpanAlignerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/SpanAlignerTest.java index 7ab3c7e9fa0f..3e9d1d9d21c8 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/SpanAlignerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/SpanAlignerTest.java @@ -21,8 +21,8 @@ import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.util.ArrayList; @@ -37,7 +37,7 @@ public class SpanAlignerTest { private ServiceTypeRegistryService serviceTypeRegistryService; - @Before + @BeforeEach public void setUp() throws Exception { serviceTypeRegistryService = Mockito.mock(ServiceTypeRegistryService.class); Mockito.when(serviceTypeRegistryService.findServiceType(Mockito.anyShort())).thenReturn(ServiceType.UNKNOWN); diff --git a/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/SpanCallTreeTest.java b/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/SpanCallTreeTest.java index e83e57dde9f6..4df2fe5d24e7 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/SpanCallTreeTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/SpanCallTreeTest.java @@ -1,8 +1,8 @@ package com.navercorp.pinpoint.web.calltree.span; import com.navercorp.pinpoint.common.server.bo.SpanBo; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.function.Predicate; @@ -18,7 +18,7 @@ public void hasFocusSpan1() { SpanCallTree callTreeNodes = new SpanCallTree(rootAlign); Predicate spanBoPredicate = SpanFilters.agentIdFilter("root"); - Assert.assertTrue(callTreeNodes.filterSpan(spanBoPredicate)); + Assertions.assertTrue(callTreeNodes.filterSpan(spanBoPredicate)); } @Test @@ -30,7 +30,7 @@ public void hasFocusSpan2() { SpanCallTree callTreeNodes = new SpanCallTree(rootAlign); Predicate spanBoPredicate = SpanFilters.agentIdFilter("unknown"); - Assert.assertFalse(callTreeNodes.filterSpan(spanBoPredicate)); + Assertions.assertFalse(callTreeNodes.filterSpan(spanBoPredicate)); } @Test @@ -38,13 +38,13 @@ public void hasFocusSpan_child_travel() { SpanCallTree rootCallTreeNodes = childTree("root", "child1", "child2"); Predicate spanBoPredicate = SpanFilters.agentIdFilter("root"); - Assert.assertTrue(rootCallTreeNodes.filterSpan(spanBoPredicate)); + Assertions.assertTrue(rootCallTreeNodes.filterSpan(spanBoPredicate)); Predicate spanBoPredicate1 = SpanFilters.agentIdFilter("child1"); - Assert.assertTrue(rootCallTreeNodes.filterSpan(spanBoPredicate1)); + Assertions.assertTrue(rootCallTreeNodes.filterSpan(spanBoPredicate1)); Predicate spanBoPredicate2 = SpanFilters.agentIdFilter("child2"); - Assert.assertTrue(rootCallTreeNodes.filterSpan(spanBoPredicate2)); + Assertions.assertTrue(rootCallTreeNodes.filterSpan(spanBoPredicate2)); } @Test @@ -52,7 +52,7 @@ public void hasFocusSpan_child_travel_not_found() { SpanCallTree rootCallTreeNodes = childTree("root", "child2", "child3"); Predicate spanBoPredicate = SpanFilters.agentIdFilter("xxx"); - Assert.assertFalse(rootCallTreeNodes.filterSpan(spanBoPredicate)); + Assertions.assertFalse(rootCallTreeNodes.filterSpan(spanBoPredicate)); } private SpanCallTree childTree(String parentAgentId, String childAgentId1, String childAgentId2) { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/SpanFiltersTest.java b/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/SpanFiltersTest.java index f6610824de2b..34b3f99bf520 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/SpanFiltersTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/SpanFiltersTest.java @@ -1,11 +1,11 @@ package com.navercorp.pinpoint.web.calltree.span; import com.navercorp.pinpoint.common.server.bo.SpanBo; -import org.junit.Assert; -import org.junit.Ignore; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import java.util.function.Predicate; @@ -22,7 +22,7 @@ public void agentIfFilter_check_null() { Predicate filter = SpanFilters.agentIdFilter(agentId); SpanBo spanBo = new SpanBo(); - Assert.assertFalse(filter.test(spanBo)); + Assertions.assertFalse(filter.test(spanBo)); } @Test @@ -33,7 +33,7 @@ public void buildViewPointFilter() { spanBo.setCollectorAcceptTime(collectorAcceptTime); spanBo.setAgentId(agentId); spanBo.setSpanId(spanId); - Assert.assertTrue(filter.test(spanBo)); + Assertions.assertTrue(filter.test(spanBo)); } @Test @@ -43,10 +43,10 @@ public void buildViewPointFilter_empty_spanId() { spanBo.setCollectorAcceptTime(collectorAcceptTime); spanBo.setAgentId(agentId); spanBo.setSpanId(1234); - Assert.assertTrue(filter.test(spanBo)); + Assertions.assertTrue(filter.test(spanBo)); } - @Ignore + @Disabled @Test public void buildViewPointFilter_chain_name() { Predicate filter = SpanFilters.spanFilter(-1, agentId, collectorAcceptTime); diff --git a/web/src/test/java/com/navercorp/pinpoint/web/cluster/ClusterIdTest.java b/web/src/test/java/com/navercorp/pinpoint/web/cluster/ClusterIdTest.java index 895d28bfd033..b462b12746ee 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/cluster/ClusterIdTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/cluster/ClusterIdTest.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.web.cluster; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class ClusterIdTest { @@ -9,26 +9,26 @@ public class ClusterIdTest { public void newClusterId1() { ClusterId clusterId = ClusterId.newClusterId("/pinpoint/collector/test"); - Assert.assertEquals("/pinpoint/collector", clusterId.getParentPath()); - Assert.assertEquals("test", clusterId.getCollectorId()); - Assert.assertNull(clusterId.getApplicationName()); + Assertions.assertEquals("/pinpoint/collector", clusterId.getParentPath()); + Assertions.assertEquals("test", clusterId.getCollectorId()); + Assertions.assertNull(clusterId.getApplicationName()); } @Test public void newClusterByZKPath() { ClusterId clusterId = ClusterId.newClusterId("/pinpoint/collector", "HOST_NAME@1234$$appName"); - Assert.assertEquals("/pinpoint/collector", clusterId.getParentPath()); - Assert.assertEquals("HOST_NAME@1234", clusterId.getCollectorId()); - Assert.assertEquals("appName", clusterId.getApplicationName()); + Assertions.assertEquals("/pinpoint/collector", clusterId.getParentPath()); + Assertions.assertEquals("HOST_NAME@1234", clusterId.getCollectorId()); + Assertions.assertEquals("appName", clusterId.getApplicationName()); } @Test public void newClusterByZKPath_noAppName() { ClusterId clusterId = ClusterId.newClusterId("/pinpoint/collector", "HOST_NAME@1234"); - Assert.assertEquals("/pinpoint/collector", clusterId.getParentPath()); - Assert.assertEquals("HOST_NAME@1234", clusterId.getCollectorId()); - Assert.assertNull(clusterId.getApplicationName()); + Assertions.assertEquals("/pinpoint/collector", clusterId.getParentPath()); + Assertions.assertEquals("HOST_NAME@1234", clusterId.getCollectorId()); + Assertions.assertNull(clusterId.getApplicationName()); } } \ No newline at end of file diff --git a/web/src/test/java/com/navercorp/pinpoint/web/cluster/ClusterTest.java b/web/src/test/java/com/navercorp/pinpoint/web/cluster/ClusterTest.java index 50a43870ebff..367495589b4d 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/cluster/ClusterTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/cluster/ClusterTest.java @@ -23,9 +23,10 @@ import com.navercorp.pinpoint.web.cluster.connection.ClusterConnectionManager; import com.navercorp.pinpoint.web.cluster.zookeeper.ZookeeperClusterDataManager; import com.navercorp.pinpoint.web.config.WebClusterConfig; - import org.apache.curator.test.TestingServer; import org.apache.curator.utils.ZKPaths; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; @@ -33,13 +34,11 @@ import org.awaitility.Awaitility; import org.awaitility.core.ConditionFactory; import org.hamcrest.collection.IsEmptyCollection; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.springframework.util.SocketUtils; import java.nio.charset.Charset; @@ -48,7 +47,8 @@ import java.util.List; import java.util.concurrent.TimeUnit; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.is; +import static org.hamcrest.Matchers.not; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -85,7 +85,7 @@ private ConditionFactory awaitility() { private static TestingServer ts = null; - @BeforeClass + @BeforeAll public static void setUp() throws Exception { zookeeperPort = SocketUtils.findAvailableTcpPort(28000); zookeeperAddress = DEFAULT_IP + ":" + zookeeperPort; @@ -120,7 +120,7 @@ public static void setUp() throws Exception { clusterDataManager.registerWebCluster(acceptorAddress, convertIpListToBytes(localV4IpList, "\r\n")); } - @AfterClass + @AfterAll public static void tearDown() throws Exception { closeZookeeperServer(ts); @@ -168,7 +168,7 @@ private static byte[] convertIpListToBytes(List ipList, String delimiter return stringBuilder.toString().getBytes(UTF_8_CHARSET); } - @After + @AfterEach public void after() throws Exception { ts.restart(); } @@ -203,9 +203,9 @@ public void process(WatchedEvent watchedEvent) { awaitZookeeperDisconnected(zookeeper); try { zookeeper.getData(CLUSTER_NODE_PATH, null, null); - Assert.fail(); + Assertions.fail(); } catch (KeeperException e) { - Assert.assertEquals(KeeperException.Code.CONNECTIONLOSS, e.code()); + Assertions.assertEquals(KeeperException.Code.CONNECTIONLOSS, e.code()); // TODO Auto-generated catch block e.printStackTrace(); } @@ -231,12 +231,12 @@ public void process(WatchedEvent watchedEvent) { }); awaitZookeeperConnected(zookeeper); - Assert.assertEquals(0, clusterConnectionManager.getClusterList().size()); + Assertions.assertEquals(0, clusterConnectionManager.getClusterList().size()); testPinpointClient.connect(DEFAULT_IP, acceptorPort); awaitPinpointClientConnected(clusterConnectionManager); - Assert.assertEquals(1, clusterConnectionManager.getClusterList().size()); + Assertions.assertEquals(1, clusterConnectionManager.getClusterList().size()); } finally { testPinpointClient.closeAll(); if (zookeeper != null) { @@ -266,10 +266,10 @@ private void getNodeAndCompareContents(ZooKeeper zookeeper) throws KeeperExcepti List ipList = NetUtils.getLocalV4IpList(); - Assert.assertEquals(registeredIpList.length, ipList.size()); + Assertions.assertEquals(registeredIpList.length, ipList.size()); for (String ip : registeredIpList) { - Assert.assertTrue(ipList.contains(ip)); + Assertions.assertTrue(ipList.contains(ip)); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/cluster/CollectorClusterInfoRepositoryTest.java b/web/src/test/java/com/navercorp/pinpoint/web/cluster/CollectorClusterInfoRepositoryTest.java index 09a851427053..c2153e936c19 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/cluster/CollectorClusterInfoRepositoryTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/cluster/CollectorClusterInfoRepositoryTest.java @@ -17,10 +17,10 @@ package com.navercorp.pinpoint.web.cluster; import com.navercorp.pinpoint.common.server.cluster.AgentInfoKey; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.Set; @@ -47,10 +47,10 @@ public void test() throws Exception { List collectorList = info.get(agent1); logger.debug("{}", collectorList); - Assert.assertEquals(clusterId, collectorList.get(0)); + Assertions.assertEquals(clusterId, collectorList.get(0)); info.remove(clusterId); - Assert.assertTrue("Not found", info.get(agent1).isEmpty()); + Assertions.assertTrue(info.get(agent1).isEmpty(), "Not found"); } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/cluster/PinpointRouteResponseTest.java b/web/src/test/java/com/navercorp/pinpoint/web/cluster/PinpointRouteResponseTest.java index 92f16a1243c1..d6d038a5905b 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/cluster/PinpointRouteResponseTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/cluster/PinpointRouteResponseTest.java @@ -20,12 +20,19 @@ import com.navercorp.pinpoint.thrift.dto.command.TCommandEcho; import com.navercorp.pinpoint.thrift.dto.command.TCommandTransferResponse; import com.navercorp.pinpoint.thrift.dto.command.TRouteResult; -import com.navercorp.pinpoint.thrift.io.*; +import com.navercorp.pinpoint.thrift.io.DeserializerFactory; +import com.navercorp.pinpoint.thrift.io.HeaderTBaseDeserializer; +import com.navercorp.pinpoint.thrift.io.HeaderTBaseDeserializerFactory; +import com.navercorp.pinpoint.thrift.io.HeaderTBaseSerializer; +import com.navercorp.pinpoint.thrift.io.HeaderTBaseSerializerFactory; +import com.navercorp.pinpoint.thrift.io.SerializerFactory; +import com.navercorp.pinpoint.thrift.io.TCommandRegistry; +import com.navercorp.pinpoint.thrift.io.TCommandTypeVersion; import org.apache.thrift.TBase; import org.apache.thrift.protocol.TCompactProtocol; import org.apache.thrift.protocol.TProtocolFactory; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author Taejin Koo @@ -47,8 +54,8 @@ public void routeResponseTest1() throws Exception { DefaultPinpointRouteResponse response = new DefaultPinpointRouteResponse(contents); response.parse(deserializerFactory); - Assert.assertEquals(TRouteResult.UNKNOWN, response.getRouteResult()); - Assert.assertTrue(response.getResponse() instanceof TCommandEcho); + Assertions.assertEquals(TRouteResult.UNKNOWN, response.getRouteResult()); + Assertions.assertTrue(response.getResponse() instanceof TCommandEcho); } @Test @@ -61,9 +68,9 @@ public void routeResponseTest2() throws Exception { DefaultPinpointRouteResponse response = new DefaultPinpointRouteResponse(responsePayload); response.parse(deserializerFactory); - Assert.assertEquals(TRouteResult.OK, response.getRouteResult()); - Assert.assertTrue(response.getResponse() instanceof TCommandEcho); - Assert.assertNull(response.getMessage()); + Assertions.assertEquals(TRouteResult.OK, response.getRouteResult()); + Assertions.assertTrue(response.getResponse() instanceof TCommandEcho); + Assertions.assertNull(response.getMessage()); } @Test @@ -76,9 +83,9 @@ public void routeResponseTest3() throws Exception { DefaultPinpointRouteResponse response = new DefaultPinpointRouteResponse(responsePayload); response.parse(deserializerFactory); - Assert.assertEquals(TRouteResult.OK, response.getRouteResult()); - Assert.assertNull(response.getResponse()); - Assert.assertEquals(message, response.getMessage()); + Assertions.assertEquals(TRouteResult.OK, response.getRouteResult()); + Assertions.assertNull(response.getResponse()); + Assertions.assertEquals(message, response.getMessage()); } private TCommandEcho createCommandEcho(String message) { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/cluster/connection/ClusterConnectorTest.java b/web/src/test/java/com/navercorp/pinpoint/web/cluster/connection/ClusterConnectorTest.java index 6328c7400e8c..f75a8c13757b 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/cluster/connection/ClusterConnectorTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/cluster/connection/ClusterConnectorTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.web.cluster.connection; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.net.InetSocketAddress; @@ -29,21 +29,21 @@ public class ClusterConnectorTest { @Test public void testParseInetSocketAddress() { InetSocketAddress inetSocketAddress = ClusterConnector.parseInetSocketAddress("127.0.0.1:8080"); - Assert.assertEquals(inetSocketAddress.getAddress().getHostAddress(), "127.0.0.1"); - Assert.assertEquals(inetSocketAddress.getPort(), 8080); + Assertions.assertEquals(inetSocketAddress.getAddress().getHostAddress(), "127.0.0.1"); + Assertions.assertEquals(inetSocketAddress.getPort(), 8080); } @Test public void testParseInetSocketAddress_error1() { InetSocketAddress inetSocketAddress = ClusterConnector.parseInetSocketAddress("127.0.0.1"); - Assert.assertNull(inetSocketAddress); + Assertions.assertNull(inetSocketAddress); } @Test public void testParseInetSocketAddress_error2() { InetSocketAddress inetSocketAddress = ClusterConnector.parseInetSocketAddress("127.0.0.1:"); - Assert.assertNull(inetSocketAddress); + Assertions.assertNull(inetSocketAddress); } } \ No newline at end of file diff --git a/web/src/test/java/com/navercorp/pinpoint/web/cluster/zookeeper/ZookeeperClusterTest.java b/web/src/test/java/com/navercorp/pinpoint/web/cluster/zookeeper/ZookeeperClusterTest.java index b630ab24ac43..0d6b1878889a 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/cluster/zookeeper/ZookeeperClusterTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/cluster/zookeeper/ZookeeperClusterTest.java @@ -22,9 +22,10 @@ import com.navercorp.pinpoint.web.cluster.ClusterId; import com.navercorp.pinpoint.web.config.WebClusterConfig; import com.navercorp.pinpoint.web.util.PinpointWebTestUtils; - import org.apache.curator.test.TestingServer; import org.apache.curator.utils.ZKPaths; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.WatchedEvent; @@ -34,14 +35,12 @@ import org.awaitility.Awaitility; import org.awaitility.core.ConditionFactory; import org.hamcrest.collection.IsEmptyCollection; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; import org.springframework.util.SocketUtils; import java.util.List; @@ -76,7 +75,7 @@ private ConditionFactory awaitility() { return conditionFactory; } - @BeforeClass + @BeforeAll public static void setUp() throws Exception { int acceptorPort = SocketUtils.findAvailableTcpPort(); zookeeperPort = SocketUtils.findAvailableTcpPort(acceptorPort + 1); @@ -105,12 +104,12 @@ private static WebClusterConfig getWebClusterConfig() { return mockWebClusterConfig; } - @AfterClass + @AfterAll public static void tearDown() { closeZookeeperServer(ts); } - @After + @AfterEach public void after() throws Exception { ts.restart(); } @@ -136,11 +135,11 @@ public void process(WatchedEvent event) { awaitCheckAgentRegistered(manager, "a", "b", 1L); List agentList = manager.getRegisteredAgentList("a", "b", 1L); - Assert.assertEquals(1, agentList.size()); - Assert.assertEquals("test", agentList.get(0).getCollectorId()); + Assertions.assertEquals(1, agentList.size()); + Assertions.assertEquals("test", agentList.get(0).getCollectorId()); agentList = manager.getRegisteredAgentList("b", "c", 1L); - Assert.assertEquals(0, agentList.size()); + Assertions.assertEquals(0, agentList.size()); zookeeper.setData(COLLECTOR_TEST_NODE_PATH, "".getBytes(), -1); awaitCheckAgentUnRegistered(manager, "a", "b", 1L); @@ -182,19 +181,19 @@ public void process(WatchedEvent watchedEvent) { awaitCheckAgentRegistered(manager, "a", "b", 1L); List agentList = manager.getRegisteredAgentList("a", "b", 1L); - Assert.assertEquals(1, agentList.size()); - Assert.assertEquals("test", agentList.get(0).getCollectorId()); + Assertions.assertEquals(1, agentList.size()); + Assertions.assertEquals("test", agentList.get(0).getCollectorId()); zookeeper.setData(COLLECTOR_TEST_NODE_PATH, "a:b:1\r\nc:d:2".getBytes(), -1); awaitCheckAgentRegistered(manager, "c", "d", 2L); agentList = manager.getRegisteredAgentList("a", "b", 1L); - Assert.assertEquals(1, agentList.size()); - Assert.assertEquals("test", agentList.get(0).getCollectorId()); + Assertions.assertEquals(1, agentList.size()); + Assertions.assertEquals("test", agentList.get(0).getCollectorId()); agentList = manager.getRegisteredAgentList("c", "d", 2L); - Assert.assertEquals(1, agentList.size()); - Assert.assertEquals("test", agentList.get(0).getCollectorId()); + Assertions.assertEquals(1, agentList.size()); + Assertions.assertEquals("test", agentList.get(0).getCollectorId()); zookeeper.delete(COLLECTOR_TEST_NODE_PATH, -1); Thread.sleep(10000); @@ -202,10 +201,10 @@ public void process(WatchedEvent watchedEvent) { awaitCheckAgentUnRegistered(manager, "a", "b", 1L); agentList = manager.getRegisteredAgentList("a", "b", 1L); - Assert.assertEquals(0, agentList.size()); + Assertions.assertEquals(0, agentList.size()); agentList = manager.getRegisteredAgentList("c", "d", 2L); - Assert.assertEquals(0, agentList.size()); + Assertions.assertEquals(0, agentList.size()); } finally { closeZk(zookeeper); closeManager(manager); @@ -255,10 +254,10 @@ private void getNodeAndCompareContents(ZooKeeper zookeeper) throws KeeperExcepti List ipList = NetUtils.getLocalV4IpList(); - Assert.assertEquals(registeredIpList.length, ipList.size()); + Assertions.assertEquals(registeredIpList.length, ipList.size()); for (String ip : registeredIpList) { - Assert.assertTrue(ipList.contains(ip)); + Assertions.assertTrue(ipList.contains(ip)); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/config/ExperimentalConfigTest.java b/web/src/test/java/com/navercorp/pinpoint/web/config/ExperimentalConfigTest.java index c4364734288b..74a7966cd2e8 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/config/ExperimentalConfigTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/config/ExperimentalConfigTest.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.web.config; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.springframework.mock.env.MockEnvironment; import java.util.Map; @@ -19,8 +19,8 @@ public void getProperties_filter() { Map map = config.getProperties(); - Assert.assertEquals(1, map.size()); - Assert.assertEquals("strValue", map.get(key)); + Assertions.assertEquals(1, map.size()); + Assertions.assertEquals("strValue", map.get(key)); } @Test @@ -38,8 +38,8 @@ public void getProperties_boolean() { Map map = config.getProperties(); - Assert.assertEquals(Boolean.FALSE, map.get(falseKey)); - Assert.assertEquals(Boolean.TRUE, map.get(trueKey)); + Assertions.assertEquals(Boolean.FALSE, map.get(falseKey)); + Assertions.assertEquals(Boolean.TRUE, map.get(trueKey)); } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/config/PropertiesVerificationTest.java b/web/src/test/java/com/navercorp/pinpoint/web/config/PropertiesVerificationTest.java index c8b56674bb1c..156842e2e146 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/config/PropertiesVerificationTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/config/PropertiesVerificationTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.common.util.PropertyUtils; import com.navercorp.pinpoint.common.util.StringUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Properties; @@ -36,10 +36,10 @@ public void checkHbasePropertiesTest() throws Exception { Properties properties = PropertyUtils.loadPropertyFromClassPath("hbase-root.properties"); String clientHost = properties.getProperty("hbase.client.host"); - Assert.assertEquals(HBASE_CLIENT_HOST_VALUE, clientHost); + Assertions.assertEquals(HBASE_CLIENT_HOST_VALUE, clientHost); String clientPort = properties.getProperty("hbase.client.port"); - Assert.assertEquals("2181", clientPort); + Assertions.assertEquals("2181", clientPort); } @Test @@ -47,13 +47,13 @@ public void checkWebPropertiesTest() throws Exception { Properties properties = PropertyUtils.loadPropertyFromClassPath("pinpoint-web-root.properties"); String pinpointZKAddress = properties.getProperty("pinpoint.zookeeper.address"); - Assert.assertEquals(LOCAL_HOST, pinpointZKAddress); + Assertions.assertEquals(LOCAL_HOST, pinpointZKAddress); String zookeeperAddress = properties.getProperty("cluster.zookeeper.address"); - Assert.assertEquals(HBASE_CLIENT_HOST_VALUE, zookeeperAddress); + Assertions.assertEquals(HBASE_CLIENT_HOST_VALUE, zookeeperAddress); String connectAddress = properties.getProperty("cluster.connect.address"); - Assert.assertTrue(StringUtils.isEmpty(connectAddress)); + Assertions.assertTrue(StringUtils.isEmpty(connectAddress)); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/controller/AlarmControllerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/controller/AlarmControllerTest.java index a9ecd47f8961..d2544d00b3f8 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/controller/AlarmControllerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/controller/AlarmControllerTest.java @@ -15,42 +15,41 @@ */ package com.navercorp.pinpoint.web.controller; -import static org.hamcrest.Matchers.hasKey; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.navercorp.pinpoint.web.dao.AlarmDao; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.navercorp.pinpoint.web.dao.AlarmDao; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.hamcrest.Matchers.hasKey; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; /** * @author minwoo.jung */ -@Ignore -@RunWith(SpringJUnit4ClassRunner.class) +@Disabled +@ExtendWith(SpringExtension.class) @WebAppConfiguration @ContextConfiguration(locations = {"classpath:servlet-context-web.xml", "classpath:applicationContext-web.xml"}) public class AlarmControllerTest { @@ -85,7 +84,7 @@ public class AlarmControllerTest { private MockMvc mockMvc; - @Before + @BeforeEach public void setup() { this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); this.alarmDao.deleteRuleByUserGroupId(USER_GROUP_ID); @@ -114,8 +113,8 @@ public void insertAndSelectAndDeleteRule() throws Exception { ObjectMapper objectMapper = new ObjectMapper(); Map resultMap = objectMapper.readValue(content, HashMap.class); - Assert.assertEquals(resultMap.get("result"), "SUCCESS"); - Assert.assertNotNull(resultMap.get("ruleId")); + Assertions.assertEquals(resultMap.get("result"), "SUCCESS"); + Assertions.assertNotNull(resultMap.get("ruleId")); this.mockMvc.perform(get("/alarmRule.pinpoint?userGroupId=" + USER_GROUP_ID)) .andExpect(status().isOk()) @@ -160,8 +159,8 @@ public void updateRule() throws Exception { ObjectMapper objectMapper = new ObjectMapper(); Map resultMap = objectMapper.readValue(content, HashMap.class); - Assert.assertEquals(resultMap.get("result"), "SUCCESS"); - Assert.assertNotNull(resultMap.get("ruleId")); + Assertions.assertEquals(resultMap.get("result"), "SUCCESS"); + Assertions.assertNotNull(resultMap.get("ruleId")); String updatedJsonParm = "{" + "\"ruleId\" : \"" + resultMap.get("ruleId") + "\"," + @@ -201,6 +200,6 @@ public void checkerTest() throws Exception { String content = result.getResponse().getContentAsString(); ObjectMapper objectMapper = new ObjectMapper(); List checkerList = objectMapper.readValue(content, List.class); - Assert.assertNotEquals(checkerList.size(), 0); + Assertions.assertNotEquals(checkerList.size(), 0); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/controller/ConfigControllerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/controller/ConfigControllerTest.java index 5151aa534de4..0faf91329458 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/controller/ConfigControllerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/controller/ConfigControllerTest.java @@ -15,37 +15,36 @@ */ package com.navercorp.pinpoint.web.controller; -import static org.hamcrest.Matchers.hasKey; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.apache.logging.log4j.Logger; +import com.navercorp.pinpoint.web.dao.UserDao; +import com.navercorp.pinpoint.web.vo.User; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; -import com.navercorp.pinpoint.web.dao.UserDao; -import com.navercorp.pinpoint.web.vo.User; +import static org.hamcrest.Matchers.hasKey; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; /** * @author minwoo.jung */ -@Ignore -@RunWith(SpringJUnit4ClassRunner.class) +@Disabled +@ExtendWith(SpringExtension.class) @WebAppConfiguration @ContextConfiguration(locations = {"classpath:servlet-context-web.xml", "classpath:applicationContext-web.xml"}) public class ConfigControllerTest { @@ -60,13 +59,13 @@ public class ConfigControllerTest { private static final User user = new User("naver01", "min", "pinpoint", 82, "010", "min@naver0.com"); - @Before + @BeforeEach public void before() { this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); this.userDao.insertUser(user); } - @After + @AfterEach public void after() { this.userDao.deleteUser(user.getUserId()); } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/controller/UserControllerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/controller/UserControllerTest.java index 93ad1d215ad2..944205de3710 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/controller/UserControllerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/controller/UserControllerTest.java @@ -15,35 +15,34 @@ */ package com.navercorp.pinpoint.web.controller; -import static org.hamcrest.Matchers.hasKey; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import com.navercorp.pinpoint.web.dao.UserDao; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; -import com.navercorp.pinpoint.web.dao.UserDao; +import static org.hamcrest.Matchers.hasKey; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; /** * @author minwoo.jung */ -@Ignore -@RunWith(SpringJUnit4ClassRunner.class) +@Disabled +@ExtendWith(SpringExtension.class) @WebAppConfiguration @ContextConfiguration(locations = {"classpath:servlet-context-web.xml", "classpath:applicationContext-web.xml"}) public class UserControllerTest { @@ -66,7 +65,7 @@ public class UserControllerTest { private MockMvc mockMvc; - @Before + @BeforeEach public void setup() { this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); userDao.deleteUser(USER_ID); diff --git a/web/src/test/java/com/navercorp/pinpoint/web/controller/UserGroupControllerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/controller/UserGroupControllerTest.java index 5ff66ba02d14..34302d964315 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/controller/UserGroupControllerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/controller/UserGroupControllerTest.java @@ -15,47 +15,46 @@ */ package com.navercorp.pinpoint.web.controller; -import static org.hamcrest.Matchers.hasKey; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; -import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.junit.runner.RunWith; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.navercorp.pinpoint.web.dao.UserDao; +import com.navercorp.pinpoint.web.dao.UserGroupDao; +import com.navercorp.pinpoint.web.vo.User; +import com.navercorp.pinpoint.web.vo.UserGroup; +import com.navercorp.pinpoint.web.vo.UserGroupMember; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.web.context.WebApplicationContext; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.navercorp.pinpoint.web.dao.UserDao; -import com.navercorp.pinpoint.web.dao.UserGroupDao; -import com.navercorp.pinpoint.web.vo.User; -import com.navercorp.pinpoint.web.vo.UserGroup; -import com.navercorp.pinpoint.web.vo.UserGroupMember; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.hamcrest.Matchers.hasKey; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; /** * @author minwoo.jung */ -@Ignore -@RunWith(SpringJUnit4ClassRunner.class) +@Disabled +@ExtendWith(SpringExtension.class) @WebAppConfiguration @ContextConfiguration(locations = {"classpath:servlet-context-web.xml", "classpath:applicationContext-web.xml"}) public class UserGroupControllerTest { @@ -83,7 +82,7 @@ public class UserGroupControllerTest { private MockMvc mockMvc; private final User user = new User(TEST_USER_GROUP_MEMBER_ID, "userName", "pinpoint_team", 82, "0101234", "pinpoint_team@navercorp.com"); - @Before + @BeforeEach public void setup() { this.mockMvc = MockMvcBuilders.webAppContextSetup(this.wac).build(); userGroupDao.deleteUserGroup(new UserGroup("", TEST_USER_GROUP_ID)); @@ -100,7 +99,7 @@ public void setup() { userGroupDao.insertMember(new UserGroupMember(TEST_USER_GROUP_ID3, TEST_USER_GROUP_MEMBER_ID2)); } - @After + @AfterEach public void after(){ userDao.deleteUser(user.getUserId()); @@ -121,7 +120,7 @@ public void selectUserGroupByUserId() throws Exception { String content = result.getResponse().getContentAsString(); ObjectMapper objectMapper = new ObjectMapper(); List userGroupList = objectMapper.readValue(content, List.class); - Assert.assertEquals(userGroupList.size(), 2); + Assertions.assertEquals(userGroupList.size(), 2); } @Test @@ -134,7 +133,7 @@ public void selectUserGroupByUserGroupId() throws Exception { String content = result.getResponse().getContentAsString(); ObjectMapper objectMapper = new ObjectMapper(); List userGroupList = objectMapper.readValue(content, List.class); - Assert.assertEquals(userGroupList.size(), 2); + Assertions.assertEquals(userGroupList.size(), 2); } @Test diff --git a/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/HbaseAgentLifeCycleDaoTest.java b/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/HbaseAgentLifeCycleDaoTest.java index d520f1dee73e..b805a2477486 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/HbaseAgentLifeCycleDaoTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/HbaseAgentLifeCycleDaoTest.java @@ -32,9 +32,9 @@ import com.navercorp.pinpoint.web.vo.AgentStatusQuery; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Scan; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.Spy; @@ -77,7 +77,7 @@ public boolean hasDefaultNameSpace() { private AgentLifeCycleDao agentLifeCycleDao; - @Before + @BeforeEach public void setUp() throws Exception { MockitoAnnotations.initMocks(this); this.agentLifeCycleDao = new HbaseAgentLifeCycleDao(hbaseOperations2, tableNameProvider, agentLifeCycleMapper); @@ -95,9 +95,9 @@ public void status_should_be_set_appropriately_if_status_is_known() { // When AgentStatus agentStatus = this.agentLifeCycleDao.getAgentStatus(expectedAgentId, expectedTimestamp); // Then - Assert.assertEquals(expectedAgentId, agentStatus.getAgentId()); - Assert.assertEquals(expectedTimestamp, agentStatus.getEventTimestamp()); - Assert.assertEquals(expectedAgentLifeCycleState, agentStatus.getState()); + Assertions.assertEquals(expectedAgentId, agentStatus.getAgentId()); + Assertions.assertEquals(expectedTimestamp, agentStatus.getEventTimestamp()); + Assertions.assertEquals(expectedAgentLifeCycleState, agentStatus.getState()); } @Test @@ -112,9 +112,9 @@ public void status_should_be_unknown_if_status_cannot_be_found() { // When AgentStatus agentStatus = this.agentLifeCycleDao.getAgentStatus(expectedAgentId, expectedTimestamp); // Then - Assert.assertEquals(expectedAgentId, agentStatus.getAgentId()); - Assert.assertEquals(expectedTimestamp, agentStatus.getEventTimestamp()); - Assert.assertEquals(expectedAgentLifeCycleState, agentStatus.getState()); + Assertions.assertEquals(expectedAgentId, agentStatus.getAgentId()); + Assertions.assertEquals(expectedTimestamp, agentStatus.getEventTimestamp()); + Assertions.assertEquals(expectedAgentLifeCycleState, agentStatus.getState()); } @Test @@ -134,9 +134,9 @@ public void agentInfo_should_be_populated_appropriately_if_status_is_known() { givenAgentInfo.setStatus(agentStatus.get()); // Then AgentStatus actualAgentStatus = givenAgentInfo.getStatus(); - Assert.assertEquals(expectedAgentId, actualAgentStatus.getAgentId()); - Assert.assertEquals(expectedTimestamp, actualAgentStatus.getEventTimestamp()); - Assert.assertEquals(expectedAgentLifeCycleState, actualAgentStatus.getState()); + Assertions.assertEquals(expectedAgentId, actualAgentStatus.getAgentId()); + Assertions.assertEquals(expectedTimestamp, actualAgentStatus.getEventTimestamp()); + Assertions.assertEquals(expectedAgentLifeCycleState, actualAgentStatus.getState()); } @Test @@ -158,9 +158,9 @@ public void agentInfo_should_be_populated_as_unknown_if_status_cannot_be_found() // Then AgentStatus actualAgentStatus = givenAgentInfo.getStatus(); - Assert.assertEquals(expectedAgentId, actualAgentStatus.getAgentId()); - Assert.assertEquals(expectedTimestamp, actualAgentStatus.getEventTimestamp()); - Assert.assertEquals(expectedAgentLifeCycleState, actualAgentStatus.getState()); + Assertions.assertEquals(expectedAgentId, actualAgentStatus.getAgentId()); + Assertions.assertEquals(expectedTimestamp, actualAgentStatus.getEventTimestamp()); + Assertions.assertEquals(expectedAgentLifeCycleState, actualAgentStatus.getState()); } @Test @@ -183,14 +183,14 @@ public void agentInfos_should_be_populated_accordingly_even_with_nulls() { List> agentStatus = this.agentLifeCycleDao.getAgentStatus(query); // Then - Assert.assertEquals(nonNullAgentInfo, givenAgentInfos.get(0)); - Assert.assertEquals(nullAgentInfo, givenAgentInfos.get(1)); - Assert.assertEquals(nonNullAgentInfo, givenAgentInfos.get(2)); - Assert.assertEquals(nullAgentInfo, givenAgentInfos.get(3)); + Assertions.assertEquals(nonNullAgentInfo, givenAgentInfos.get(0)); + Assertions.assertEquals(nullAgentInfo, givenAgentInfos.get(1)); + Assertions.assertEquals(nonNullAgentInfo, givenAgentInfos.get(2)); + Assertions.assertEquals(nullAgentInfo, givenAgentInfos.get(3)); AgentStatus nonNullAgentInfoStatus = agentStatus.get(0).get(); - Assert.assertEquals(expectedAgentId, nonNullAgentInfoStatus.getAgentId()); - Assert.assertEquals(expectedTimestamp, Instant.ofEpochMilli(nonNullAgentInfoStatus.getEventTimestamp())); - Assert.assertEquals(expectedAgentLifeCycleState, nonNullAgentInfoStatus.getState()); + Assertions.assertEquals(expectedAgentId, nonNullAgentInfoStatus.getAgentId()); + Assertions.assertEquals(expectedTimestamp, Instant.ofEpochMilli(nonNullAgentInfoStatus.getEventTimestamp())); + Assertions.assertEquals(expectedAgentLifeCycleState, nonNullAgentInfoStatus.getState()); } @Test diff --git a/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/HbaseApiMetaDataDaoTest.java b/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/HbaseApiMetaDataDaoTest.java index 2898fdccc05b..9f0fdcb7a82d 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/HbaseApiMetaDataDaoTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/HbaseApiMetaDataDaoTest.java @@ -1,12 +1,12 @@ package com.navercorp.pinpoint.web.dao.hbase; -import static org.junit.Assert.assertEquals; - -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; +import static org.junit.jupiter.api.Assertions.assertEquals; + public class HbaseApiMetaDataDaoTest { @Test diff --git a/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/HbaseApplicationTraceIndexDaoTest.java b/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/HbaseApplicationTraceIndexDaoTest.java index fdc0edd5487a..73e5e217cccb 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/HbaseApplicationTraceIndexDaoTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/HbaseApplicationTraceIndexDaoTest.java @@ -16,22 +16,26 @@ package com.navercorp.pinpoint.web.dao.hbase; -import com.navercorp.pinpoint.common.hbase.*; +import com.navercorp.pinpoint.common.hbase.HbaseOperations2; +import com.navercorp.pinpoint.common.hbase.HbaseTable; +import com.navercorp.pinpoint.common.hbase.LimitEventHandler; +import com.navercorp.pinpoint.common.hbase.RowMapper; +import com.navercorp.pinpoint.common.hbase.TableNameProvider; import com.navercorp.pinpoint.common.profiler.util.TransactionId; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.config.ScatterChartConfig; import com.navercorp.pinpoint.web.dao.ApplicationTraceIndexDao; import com.navercorp.pinpoint.web.scatter.ScatterData; import com.navercorp.pinpoint.web.scatter.ScatterDataBuilder; import com.navercorp.pinpoint.web.util.ListListUtils; import com.navercorp.pinpoint.web.vo.LimitedScanResult; -import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.vo.scatter.Dot; import com.sematext.hbase.wd.AbstractRowKeyDistributor; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Scan; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.Spy; @@ -41,6 +45,7 @@ import java.util.List; import java.util.function.Predicate; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.mock; @@ -81,16 +86,18 @@ public boolean hasDefaultNameSpace() { private ApplicationTraceIndexDao applicationTraceIndexDao; - @Before + @BeforeEach public void setUp() throws Exception { MockitoAnnotations.initMocks(this); ScatterChartConfig scatterChartConfig = new ScatterChartConfig(); this.applicationTraceIndexDao = new HbaseApplicationTraceIndexDao(scatterChartConfig, hbaseOperations2, tableNameProvider, traceIndexMapper, traceIndexScatterMapper, traceIdRowKeyDistributor); } - @Test(expected = IllegalArgumentException.class) + @Test public void scanTraceIndexExceptionTest() { - this.applicationTraceIndexDao.scanTraceIndex("app", Range.between(0, 10), -20, false); + assertThrows(IllegalArgumentException.class, () -> { + this.applicationTraceIndexDao.scanTraceIndex("app", Range.between(0, 10), -20, false); + }); } @Test @@ -100,19 +107,21 @@ public void scanTraceIndexTest() { anyInt(), any(RowMapper.class), any(LimitEventHandler.class), anyInt())).thenReturn(scannedList); LimitedScanResult> result = this.applicationTraceIndexDao.scanTraceIndex("app", Range.between(1000L, 5000L), 20, false); - Assert.assertEquals(1000L, result.getLimitedTime()); - Assert.assertEquals(ListListUtils.toList(scannedList), result.getScanData()); + Assertions.assertEquals(1000L, result.getLimitedTime()); + Assertions.assertEquals(ListListUtils.toList(scannedList), result.getScanData()); // using last row accessor result = this.applicationTraceIndexDao.scanTraceIndex("app", Range.between(1000L, 5000L), 5, true); - Assert.assertEquals(-1L, result.getLimitedTime()); - Assert.assertEquals(ListListUtils.toList(scannedList), result.getScanData()); + Assertions.assertEquals(-1L, result.getLimitedTime()); + Assertions.assertEquals(ListListUtils.toList(scannedList), result.getScanData()); } - @Test(expected = IllegalArgumentException.class) + @Test public void scanTraceScatterDataExceptionTest() { - this.applicationTraceIndexDao.scanTraceScatterData("app", Range.between(1000L, 5000L), -10, false); + assertThrows(IllegalArgumentException.class, () -> { + this.applicationTraceIndexDao.scanTraceScatterData("app", Range.between(1000L, 5000L), -10, false); + }); } @Test @@ -122,14 +131,14 @@ public void scanTraceScatterDataEmptyTest() { anyInt(), any(RowMapper.class), any(LimitEventHandler.class), anyInt())).thenReturn(scannedList); Range range = Range.between(1000L, 5000L); LimitedScanResult> scanResult - = this.applicationTraceIndexDao.scanTraceScatterData("app", range,10, false); + = this.applicationTraceIndexDao.scanTraceScatterData("app", range, 10, false); ScatterDataBuilder builder = new ScatterDataBuilder(range.getFrom(), range.getTo(), 1, 5); scanResult.getScanData().forEach(builder::addDot); ScatterData result = builder.build(); - Assert.assertEquals(1000L, result.getFrom()); - Assert.assertEquals(5000L, result.getTo()); - Assert.assertEquals(0, result.getScatterData().size()); + Assertions.assertEquals(1000L, result.getFrom()); + Assertions.assertEquals(5000L, result.getTo()); + Assertions.assertEquals(0, result.getScatterData().size()); } @Test @@ -139,14 +148,14 @@ public void scanTraceScatterDataTest() { anyInt(), any(RowMapper.class), anyInt())).thenReturn(scatterDotList); Range range = Range.between(1000L, 5000L); LimitedScanResult> scanResult - = this.applicationTraceIndexDao.scanTraceScatterData("app", range,10, false); + = this.applicationTraceIndexDao.scanTraceScatterData("app", range, 10, false); ScatterDataBuilder builder = new ScatterDataBuilder(range.getFrom(), range.getTo(), 1, 5); scanResult.getScanData().forEach(builder::addDot); ScatterData result = builder.build(); - Assert.assertEquals(1000L, result.getFrom()); - Assert.assertEquals(5000L, result.getTo()); - Assert.assertEquals(2000L, result.getOldestAcceptedTime()); - Assert.assertEquals(3000L, result.getLatestAcceptedTime()); + Assertions.assertEquals(1000L, result.getFrom()); + Assertions.assertEquals(5000L, result.getTo()); + Assertions.assertEquals(2000L, result.getOldestAcceptedTime()); + Assertions.assertEquals(3000L, result.getLatestAcceptedTime()); } private List> createScatterDotList() { @@ -181,7 +190,7 @@ public void dotStatusFilterTest() { when(dot.getAgentId()).thenReturn("agent"); when(dot.getStatus()).thenReturn(Dot.Status.SUCCESS); - Assert.assertTrue(dotStatusFilter.test(dot)); + Assertions.assertTrue(dotStatusFilter.test(dot)); } @Test @@ -191,7 +200,7 @@ public void dotStatusFilterTest_fail1() { when(dot.getAgentId()).thenReturn("agent"); when(dot.getStatus()).thenReturn(Dot.Status.FAILED); - Assert.assertFalse(dotStatusFilter.test(dot)); + Assertions.assertFalse(dotStatusFilter.test(dot)); } @@ -202,7 +211,7 @@ public void dotStatusFilterTest_fail2() { when(dot.getAgentId()).thenReturn("xxx"); when(dot.getStatus()).thenReturn(Dot.Status.SUCCESS); - Assert.assertFalse(dotStatusFilter.test(dot)); + Assertions.assertFalse(dotStatusFilter.test(dot)); } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/PartitionTest.java b/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/PartitionTest.java index c7dec289d4c0..1ccba46b7e0c 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/PartitionTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/PartitionTest.java @@ -2,8 +2,8 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; @@ -33,7 +33,7 @@ public void splitTransactionIdList() throws Exception { private void assertPartition(int size) throws NoSuchFieldException, IllegalAccessException { List> daoImpl = splitTransactionIdList(original, size); List> guava = ListUtils.partition(original, size); - Assert.assertEquals(guava , daoImpl); + Assertions.assertEquals(guava , daoImpl); } static List> splitTransactionIdList(List transactionIdList, int maxTransactionIdListSize) { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/SpanQueryBuilderTest.java b/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/SpanQueryBuilderTest.java index 04c9cacb86f3..2cee372a96dc 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/SpanQueryBuilderTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/SpanQueryBuilderTest.java @@ -4,8 +4,8 @@ import com.navercorp.pinpoint.common.server.bo.SpanBo; import com.navercorp.pinpoint.web.calltree.span.SpanFilters; import com.navercorp.pinpoint.web.vo.SpanHint; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.function.Predicate; @@ -30,7 +30,7 @@ public void spanFilter() { span.setElapsed(200); span.setApplicationId("appName"); - Assert.assertTrue(filter.test(span)); + Assertions.assertTrue(filter.test(span)); } @Test @@ -43,7 +43,7 @@ public void spanFilter_false() { SpanBo span = new SpanBo(); - Assert.assertFalse(filter.test(span)); + Assertions.assertFalse(filter.test(span)); } @Test @@ -54,7 +54,7 @@ public void spanFilter_txid() { SpanBo span = new SpanBo(); span.setTransactionId(txId); - Assert.assertTrue(filter.test(span)); + Assertions.assertTrue(filter.test(span)); } @Test @@ -65,7 +65,7 @@ public void spanFilter_collectorAcceptTime() { SpanBo span = new SpanBo(); span.setCollectorAcceptTime(COLLECTOR_ACCEPTOR_TIME); - Assert.assertTrue(filter.test(span)); + Assertions.assertTrue(filter.test(span)); } @Test @@ -76,6 +76,6 @@ public void spanFilter_responseTime() { SpanBo span = new SpanBo(); span.setElapsed(RESPONSE_TIME); - Assert.assertTrue(filter.test(span)); + Assertions.assertTrue(filter.test(span)); } } \ No newline at end of file diff --git a/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/filter/PrefixFilterTest.java b/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/filter/PrefixFilterTest.java index cf0bb17f51f9..e8461fcae904 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/filter/PrefixFilterTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/dao/hbase/filter/PrefixFilterTest.java @@ -16,14 +16,12 @@ package com.navercorp.pinpoint.web.dao.hbase.filter; -import java.util.Arrays; - -import org.junit.Test; - import com.navercorp.pinpoint.common.util.BytesUtils; - -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; + +import java.util.Arrays; public class PrefixFilterTest { private final Logger logger = LogManager.getLogger(this.getClass()); diff --git a/web/src/test/java/com/navercorp/pinpoint/web/dao/memory/MemoryAgentStatisticsDaoTest.java b/web/src/test/java/com/navercorp/pinpoint/web/dao/memory/MemoryAgentStatisticsDaoTest.java index 6d20c143cdbe..df5110889a7d 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/dao/memory/MemoryAgentStatisticsDaoTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/dao/memory/MemoryAgentStatisticsDaoTest.java @@ -16,11 +16,11 @@ package com.navercorp.pinpoint.web.dao.memory; -import com.navercorp.pinpoint.web.vo.AgentCountStatistics; import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; +import com.navercorp.pinpoint.web.vo.AgentCountStatistics; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -33,7 +33,7 @@ public class MemoryAgentStatisticsDaoTest { private static List testDataList; - @BeforeClass + @BeforeAll public static void setup() { testDataList = createTestData(100); } @@ -58,21 +58,21 @@ public void simpleTest() { Range range = Range.between(660L, 1320L); List agentCountStatisticses = dao.selectAgentCount(range); - Assert.assertEquals(7, agentCountStatisticses.size()); + Assertions.assertEquals(7, agentCountStatisticses.size()); range = Range.between(7100L, System.currentTimeMillis()); agentCountStatisticses = dao.selectAgentCount(range); - Assert.assertEquals(30, agentCountStatisticses.size()); + Assertions.assertEquals(30, agentCountStatisticses.size()); range = Range.between(0L, System.currentTimeMillis()); agentCountStatisticses = dao.selectAgentCount(range); - Assert.assertEquals(100, agentCountStatisticses.size()); + Assertions.assertEquals(100, agentCountStatisticses.size()); long currentTime = System.currentTimeMillis(); range = Range.between(currentTime, currentTime + 100); agentCountStatisticses = dao.selectAgentCount(range); - Assert.assertEquals(0, agentCountStatisticses.size()); + Assertions.assertEquals(0, agentCountStatisticses.size()); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/dao/memory/MemoryAlarmDaoTest.java b/web/src/test/java/com/navercorp/pinpoint/web/dao/memory/MemoryAlarmDaoTest.java index 33967285567d..aae4b7412a2c 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/dao/memory/MemoryAlarmDaoTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/dao/memory/MemoryAlarmDaoTest.java @@ -18,11 +18,11 @@ import com.navercorp.pinpoint.web.alarm.vo.Rule; import com.navercorp.pinpoint.web.dao.UserGroupDao; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; /** diff --git a/web/src/test/java/com/navercorp/pinpoint/web/dao/memory/MemoryUserDaoTest.java b/web/src/test/java/com/navercorp/pinpoint/web/dao/memory/MemoryUserDaoTest.java index f28f98ee7833..0265d636921d 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/dao/memory/MemoryUserDaoTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/dao/memory/MemoryUserDaoTest.java @@ -3,22 +3,22 @@ import com.navercorp.pinpoint.web.dao.UserGroupDao; import com.navercorp.pinpoint.web.vo.User; import com.navercorp.pinpoint.web.vo.UserGroupMember; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.when; /** * @author hyeran.lee */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class MemoryUserDaoTest { @Mock diff --git a/web/src/test/java/com/navercorp/pinpoint/web/dao/memory/MemoryUserGroupDaoTest.java b/web/src/test/java/com/navercorp/pinpoint/web/dao/memory/MemoryUserGroupDaoTest.java index 72985b048446..98ab3ecede35 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/dao/memory/MemoryUserGroupDaoTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/dao/memory/MemoryUserGroupDaoTest.java @@ -1,13 +1,12 @@ package com.navercorp.pinpoint.web.dao.memory; -import static org.junit.Assert.*; -import static org.mockito.Mockito.mock; - import com.navercorp.pinpoint.web.dao.UserDao; -import org.junit.Test; - import com.navercorp.pinpoint.web.vo.UserGroup; import com.navercorp.pinpoint.web.vo.UserGroupMember; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.mock; public class MemoryUserGroupDaoTest { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/filter/AcceptUrlFilterTest.java b/web/src/test/java/com/navercorp/pinpoint/web/filter/AcceptUrlFilterTest.java index 24bb3994e064..86bb6e2796fd 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/filter/AcceptUrlFilterTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/filter/AcceptUrlFilterTest.java @@ -17,8 +17,8 @@ package com.navercorp.pinpoint.web.filter; import com.navercorp.pinpoint.common.server.bo.SpanBo; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; @@ -36,7 +36,7 @@ public void acceptTest_1() { AcceptUrlFilter filter = new AcceptUrlFilter("/**/*"); SpanBo spanBo = new SpanBo(); spanBo.setRpc("/test"); - Assert.assertTrue(filter.accept(Arrays.asList(spanBo))); + Assertions.assertTrue(filter.accept(Arrays.asList(spanBo))); } @@ -46,7 +46,7 @@ public void acceptTest_2() { AcceptUrlFilter filter = new AcceptUrlFilter("/abc/*"); SpanBo spanBo = new SpanBo(); spanBo.setRpc("/test"); - Assert.assertFalse(filter.accept(Arrays.asList(spanBo))); + Assertions.assertFalse(filter.accept(Arrays.asList(spanBo))); } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/filter/FilterChainTest.java b/web/src/test/java/com/navercorp/pinpoint/web/filter/FilterChainTest.java index b93854265cd4..ad08a378df84 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/filter/FilterChainTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/filter/FilterChainTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.web.filter; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Collections; import java.util.List; @@ -36,7 +36,7 @@ public boolean include(List transaction) { } }; FilterChain> filterChain = new FilterChain<>(Collections.singletonList(filter)); - Assert.assertFalse(filterChain.include(Collections.singletonList("a"))); + Assertions.assertFalse(filterChain.include(Collections.singletonList("a"))); } } \ No newline at end of file diff --git a/web/src/test/java/com/navercorp/pinpoint/web/filter/FilterDescriptorTest.java b/web/src/test/java/com/navercorp/pinpoint/web/filter/FilterDescriptorTest.java index 5b3df84bce80..752e10cf6a20 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/filter/FilterDescriptorTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/filter/FilterDescriptorTest.java @@ -19,10 +19,10 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringWriter; @@ -46,19 +46,19 @@ public void convert() throws IOException { FilterDescriptor.ResponseTime responseTime = descriptor.getResponseTime(); FilterDescriptor.FromNode fromNode = descriptor.getFromNode(); - Assert.assertEquals("FROM_APPLICATION", fromNode.getApplicationName()); - Assert.assertEquals("FROM_SERVICE_TYPE", fromNode.getServiceType()); - Assert.assertEquals("FROM_AGENT_ID", fromNode.getAgentId()); - Assert.assertEquals((Long) 0L, descriptor.getResponseTime().getFromResponseTime()); + Assertions.assertEquals("FROM_APPLICATION", fromNode.getApplicationName()); + Assertions.assertEquals("FROM_SERVICE_TYPE", fromNode.getServiceType()); + Assertions.assertEquals("FROM_AGENT_ID", fromNode.getAgentId()); + Assertions.assertEquals((Long) 0L, descriptor.getResponseTime().getFromResponseTime()); FilterDescriptor.ToNode toNode = descriptor.getToNode(); - Assert.assertEquals("TO_APPLICATION", toNode.getApplicationName()); - Assert.assertEquals("TO_SERVICE_TYPE", toNode.getServiceType()); - Assert.assertEquals("TO_AGENT_ID", toNode.getAgentId()); - Assert.assertEquals((Long) 1000L, responseTime.getToResponseTime()); + Assertions.assertEquals("TO_APPLICATION", toNode.getApplicationName()); + Assertions.assertEquals("TO_SERVICE_TYPE", toNode.getServiceType()); + Assertions.assertEquals("TO_AGENT_ID", toNode.getAgentId()); + Assertions.assertEquals((Long) 1000L, responseTime.getToResponseTime()); - Assert.assertEquals(Boolean.TRUE, descriptor.getOption().getIncludeException()); - Assert.assertEquals("/**", descriptor.getOption().getUrlPattern()); + Assertions.assertEquals(Boolean.TRUE, descriptor.getOption().getIncludeException()); + Assertions.assertEquals("/**", descriptor.getOption().getUrlPattern()); } private String writeJsonString() throws IOException { @@ -105,15 +105,15 @@ public void convert_array() throws IOException { List descriptor = mapper.readValue(arrayJson, new TypeReference>() { }); - Assert.assertEquals(1, descriptor.size()); - Assert.assertNotNull(descriptor.get(0)); + Assertions.assertEquals(1, descriptor.size()); + Assertions.assertNotNull(descriptor.get(0)); } - @Test(expected = IOException.class) + @Test public void invalidJson() throws IOException { - - mapper.readValue("INVALID", new TypeReference>() { + Assertions.assertThrows(IOException.class, () -> { + mapper.readValue("INVALID", new TypeReference>() { + }); }); - } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/filter/FilterHintTest.java b/web/src/test/java/com/navercorp/pinpoint/web/filter/FilterHintTest.java index cfdfe4ba71d2..ebbd0cebc593 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/filter/FilterHintTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/filter/FilterHintTest.java @@ -16,13 +16,11 @@ package com.navercorp.pinpoint.web.filter; - -import org.junit.Assert; -import org.junit.Test; - import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.io.IOException; @@ -44,18 +42,18 @@ public void convert() throws IOException { final FilterHint hint = mapper.readValue(json, FilterHint.class); - Assert.assertNotNull(hint); - Assert.assertEquals(2, hint.size()); + Assertions.assertNotNull(hint); + Assertions.assertEquals(2, hint.size()); - Assert.assertTrue(hint.containApplicationHint("TO_APPLICATION")); - Assert.assertTrue(hint.containApplicationHint("TO_APPLICATION2")); - Assert.assertFalse(hint.containApplicationHint("TO_APPLICATION3")); + Assertions.assertTrue(hint.containApplicationHint("TO_APPLICATION")); + Assertions.assertTrue(hint.containApplicationHint("TO_APPLICATION2")); + Assertions.assertFalse(hint.containApplicationHint("TO_APPLICATION3")); - Assert.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION", "IP1", 1)); - Assert.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION", "IP2", 2)); + Assertions.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION", "IP1", 1)); + Assertions.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION", "IP2", 2)); - Assert.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION2", "IP3", 3)); - Assert.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION2", "IP4", 4)); + Assertions.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION2", "IP3", 3)); + Assertions.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION2", "IP4", 4)); } @Test @@ -66,17 +64,17 @@ public void convert_duplicate_applicationName_filter() throws IOException { final FilterHint hint = mapper.readValue(json, FilterHint.class); - Assert.assertNotNull(hint); - Assert.assertEquals(2, hint.size()); + Assertions.assertNotNull(hint); + Assertions.assertEquals(2, hint.size()); - Assert.assertTrue(hint.containApplicationHint("TO_APPLICATION")); - Assert.assertFalse(hint.containApplicationHint("TO_APPLICATION2")); + Assertions.assertTrue(hint.containApplicationHint("TO_APPLICATION")); + Assertions.assertFalse(hint.containApplicationHint("TO_APPLICATION2")); - Assert.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION", "IP1", 1)); - Assert.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION", "IP2", 2)); + Assertions.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION", "IP1", 1)); + Assertions.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION", "IP2", 2)); - Assert.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION", "IP3", 3)); - Assert.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION", "IP4", 4)); + Assertions.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION", "IP3", 3)); + Assertions.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION", "IP4", 4)); } @Test @@ -85,8 +83,8 @@ public void empty() throws IOException { final FilterHint hint = mapper.readValue(json, FilterHint.class); - Assert.assertNotNull(hint); - Assert.assertEquals(0, hint.size()); + Assertions.assertNotNull(hint); + Assertions.assertEquals(0, hint.size()); } @@ -98,14 +96,14 @@ public void empty_array() throws IOException { final FilterHint hint = mapper.readValue(json, FilterHint.class); - Assert.assertNotNull(hint); - Assert.assertEquals(1, hint.size()); - Assert.assertTrue(hint.getRpcHintList("TO_APPLICATION").get(0).getRpcTypeList().isEmpty()); + Assertions.assertNotNull(hint); + Assertions.assertEquals(1, hint.size()); + Assertions.assertTrue(hint.getRpcHintList("TO_APPLICATION").get(0).getRpcTypeList().isEmpty()); - Assert.assertTrue(hint.containApplicationHint("TO_APPLICATION")); - Assert.assertFalse(hint.containApplicationHint("TO_APPLICATION2")); + Assertions.assertTrue(hint.containApplicationHint("TO_APPLICATION")); + Assertions.assertFalse(hint.containApplicationHint("TO_APPLICATION2")); - Assert.assertFalse(hint.containApplicationEndpoint("TO_APPLICATION", "IP1", 1)); + Assertions.assertFalse(hint.containApplicationEndpoint("TO_APPLICATION", "IP1", 1)); } @@ -116,14 +114,14 @@ public void empty_array2() throws IOException { final FilterHint hint = mapper.readValue(json, FilterHint.class); - Assert.assertNotNull(hint); - Assert.assertEquals(2, hint.size()); + Assertions.assertNotNull(hint); + Assertions.assertEquals(2, hint.size()); - Assert.assertTrue(hint.containApplicationHint("TO_APPLICATION")); - Assert.assertTrue(hint.containApplicationHint("TO_APPLICATION2")); + Assertions.assertTrue(hint.containApplicationHint("TO_APPLICATION")); + Assertions.assertTrue(hint.containApplicationHint("TO_APPLICATION2")); - Assert.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION2", "IP3", 3)); - Assert.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION2", "IP4", 4)); + Assertions.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION2", "IP3", 3)); + Assertions.assertTrue(hint.containApplicationEndpoint("TO_APPLICATION2", "IP4", 4)); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/filter/LinkFilterTest.java b/web/src/test/java/com/navercorp/pinpoint/web/filter/LinkFilterTest.java index 1348975917a5..e9ad44293dd3 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/filter/LinkFilterTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/filter/LinkFilterTest.java @@ -1,24 +1,31 @@ package com.navercorp.pinpoint.web.filter; import com.navercorp.pinpoint.common.server.bo.AnnotationBo; +import com.navercorp.pinpoint.common.server.bo.SpanBo; import com.navercorp.pinpoint.common.server.bo.SpanEventBo; -import com.navercorp.pinpoint.loader.service.AnnotationKeyRegistryService; -import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; import com.navercorp.pinpoint.common.trace.AnnotationKey; import com.navercorp.pinpoint.common.trace.AnnotationKeyFactory; import com.navercorp.pinpoint.common.trace.ServiceType; -import com.navercorp.pinpoint.common.server.bo.SpanBo; +import com.navercorp.pinpoint.loader.service.AnnotationKeyRegistryService; +import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; import com.navercorp.pinpoint.web.TestTraceUtils; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Collections; -import static com.navercorp.pinpoint.web.TestTraceUtils.*; +import static com.navercorp.pinpoint.web.TestTraceUtils.BACKEND_TYPE_CODE; +import static com.navercorp.pinpoint.web.TestTraceUtils.BACKEND_TYPE_NAME; +import static com.navercorp.pinpoint.web.TestTraceUtils.MESSAGE_QUEUE_TYPE_CODE; +import static com.navercorp.pinpoint.web.TestTraceUtils.MESSAGE_QUEUE_TYPE_NAME; +import static com.navercorp.pinpoint.web.TestTraceUtils.RPC_TYPE_CODE; +import static com.navercorp.pinpoint.web.TestTraceUtils.TOMCAT_TYPE_NAME; +import static com.navercorp.pinpoint.web.TestTraceUtils.UNKNOWN_TYPE_NAME; +import static com.navercorp.pinpoint.web.TestTraceUtils.USER_TYPE_NAME; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -91,8 +98,8 @@ public void fromToFilterTest() { spanBoC.setServiceType(tomcatServiceType); spanBoC.setAgentId("AGENT_C"); - Assert.assertTrue(linkFilter.include(Arrays.asList(fromSpanBo, toSpanBO))); - Assert.assertFalse(linkFilter.include(Arrays.asList(fromSpanBo, spanBoC))); + Assertions.assertTrue(linkFilter.include(Arrays.asList(fromSpanBo, toSpanBO))); + Assertions.assertFalse(linkFilter.include(Arrays.asList(fromSpanBo, spanBoC))); } @@ -131,8 +138,8 @@ public void fromToFilterAgentTest() { spanBoC.setServiceType(tomcatServiceType); spanBoC.setAgentId("AGENT_C"); - Assert.assertTrue(linkFilter.include(Arrays.asList(fromSpanBo, toSpanBO))); - Assert.assertFalse(linkFilter.include(Arrays.asList(fromSpanBo, spanBoC))); + Assertions.assertTrue(linkFilter.include(Arrays.asList(fromSpanBo, toSpanBO))); + Assertions.assertFalse(linkFilter.include(Arrays.asList(fromSpanBo, spanBoC))); } @Test @@ -168,10 +175,10 @@ public void userToWasFilter() { appB_appA.setApplicationId("APP_A"); appB_appA.setApplicationServiceType(tomcat.getCode()); - Assert.assertTrue(linkFilter.include(Collections.singletonList(user_appA))); - Assert.assertFalse(linkFilter.include(Collections.singletonList(appA_appB))); - Assert.assertFalse(linkFilter.include(Collections.singletonList(appB_appA))); - Assert.assertTrue(linkFilter.include(Arrays.asList(user_appA, appA_appB, appB_appA))); + Assertions.assertTrue(linkFilter.include(Collections.singletonList(user_appA))); + Assertions.assertFalse(linkFilter.include(Collections.singletonList(appA_appB))); + Assertions.assertFalse(linkFilter.include(Collections.singletonList(appB_appA))); + Assertions.assertTrue(linkFilter.include(Arrays.asList(user_appA, appA_appB, appB_appA))); } private LinkFilter newLinkFilter(FilterDescriptor descriptor, FilterHint hint) { @@ -205,7 +212,7 @@ public void wasToUnknownFilter() { spanBo.setParentSpanId(-1); spanBo.setApplicationId("APP_A"); spanBo.setApplicationServiceType(tomcat.getCode()); - Assert.assertFalse(linkFilter.include(Collections.singletonList(spanBo))); + Assertions.assertFalse(linkFilter.include(Collections.singletonList(spanBo))); // Accept - has matching rpc span event AnnotationBo rpcAnnotation = new AnnotationBo(RPC_ANNOTATION_CODE, rpcUrl); @@ -214,7 +221,7 @@ public void wasToUnknownFilter() { rpcSpanEvent.setDestinationId(rpcHost); rpcSpanEvent.setAnnotationBoList(Collections.singletonList(rpcAnnotation)); spanBo.addSpanEvent(rpcSpanEvent); - Assert.assertTrue(linkFilter.include(Collections.singletonList(spanBo))); + Assertions.assertTrue(linkFilter.include(Collections.singletonList(spanBo))); } @Test @@ -244,7 +251,7 @@ public void wasToWasFilter_perfectMatch() { appA_appB.setParentSpanId(1); appA_appB.setApplicationId("APP_B"); appA_appB.setApplicationServiceType(tomcat.getCode()); - Assert.assertTrue(linkFilter.include(Arrays.asList(user_appA, appA_appB))); + Assertions.assertTrue(linkFilter.include(Arrays.asList(user_appA, appA_appB))); } @Test @@ -274,7 +281,7 @@ public void wasToWasFilter_noMatch() { appC_appB.setParentSpanId(1); appC_appB.setApplicationId("APP_B"); appC_appB.setApplicationServiceType(tomcat.getCode()); - Assert.assertFalse(linkFilter.include(Arrays.asList(user_appC, appC_appB))); + Assertions.assertFalse(linkFilter.include(Arrays.asList(user_appC, appC_appB))); // Reject - toNode different SpanBo user_appA = new SpanBo(); @@ -287,7 +294,7 @@ public void wasToWasFilter_noMatch() { appA_appC.setParentSpanId(1); appA_appC.setApplicationId("APP_C"); appA_appC.setApplicationServiceType(tomcat.getCode()); - Assert.assertFalse(linkFilter.include(Arrays.asList(user_appA, appA_appC))); + Assertions.assertFalse(linkFilter.include(Arrays.asList(user_appA, appA_appC))); } @Test @@ -332,11 +339,11 @@ public void wasToWasFilter_noMatch_missingReceivingSpan() { rpcSpanEvent.setAnnotationBoList(Collections.singletonList(rpcAnnotation)); fromSpan.addSpanEvent(rpcSpanEvent); // Reject - filter hint empty - Assert.assertFalse(emptyHintLinkFilter.include(Collections.singletonList(fromSpan))); + Assertions.assertFalse(emptyHintLinkFilter.include(Collections.singletonList(fromSpan))); // Reject - filter hint does not match - Assert.assertFalse(unmatchingHintLinkFilter.include(Collections.singletonList(fromSpan))); + Assertions.assertFalse(unmatchingHintLinkFilter.include(Collections.singletonList(fromSpan))); // Accept - filter hint matches - Assert.assertTrue(matchingHintLinkFilter.include(Collections.singletonList(fromSpan))); + Assertions.assertTrue(matchingHintLinkFilter.include(Collections.singletonList(fromSpan))); // Check rpc url as well final String unmatchingUrlPattern = "/other/test/**"; @@ -344,11 +351,11 @@ public void wasToWasFilter_noMatch_missingReceivingSpan() { // Reject - url pattern does not match when(option.getUrlPattern()).thenReturn(unmatchingUrlPattern); LinkFilter matchingHintLinkFilterWithUnmatchingUrlPattern = newLinkFilter(descriptor, matchingHint); - Assert.assertFalse(matchingHintLinkFilterWithUnmatchingUrlPattern.include(Collections.singletonList(fromSpan))); + Assertions.assertFalse(matchingHintLinkFilterWithUnmatchingUrlPattern.include(Collections.singletonList(fromSpan))); // Accept - url pattern matches when(option.getUrlPattern()).thenReturn(matchingUrlPattern); LinkFilter matchingHintLinkFilterWithMatchingUrlPattern = newLinkFilter(descriptor, matchingHint); - Assert.assertTrue(matchingHintLinkFilterWithMatchingUrlPattern.include(Collections.singletonList(fromSpan))); + Assertions.assertTrue(matchingHintLinkFilterWithMatchingUrlPattern.include(Collections.singletonList(fromSpan))); } @Test @@ -378,7 +385,7 @@ public void wasToBackendFilter() { spanEventDestinationA.setDestinationId(destinationA); spanEventDestinationA.setServiceType(BACKEND_TYPE_CODE); matchingSpan.addSpanEvent(spanEventDestinationA); - Assert.assertTrue(linkFilter.include(Collections.singletonList(matchingSpan))); + Assertions.assertTrue(linkFilter.include(Collections.singletonList(matchingSpan))); SpanBo unmatchingSpan = new SpanBo(); unmatchingSpan.setApplicationId("APP_A"); @@ -387,15 +394,15 @@ public void wasToBackendFilter() { spanEventDestinationB.setDestinationId(destinationB); spanEventDestinationB.setServiceType(BACKEND_TYPE_CODE); unmatchingSpan.addSpanEvent(spanEventDestinationB); - Assert.assertFalse(linkFilter.include(Collections.singletonList(unmatchingSpan))); + Assertions.assertFalse(linkFilter.include(Collections.singletonList(unmatchingSpan))); - Assert.assertTrue(linkFilter.include(Arrays.asList(matchingSpan, unmatchingSpan))); + Assertions.assertTrue(linkFilter.include(Arrays.asList(matchingSpan, unmatchingSpan))); SpanBo bothSpan = new SpanBo(); bothSpan.setApplicationId("APP_A"); bothSpan.setApplicationServiceType(tomcat.getCode()); bothSpan.addSpanEventBoList(Arrays.asList(spanEventDestinationA, spanEventDestinationB)); - Assert.assertTrue(linkFilter.include(Collections.singletonList(bothSpan))); + Assertions.assertTrue(linkFilter.include(Collections.singletonList(bothSpan))); } @Test @@ -425,7 +432,7 @@ public void wasToQueueFilter() { spanEventDestinationA.setDestinationId(messageQueueA); spanEventDestinationA.setServiceType(MESSAGE_QUEUE_TYPE_CODE); matchingSpan.addSpanEvent(spanEventDestinationA); - Assert.assertTrue(linkFilter.include(Collections.singletonList(matchingSpan))); + Assertions.assertTrue(linkFilter.include(Collections.singletonList(matchingSpan))); SpanBo unmatchingSpan = new SpanBo(); unmatchingSpan.setApplicationId("APP_A"); @@ -434,15 +441,15 @@ public void wasToQueueFilter() { spanEventDestinationB.setDestinationId(messageQueueB); spanEventDestinationB.setServiceType(MESSAGE_QUEUE_TYPE_CODE); unmatchingSpan.addSpanEvent(spanEventDestinationB); - Assert.assertFalse(linkFilter.include(Collections.singletonList(unmatchingSpan))); + Assertions.assertFalse(linkFilter.include(Collections.singletonList(unmatchingSpan))); - Assert.assertTrue(linkFilter.include(Arrays.asList(matchingSpan, unmatchingSpan))); + Assertions.assertTrue(linkFilter.include(Arrays.asList(matchingSpan, unmatchingSpan))); SpanBo bothSpan = new SpanBo(); bothSpan.setApplicationId("APP_A"); bothSpan.setApplicationServiceType(tomcat.getCode()); bothSpan.addSpanEventBoList(Arrays.asList(spanEventDestinationA, spanEventDestinationB)); - Assert.assertTrue(linkFilter.include(Collections.singletonList(bothSpan))); + Assertions.assertTrue(linkFilter.include(Collections.singletonList(bothSpan))); } @Test @@ -469,13 +476,13 @@ public void queueToWasFilter() { matchingSpan.setApplicationId("APP_A"); matchingSpan.setApplicationServiceType(tomcat.getCode()); matchingSpan.setAcceptorHost(messageQueueA); - Assert.assertTrue(linkFilter.include(Collections.singletonList(matchingSpan))); + Assertions.assertTrue(linkFilter.include(Collections.singletonList(matchingSpan))); SpanBo unmatchingSpan = new SpanBo(); unmatchingSpan.setApplicationId("APP_A"); unmatchingSpan.setApplicationServiceType(tomcat.getCode()); unmatchingSpan.setAcceptorHost(messageQueueB); - Assert.assertFalse(linkFilter.include(Collections.singletonList(unmatchingSpan))); + Assertions.assertFalse(linkFilter.include(Collections.singletonList(unmatchingSpan))); } private String encodeUrl(String value) { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/filter/RpcURLPatternFilterTest.java b/web/src/test/java/com/navercorp/pinpoint/web/filter/RpcURLPatternFilterTest.java index e2298220aa06..98d117e8bbc1 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/filter/RpcURLPatternFilterTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/filter/RpcURLPatternFilterTest.java @@ -19,16 +19,16 @@ import com.navercorp.pinpoint.common.server.bo.AnnotationBo; import com.navercorp.pinpoint.common.server.bo.SpanBo; import com.navercorp.pinpoint.common.server.bo.SpanEventBo; -import com.navercorp.pinpoint.loader.service.AnnotationKeyRegistryService; -import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; import com.navercorp.pinpoint.common.trace.AnnotationKey; import com.navercorp.pinpoint.common.trace.AnnotationKeyFactory; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.trace.ServiceTypeFactory; import com.navercorp.pinpoint.common.trace.ServiceTypeProperty; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import com.navercorp.pinpoint.loader.service.AnnotationKeyRegistryService; +import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; @@ -48,7 +48,7 @@ public class RpcURLPatternFilterTest { private AnnotationKeyRegistryService annotationKeyRegistryService; - @Before + @BeforeEach public void setUp() { serviceTypeRegistryService = new ServiceTypeRegistryService() { @Override @@ -98,7 +98,7 @@ public void emptyPatternShouldReject() { // When boolean accept = rpcURLPatternFilter.accept(createTestRpcSpans(rpcUrl)); // Then - Assert.assertFalse(accept); + Assertions.assertFalse(accept); } @Test @@ -110,7 +110,7 @@ public void testPath() { // When boolean accept = rpcURLPatternFilter.accept(createTestRpcSpans(rpcUrl)); // Then - Assert.assertTrue(accept); + Assertions.assertTrue(accept); } @Test @@ -122,7 +122,7 @@ public void testFullUrl() { // When boolean accept = rpcURLPatternFilter.accept(createTestRpcSpans(rpcUrl)); // Then - Assert.assertTrue(accept); + Assertions.assertTrue(accept); } @Test @@ -134,7 +134,7 @@ public void testDomainAndPath() { // When boolean accept = rpcURLPatternFilter.accept(createTestRpcSpans(rpcUrl)); // Then - Assert.assertTrue(accept); + Assertions.assertTrue(accept); } @Test @@ -146,7 +146,7 @@ public void testString() { // When boolean accept = rpcURLPatternFilter.accept(createTestRpcSpans(rpcUrl)); // Then - Assert.assertTrue(accept); + Assertions.assertTrue(accept); } @Test @@ -158,7 +158,7 @@ public void testWeirdPath() { // When boolean accept = rpcURLPatternFilter.accept(createTestRpcSpans(rpcUrl)); // Then - Assert.assertTrue(accept); + Assertions.assertTrue(accept); } private List createTestRpcSpans(String... rpcUrls) { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/filter/agent/AgentFilterFactoryTest.java b/web/src/test/java/com/navercorp/pinpoint/web/filter/agent/AgentFilterFactoryTest.java index d53932dd86aa..d7c7d606a4d6 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/filter/agent/AgentFilterFactoryTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/filter/agent/AgentFilterFactoryTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.web.filter.agent; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -30,9 +30,9 @@ public void fromFilter() { AgentFilterFactory factory = new AgentFilterFactory("a", "b"); AgentFilter filter = factory.createFromAgentFilter(); - Assert.assertTrue(filter.accept("a")); - Assert.assertFalse(filter.accept("b")); - Assert.assertFalse(filter.accept(null)); + Assertions.assertTrue(filter.accept("a")); + Assertions.assertFalse(filter.accept("b")); + Assertions.assertFalse(filter.accept(null)); } @Test @@ -40,9 +40,9 @@ public void fromFilter_skip() { AgentFilterFactory factory = new AgentFilterFactory(null, "b"); AgentFilter filter = factory.createFromAgentFilter(); - Assert.assertTrue(filter.accept("a")); - Assert.assertTrue(filter.accept("b")); - Assert.assertTrue(filter.accept(null)); + Assertions.assertTrue(filter.accept("a")); + Assertions.assertTrue(filter.accept("b")); + Assertions.assertTrue(filter.accept(null)); } @Test @@ -50,12 +50,12 @@ public void toFilter() { AgentFilterFactory factory = new AgentFilterFactory("a", "b"); AgentFilter filter = factory.createToAgentFilter(); - Assert.assertTrue(filter.accept("b")); + Assertions.assertTrue(filter.accept("b")); - Assert.assertFalse(filter.accept("a")); - Assert.assertFalse(filter.accept(null)); + Assertions.assertFalse(filter.accept("a")); + Assertions.assertFalse(filter.accept(null)); - Assert.assertTrue(factory.toAgentExist()); + Assertions.assertTrue(factory.toAgentExist()); } @Test @@ -63,9 +63,9 @@ public void toFilter_skip() { AgentFilterFactory factory = new AgentFilterFactory("a", null); AgentFilter filter = factory.createToAgentFilter(); - Assert.assertTrue(filter.accept("b")); - Assert.assertTrue(filter.accept("a")); - Assert.assertTrue(filter.accept(null)); + Assertions.assertTrue(filter.accept("b")); + Assertions.assertTrue(filter.accept("a")); + Assertions.assertTrue(filter.accept(null)); } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/filter/response/DefaultResponseTimeFilterTest.java b/web/src/test/java/com/navercorp/pinpoint/web/filter/response/DefaultResponseTimeFilterTest.java index 87b4829f3be7..686cb54e8921 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/filter/response/DefaultResponseTimeFilterTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/filter/response/DefaultResponseTimeFilterTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.web.filter.responsetime.DefaultResponseTimeFilter; import com.navercorp.pinpoint.web.filter.responsetime.ResponseTimeFilter; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -31,16 +31,16 @@ public void testAccept() { ResponseTimeFilter filter1 = new DefaultResponseTimeFilter(1000, 2000); - Assert.assertTrue(filter1.accept(1100)); + Assertions.assertTrue(filter1.accept(1100)); // between - Assert.assertTrue(filter1.accept(1000)); - Assert.assertTrue(filter1.accept(2000)); + Assertions.assertTrue(filter1.accept(1000)); + Assertions.assertTrue(filter1.accept(2000)); // lower - Assert.assertFalse(filter1.accept(500)); + Assertions.assertFalse(filter1.accept(500)); // upper - Assert.assertFalse(filter1.accept(2500)); + Assertions.assertFalse(filter1.accept(2500)); } } \ No newline at end of file diff --git a/web/src/test/java/com/navercorp/pinpoint/web/mapper/FilteringSpanDecoderTest.java b/web/src/test/java/com/navercorp/pinpoint/web/mapper/FilteringSpanDecoderTest.java index 66d1089b0936..b7ff32066a7d 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/mapper/FilteringSpanDecoderTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/mapper/FilteringSpanDecoderTest.java @@ -16,17 +16,16 @@ package com.navercorp.pinpoint.web.mapper; +import com.navercorp.pinpoint.common.profiler.util.TransactionId; import com.navercorp.pinpoint.common.server.bo.SpanBo; import com.navercorp.pinpoint.common.server.bo.serializer.trace.v2.SpanDecoder; -import com.navercorp.pinpoint.common.profiler.util.TransactionId; import com.navercorp.pinpoint.web.dao.hbase.SpanQuery; import com.navercorp.pinpoint.web.dao.hbase.SpanQueryBuilder; import com.navercorp.pinpoint.web.vo.GetTraceInfo; import com.navercorp.pinpoint.web.vo.SpanHint; - import org.apache.commons.lang3.RandomStringUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import java.util.concurrent.ThreadLocalRandom; @@ -37,26 +36,32 @@ */ public class FilteringSpanDecoderTest { - @Test(expected = NullPointerException.class) + @Test public void constructorFailureTest1() { - new FilteringSpanDecoder(null, null); + Assertions.assertThrows(NullPointerException.class, () -> { + new FilteringSpanDecoder(null, null); + }); } - @Test(expected = NullPointerException.class) + @Test public void constructorFailureTest2() { - SpanDecoder mockSpanDecoder = Mockito.mock(SpanDecoder.class); - new FilteringSpanDecoder(mockSpanDecoder, null); + Assertions.assertThrows(NullPointerException.class, () -> { + SpanDecoder mockSpanDecoder = Mockito.mock(SpanDecoder.class); + new FilteringSpanDecoder(mockSpanDecoder, null); + }); } - @Test(expected = NullPointerException.class) + @Test public void constructorFailureTest3() { - SpanDecoder mockSpanDecoder = Mockito.mock(SpanDecoder.class); - - TransactionId transactionId = Random.createTransactionId(); - GetTraceInfo getTraceInfo = new GetTraceInfo(transactionId); - SpanQueryBuilder builder = new SpanQueryBuilder(); - SpanQuery query = builder.build(getTraceInfo); - new FilteringSpanDecoder(mockSpanDecoder, query.getSpanFilter()); + Assertions.assertThrows(NullPointerException.class, () -> { + SpanDecoder mockSpanDecoder = Mockito.mock(SpanDecoder.class); + + TransactionId transactionId = Random.createTransactionId(); + GetTraceInfo getTraceInfo = new GetTraceInfo(transactionId); + SpanQueryBuilder builder = new SpanQueryBuilder(); + SpanQuery query = builder.build(getTraceInfo); + new FilteringSpanDecoder(mockSpanDecoder, query.getSpanFilter()); + }); } @Test @@ -70,7 +75,7 @@ public void decodeTest1() { FilteringSpanDecoder filteringSpanDecoder = new FilteringSpanDecoder(mockSpanDecoder, query.getSpanFilter()); Object result = filteringSpanDecoder.decode(null, null, null); - Assert.assertNull(result); + Assertions.assertNull(result); } @Test @@ -85,7 +90,7 @@ public void decodeTest2() { FilteringSpanDecoder filteringSpanDecoder = new FilteringSpanDecoder(mockSpanDecoder, query.getSpanFilter()); Object result = filteringSpanDecoder.decode(null, null, null); - Assert.assertNotNull(result); + Assertions.assertNotNull(result); } @Test @@ -101,7 +106,7 @@ public void decodeTest3() { FilteringSpanDecoder filteringSpanDecoder = new FilteringSpanDecoder(mockSpanDecoder, query.getSpanFilter()); Object result = filteringSpanDecoder.decode(null, null, null); - Assert.assertNull(result); + Assertions.assertNull(result); } @Test @@ -117,7 +122,7 @@ public void decodeTest4() { FilteringSpanDecoder filteringSpanDecoder = new FilteringSpanDecoder(mockSpanDecoder, query.getSpanFilter()); Object result = filteringSpanDecoder.decode(null, null, null); - Assert.assertNotNull(result); + Assertions.assertNotNull(result); } private GetTraceInfo createGetTraceInfo() { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/mapper/ResponseTimeMapperTest.java b/web/src/test/java/com/navercorp/pinpoint/web/mapper/ResponseTimeMapperTest.java index 8c216bfa7cf1..118a83219951 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/mapper/ResponseTimeMapperTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/mapper/ResponseTimeMapperTest.java @@ -23,15 +23,14 @@ import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; import com.navercorp.pinpoint.web.applicationmap.histogram.Histogram; import com.navercorp.pinpoint.web.vo.ResponseTime; - import com.sematext.hbase.wd.RowKeyDistributorByHashPrefix; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; -import org.junit.Assert; import org.apache.hadoop.hbase.util.Bytes; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import static org.mockito.Mockito.mock; @@ -59,11 +58,11 @@ public void testResponseTimeMapperTest() { Histogram agentHistogram = responseTime.findHistogram("agent"); long fastCount = agentHistogram.getFastCount(); - Assert.assertEquals(fastCount, 1); + Assertions.assertEquals(fastCount, 1); long normal = agentHistogram.getNormalCount(); - Assert.assertEquals(normal, 0); + Assertions.assertEquals(normal, 0); long slow = agentHistogram.getSlowCount(); - Assert.assertEquals(slow, 0); + Assertions.assertEquals(slow, 0); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/mapper/SpanMapperV2Test.java b/web/src/test/java/com/navercorp/pinpoint/web/mapper/SpanMapperV2Test.java index b97e5b5be53d..88799aaf6467 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/mapper/SpanMapperV2Test.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/mapper/SpanMapperV2Test.java @@ -10,10 +10,10 @@ import com.navercorp.pinpoint.common.server.bo.serializer.trace.v2.SpanEncoder; import com.navercorp.pinpoint.common.server.bo.serializer.trace.v2.SpanEncoderV0; import com.navercorp.pinpoint.common.server.bo.serializer.trace.v2.SpanEncodingContext; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.nio.ByteBuffer; import java.util.Collections; @@ -64,30 +64,30 @@ public void test() { SpanDecodingContext decodingContext = new SpanDecodingContext(); decoder.readSpanValue(buffer, readSpan, decodingContext); - Assert.assertEquals(readSpan.getSpanEventBoList().size(), 2); + Assertions.assertEquals(readSpan.getSpanEventBoList().size(), 2); // span - Assert.assertEquals(readSpan.getServiceType(), 1000); - Assert.assertEquals(readSpan.hasException(), true); - Assert.assertEquals(readSpan.getExceptionId(), 1); - Assert.assertEquals(readSpan.getExceptionMessage(), "spanException"); + Assertions.assertEquals(readSpan.getServiceType(), 1000); + Assertions.assertEquals(readSpan.hasException(), true); + Assertions.assertEquals(readSpan.getExceptionId(), 1); + Assertions.assertEquals(readSpan.getExceptionMessage(), "spanException"); List spanEventBoList = readSpan.getSpanEventBoList(); SpanEventBo readFirst = spanEventBoList.get(0); SpanEventBo readNext = spanEventBoList.get(1); - Assert.assertEquals(readFirst.getEndElapsed(), 100); - Assert.assertEquals(readNext.getEndElapsed(), 200); + Assertions.assertEquals(readFirst.getEndElapsed(), 100); + Assertions.assertEquals(readNext.getEndElapsed(), 200); - Assert.assertEquals(readFirst.getExceptionId(), 2); - Assert.assertEquals(readNext.hasException(), false); + Assertions.assertEquals(readFirst.getExceptionId(), 2); + Assertions.assertEquals(readNext.hasException(), false); - Assert.assertEquals(readFirst.getServiceType(), 1003); - Assert.assertEquals(readNext.getServiceType(), 2003); + Assertions.assertEquals(readFirst.getServiceType(), 1003); + Assertions.assertEquals(readNext.getServiceType(), 2003); - Assert.assertEquals(readFirst.getSequence(), 0); - Assert.assertEquals(readNext.getSequence(), 1); + Assertions.assertEquals(readFirst.getSequence(), 0); + Assertions.assertEquals(readNext.getSequence(), 1); } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/mapper/stat/AgentStatMapperV2Test.java b/web/src/test/java/com/navercorp/pinpoint/web/mapper/stat/AgentStatMapperV2Test.java index 8309fb6bfe03..1fa491406e03 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/mapper/stat/AgentStatMapperV2Test.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/mapper/stat/AgentStatMapperV2Test.java @@ -30,15 +30,14 @@ import com.navercorp.pinpoint.common.server.bo.stat.AgentStatDataPoint; import com.navercorp.pinpoint.common.server.bo.stat.AgentStatType; import com.navercorp.pinpoint.web.mapper.TimestampFilter; - import com.sematext.hbase.wd.AbstractRowKeyDistributor; import com.sematext.hbase.wd.RowKeyDistributorByHashPrefix; import org.apache.commons.lang3.RandomUtils; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; @@ -108,7 +107,7 @@ public void mapperTest() throws Exception { // Then givenAgentStats.sort(AgentStatMapperV2.REVERSE_TIMESTAMP_COMPARATOR); - Assert.assertEquals(givenAgentStats, mappedAgentStats); + Assertions.assertEquals(givenAgentStats, mappedAgentStats); } private List createAgentStats(long initialTimestamp, long interval, int batchSize) { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/mapper/stat/DataSourceSamplerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/mapper/stat/DataSourceSamplerTest.java index cbc38a3f1c18..28e4bd08fda4 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/mapper/stat/DataSourceSamplerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/mapper/stat/DataSourceSamplerTest.java @@ -21,8 +21,8 @@ import com.navercorp.pinpoint.web.test.util.DataSourceTestUtils; import com.navercorp.pinpoint.web.vo.stat.SampledDataSource; import org.apache.commons.lang3.RandomUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.List; @@ -68,13 +68,13 @@ private void assertEquals(SampledDataSource sampledDataSource, List rowMapper; - @Before + @BeforeEach public void setUp() { MockitoAnnotations.initMocks(this.getClass()); when(this.resultScanner.iterator()).thenReturn(Arrays.asList(this.result).iterator()); @@ -88,7 +88,7 @@ public void one_to_one_sampler_should_not_down_sample_data_points() throws Excep // Then for (TestSampledAgentStatDataPoint sampledDataPoint : sampledDataPoints) { List expectedSampledDataPoints = expectedDataPointSlotMap.get(sampledDataPoint.getBaseTimestamp()); - Assert.assertEquals(expectedSampledDataPoints, sampledDataPoint.getDataPointsToSample()); + Assertions.assertEquals(expectedSampledDataPoints, sampledDataPoint.getDataPointsToSample()); } } @@ -111,7 +111,7 @@ public void two_to_one_sample_should_down_sample_correctly() throws Exception { // Then for (TestSampledAgentStatDataPoint sampledDataPoint : sampledDataPoints) { List expectedSampledDataPoints = expectedDataPointSlotMap.get(sampledDataPoint.getBaseTimestamp()); - Assert.assertEquals(expectedSampledDataPoints, sampledDataPoint.getDataPointsToSample()); + Assertions.assertEquals(expectedSampledDataPoints, sampledDataPoint.getDataPointsToSample()); } } @@ -134,7 +134,7 @@ public void ten_to_one_sample_should_down_sample_correctly() throws Exception { // Then for (TestSampledAgentStatDataPoint sampledDataPoint : sampledDataPoints) { List expectedSampledDataPoints = expectedDataPointSlotMap.get(sampledDataPoint.getBaseTimestamp()); - Assert.assertEquals(expectedSampledDataPoints, sampledDataPoint.getDataPointsToSample()); + Assertions.assertEquals(expectedSampledDataPoints, sampledDataPoint.getDataPointsToSample()); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/mapper/stat/sampling/sampler/AgentUriStatSamplerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/mapper/stat/sampling/sampler/AgentUriStatSamplerTest.java index 8192f8e439a7..d5b360a84490 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/mapper/stat/sampling/sampler/AgentUriStatSamplerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/mapper/stat/sampling/sampler/AgentUriStatSamplerTest.java @@ -22,9 +22,8 @@ import com.navercorp.pinpoint.web.vo.stat.SampledEachUriStatBo; import com.navercorp.pinpoint.web.vo.stat.SampledUriStatHistogramBo; import com.navercorp.pinpoint.web.vo.stat.chart.agent.AgentStatPoint; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; @@ -96,12 +95,12 @@ private UriStatHistogram createUriStatHistogram(int count) { private void assertMaxValue(AgentStatPoint expected, List actual) { Long max = actual.stream().mapToLong(o -> o.getTotalHistogram().getMax()).max().getAsLong(); - Assert.assertEquals(expected.getMaxYVal(), max); + Assertions.assertEquals(expected.getMaxYVal(), max); } private void assertCountValue(AgentStatPoint expected, List actual) { Integer count = actual.stream().mapToInt(o -> o.getTotalHistogram().getCount()).sum(); - Assert.assertEquals(expected.getSumYVal(), count); + Assertions.assertEquals(expected.getSumYVal(), count); } private void assertHistogramValue(int[] uriStatHistogramValue, List actual) { @@ -113,7 +112,7 @@ private void assertHistogramValue(int[] uriStatHistogramValue, List result = parser.parseOutputParameter(outputParam); logger.debug("parseResult size:{} data:{}", result.size(), result); try { - Assert.assertArrayEquals(params, result.toArray(new String[0])); + Assertions.assertArrayEquals(params, result.toArray(new String[0])); } catch (AssertionError e) { logger.warn("parseResult:{}", result); logger.warn("params:{}", params); diff --git a/web/src/test/java/com/navercorp/pinpoint/web/scatter/DragAreaTest.java b/web/src/test/java/com/navercorp/pinpoint/web/scatter/DragAreaTest.java index 639ad35a2789..d98df328c1a1 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/scatter/DragAreaTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/scatter/DragAreaTest.java @@ -1,18 +1,16 @@ package com.navercorp.pinpoint.web.scatter; -import org.junit.Assert; -import org.junit.Test; - -import static org.junit.Assert.*; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class DragAreaTest { @Test public void normalize() { DragArea normalize = DragArea.normalize(2, 1, 20, 10); - Assert.assertEquals(normalize.getXHigh(), 2); - Assert.assertEquals(normalize.getXLow(), 1); - Assert.assertEquals(normalize.getYHigh(), 20); - Assert.assertEquals(normalize.getYLow(), 10); + Assertions.assertEquals(normalize.getXHigh(), 2); + Assertions.assertEquals(normalize.getXLow(), 1); + Assertions.assertEquals(normalize.getYHigh(), 20); + Assertions.assertEquals(normalize.getYLow(), 10); } } \ No newline at end of file diff --git a/web/src/test/java/com/navercorp/pinpoint/web/scatter/ElpasedTimeDotPredicateTest.java b/web/src/test/java/com/navercorp/pinpoint/web/scatter/ElpasedTimeDotPredicateTest.java index d46aec4ebf3e..e1bc301be451 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/scatter/ElpasedTimeDotPredicateTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/scatter/ElpasedTimeDotPredicateTest.java @@ -2,8 +2,8 @@ import com.navercorp.pinpoint.common.profiler.util.TransactionId; import com.navercorp.pinpoint.web.vo.scatter.Dot; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class ElpasedTimeDotPredicateTest { @@ -11,12 +11,12 @@ public class ElpasedTimeDotPredicateTest { @Test public void newDragAreaDotPredicate() { ElpasedTimeDotPredicate dragAreaDotPredicate = new ElpasedTimeDotPredicate(100, 0); - Assert.assertTrue(dragAreaDotPredicate.test(newDot(0))); - Assert.assertTrue(dragAreaDotPredicate.test(newDot(1))); - Assert.assertTrue(dragAreaDotPredicate.test(newDot(100))); + Assertions.assertTrue(dragAreaDotPredicate.test(newDot(0))); + Assertions.assertTrue(dragAreaDotPredicate.test(newDot(1))); + Assertions.assertTrue(dragAreaDotPredicate.test(newDot(100))); - Assert.assertFalse(dragAreaDotPredicate.test(newDot(200))); - Assert.assertFalse(dragAreaDotPredicate.test(newDot(-1))); + Assertions.assertFalse(dragAreaDotPredicate.test(newDot(200))); + Assertions.assertFalse(dragAreaDotPredicate.test(newDot(-1))); } private Dot newDot(int elapsedTime) { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/scatter/ScatterDataTest.java b/web/src/test/java/com/navercorp/pinpoint/web/scatter/ScatterDataTest.java index fdf8bfec6657..c545e2867360 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/scatter/ScatterDataTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/scatter/ScatterDataTest.java @@ -18,8 +18,8 @@ import com.navercorp.pinpoint.common.profiler.util.TransactionId; import com.navercorp.pinpoint.web.vo.scatter.Dot; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; @@ -52,7 +52,7 @@ public void addDotTest() { } List dots = extractDotList(builder.build()); - Assert.assertEquals(count, dots.size()); + Assertions.assertEquals(count, dots.size()); } @Test @@ -82,11 +82,11 @@ public void addDotTest2() { ScatterData scatterData = builder.build(); List values = scatterData.getScatterData(); - Assert.assertEquals(1, values.size()); + Assertions.assertEquals(1, values.size()); for (DotGroups dotGroups : values) { Map dotGroupLeaders = dotGroups.getDotGroupLeaders(); - Assert.assertEquals(2, dotGroupLeaders.keySet().size()); + Assertions.assertEquals(2, dotGroupLeaders.keySet().size()); } } @@ -115,7 +115,7 @@ public void addDotTest3() { builder.addDot(dot2); List dots = extractDotList(builder.build()); - Assert.assertEquals(2, dots.size()); + Assertions.assertEquals(2, dots.size()); } private List createDotList(String agentId, String transactionAgentId, int createSize, long from) { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/scatter/heatmap/HeatMapBuilderTest.java b/web/src/test/java/com/navercorp/pinpoint/web/scatter/heatmap/HeatMapBuilderTest.java index af99e422c39a..0e556f3c3255 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/scatter/heatmap/HeatMapBuilderTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/scatter/heatmap/HeatMapBuilderTest.java @@ -1,9 +1,9 @@ package com.navercorp.pinpoint.web.scatter.heatmap; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; @@ -17,24 +17,24 @@ public class HeatMapBuilderTest { public void axix() { HeatMapBuilder.AxisResolver resolver = new HeatMapBuilder.DefaultAxisResolver(100, 0, 1000); - Assert.assertEquals(0L, resolver.getIndex(0)); - Assert.assertEquals(10L, resolver.getIndex(100)); + Assertions.assertEquals(0L, resolver.getIndex(0)); + Assertions.assertEquals(10L, resolver.getIndex(100)); } @Test public void axix_max_overflow() { HeatMapBuilder.AxisResolver resolver = new HeatMapBuilder.DefaultAxisResolver(100, 0, 1000); - Assert.assertEquals(100, resolver.getIndex(1000)); - Assert.assertEquals(100, resolver.getIndex(1100)); + Assertions.assertEquals(100, resolver.getIndex(1000)); + Assertions.assertEquals(100, resolver.getIndex(1100)); } @Test public void axix_max_overflow_start() { HeatMapBuilder.AxisResolver resolver = new HeatMapBuilder.DefaultAxisResolver(100, 100, 1100); - Assert.assertEquals(0, resolver.getIndex(100)); - Assert.assertEquals(100, resolver.getIndex(1200)); + Assertions.assertEquals(0, resolver.getIndex(100)); + Assertions.assertEquals(100, resolver.getIndex(1200)); } @Test @@ -50,13 +50,13 @@ public void addPoint1() { HeatMap heatMap = builder.build(); List points = heatMap.getData(); - Assert.assertEquals(points.size(), 2); + Assertions.assertEquals(points.size(), 2); long sum = points.stream().mapToLong(Point::getSuccess).sum(); - Assert.assertEquals(3L, sum); + Assertions.assertEquals(3L, sum); - Assert.assertEquals(1, points.get(0).getSuccess()); - Assert.assertEquals(2, points.get(1).getSuccess()); + Assertions.assertEquals(1, points.get(0).getSuccess()); + Assertions.assertEquals(2, points.get(1).getSuccess()); } @Test @@ -70,11 +70,11 @@ public void addPoint2() { HeatMap heatMap = builder.build(); List points = heatMap.getData(); - Assert.assertEquals(points.size(), 2); + Assertions.assertEquals(points.size(), 2); - Assert.assertEquals(0, points.get(0).getY()); - Assert.assertEquals(20, points.get(1).getY()); + Assertions.assertEquals(0, points.get(0).getY()); + Assertions.assertEquals(20, points.get(1).getY()); } @@ -85,11 +85,11 @@ public void index() { long[] index = resolver.getIndex(); logger.debug("{}", Arrays.toString(index)); - Assert.assertEquals(10, index.length); + Assertions.assertEquals(10, index.length); - Assert.assertEquals(0, index[0]); - Assert.assertEquals(500, index[5]); - Assert.assertEquals(900, index[9]); + Assertions.assertEquals(0, index[0]); + Assertions.assertEquals(500, index[5]); + Assertions.assertEquals(900, index[9]); } @Test @@ -98,10 +98,10 @@ public void index2() { long[] index = resolver.getIndex(); logger.debug("{}", Arrays.toString(index)); - Assert.assertEquals(10, index.length); + Assertions.assertEquals(10, index.length); - Assert.assertEquals(500, index[0]); - Assert.assertEquals(750, index[5]); - Assert.assertEquals(950, index[9]); + Assertions.assertEquals(500, index[0]); + Assertions.assertEquals(750, index[5]); + Assertions.assertEquals(950, index[9]); } } \ No newline at end of file diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/AdminServiceImplTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/AdminServiceImplTest.java index 175bc2123329..0bc528a7b3a4 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/AdminServiceImplTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/service/AdminServiceImplTest.java @@ -1,16 +1,15 @@ package com.navercorp.pinpoint.web.service; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.dao.ApplicationIndexDao; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.ArgumentCaptor; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.ArrayList; import java.util.Arrays; @@ -20,8 +19,8 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.eq; @@ -29,7 +28,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class AdminServiceImplTest { final String AGENT_ID1 = "TEST_AGENT_ID1"; @@ -44,11 +43,13 @@ public class AdminServiceImplTest { AdminService adminService; - @Mock ApplicationIndexDao applicationIndexDao; + @Mock + ApplicationIndexDao applicationIndexDao; - @Mock AgentInfoService agentInfoService; + @Mock + AgentInfoService agentInfoService; - @Before + @BeforeEach public void setUp() { adminService = new AdminServiceImpl(applicationIndexDao, agentInfoService); } @@ -58,21 +59,21 @@ public void constructorRequireNonNullTest() { try { new AdminServiceImpl(null, agentInfoService); fail("applicationIndexDao can not be null"); - } catch(NullPointerException e) { + } catch (NullPointerException e) { assertThat(e.getMessage(), is("applicationIndexDao")); } try { new AdminServiceImpl(applicationIndexDao, null); fail("agentInfoService can not be null"); - } catch(NullPointerException e ) { + } catch (NullPointerException e) { assertThat(e.getMessage(), is("agentInfoService")); } try { new AdminServiceImpl(null, null); fail("applicationIndexDao and jvmGcDao can not be null"); - } catch(NullPointerException e) { + } catch (NullPointerException e) { assertThat(e.getMessage(), is("applicationIndexDao")); } } @@ -107,13 +108,13 @@ public void whenMinDurationDaysForInActivityIsLessThanDurationDaysDoThrowIllegal adminService.removeInactiveAgents(29); fail("Exception must be caught when durationDays is less than MIN_DURATION_DAYS_FOR_INACIVITY"); } catch (IllegalArgumentException e) { - assertThat(e.getMessage(), is("duration may not be less than " + MIN_DURATION_DAYS_FOR_INACTIVITY + " days")) ; + assertThat(e.getMessage(), is("duration may not be less than " + MIN_DURATION_DAYS_FOR_INACTIVITY + " days")); } try { adminService.removeInactiveAgents(30); adminService.removeInactiveAgents(31); - } catch(Exception e) { + } catch (Exception e) { fail("Exception can not be caught when durationDays is more than MIN_DURATION_DAYS_FOR_INACTIVITY"); } } @@ -184,9 +185,9 @@ public void testDuplicateAgentIdMap() { // given when(applicationIndexDao.selectAllApplicationNames()) .thenReturn(Arrays.asList( - new Application(APPLICATION_NAME1, ServiceType.UNDEFINED), - new Application(APPLICATION_NAME2, ServiceType.UNDEFINED), - new Application(APPLICATION_NAME3, ServiceType.UNDEFINED))); + new Application(APPLICATION_NAME1, ServiceType.UNDEFINED), + new Application(APPLICATION_NAME2, ServiceType.UNDEFINED), + new Application(APPLICATION_NAME3, ServiceType.UNDEFINED))); when(applicationIndexDao.selectAgentIds(eq(APPLICATION_NAME1))) .thenReturn(Arrays.asList(AGENT_ID1, AGENT_ID2, AGENT_ID3)); diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/FilteredMapServiceImplTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/FilteredMapServiceImplTest.java index fa031296d4d0..bcddc846a24d 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/FilteredMapServiceImplTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/service/FilteredMapServiceImplTest.java @@ -18,10 +18,11 @@ import com.navercorp.pinpoint.common.server.bo.SpanBo; import com.navercorp.pinpoint.common.server.bo.SpanEventBo; -import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.HistogramSchema; import com.navercorp.pinpoint.common.trace.HistogramSlot; import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; import com.navercorp.pinpoint.web.TestTraceUtils; import com.navercorp.pinpoint.web.applicationmap.ApplicationMap; import com.navercorp.pinpoint.web.applicationmap.ApplicationMapBuilderFactory; @@ -29,8 +30,8 @@ import com.navercorp.pinpoint.web.applicationmap.appender.metric.DefaultMetricInfoAppenderFactory; import com.navercorp.pinpoint.web.applicationmap.appender.server.ServerInfoAppenderFactory; import com.navercorp.pinpoint.web.applicationmap.histogram.Histogram; -import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogramFormat; import com.navercorp.pinpoint.web.applicationmap.histogram.NodeHistogram; +import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogramFormat; import com.navercorp.pinpoint.web.applicationmap.link.Link; import com.navercorp.pinpoint.web.applicationmap.nodes.Node; import com.navercorp.pinpoint.web.dao.ApplicationTraceIndexDao; @@ -43,15 +44,16 @@ import com.navercorp.pinpoint.web.view.ResponseTimeViewModel; import com.navercorp.pinpoint.web.view.TimeViewModel; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; import org.mockito.Spy; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import org.springframework.util.CollectionUtils; import java.util.Arrays; @@ -65,7 +67,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.anyShort; @@ -76,7 +78,8 @@ /** * @author HyunGil Jeong */ -@RunWith(MockitoJUnitRunner.Silent.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class FilteredMapServiceImplTest { private static final Random RANDOM = new Random(); @@ -107,7 +110,7 @@ public class FilteredMapServiceImplTest { private FilteredMapService filteredMapService; - @Before + @BeforeEach public void init() { when(applicationFactory.createApplication(anyString(), anyShort())).thenAnswer(invocation -> { String applicationName = invocation.getArgument(0); @@ -127,7 +130,7 @@ public void init() { filteredMapService = new FilteredMapServiceImpl(agentInfoService, traceDao, applicationTraceIndexDao, registry, applicationFactory, Optional.empty(), applicationMapBuilderFactory); } - @After + @AfterEach public void cleanUp() { executor.shutdown(); try { @@ -192,7 +195,7 @@ public void twoTier() { // Then Collection nodes = applicationMap.getNodes(); - Assert.assertEquals(4, nodes.size()); + Assertions.assertEquals(4, nodes.size()); for (Node node : nodes) { Application application = node.getApplication(); if (application.getName().equals("ROOT_APP") && application.getServiceType().getCode() == TestTraceUtils.USER_TYPE_CODE) { @@ -202,7 +205,7 @@ public void twoTier() { Histogram applicationHistogram = nodeHistogram.getApplicationHistogram(); assertHistogram(applicationHistogram, 1, 0, 0, 0, 0); Map agentHistogramMap = nodeHistogram.getAgentHistogramMap(); - Assert.assertTrue(agentHistogramMap.isEmpty()); + Assertions.assertTrue(agentHistogramMap.isEmpty()); // time histogram HistogramSchema histogramSchema = node.getServiceType().getHistogramSchema(); List expectedTimeCounts = Collections.singletonList( @@ -211,7 +214,7 @@ public void twoTier() { List applicationTimeHistogram = nodeHistogram.getApplicationTimeHistogram(node.getTimeHistogramFormat()); assertTimeHistogram(applicationTimeHistogram, histogramSchema.getFastSlot(), expectedTimeCounts); AgentResponseTimeViewModelList agentTimeHistogram = nodeHistogram.getAgentTimeHistogram(TimeHistogramFormat.V1); - Assert.assertTrue(agentTimeHistogram.getAgentResponseTimeViewModelList().isEmpty()); + Assertions.assertTrue(agentTimeHistogram.getAgentResponseTimeViewModelList().isEmpty()); } else if (application.getName().equals("ROOT_APP") && application.getServiceType().getCode() == TestTraceUtils.TEST_STAND_ALONE_TYPE_CODE) { // ROOT_APP node NodeHistogram nodeHistogram = node.getNodeHistogram(); @@ -269,7 +272,7 @@ public void twoTier() { } Collection links = applicationMap.getLinks(); - Assert.assertEquals(3, links.size()); + Assertions.assertEquals(3, links.size()); for (Link link : links) { Application fromApplication = link.getFrom().getApplication(); Application toApplication = link.getTo().getApplication(); @@ -311,22 +314,22 @@ public void twoTier() { ); assertTimeHistogram(linkApplicationTimeSeriesHistogram, targetHistogramSchema.getNormalSlot(), expectedTimeCounts); } else { - Assert.fail("Unexpected link : " + link); + fail("Unexpected link : " + link); } } } private void assertHistogram(Histogram histogram, int fastCount, int normalCount, int slowCount, int verySlowCount, int totalErrorCount) { - Assert.assertEquals(fastCount, histogram.getFastCount()); - Assert.assertEquals(normalCount, histogram.getNormalCount()); - Assert.assertEquals(slowCount, histogram.getSlowCount()); - Assert.assertEquals(verySlowCount, histogram.getVerySlowCount()); - Assert.assertEquals(totalErrorCount, histogram.getTotalErrorCount()); + Assertions.assertEquals(fastCount, histogram.getFastCount()); + Assertions.assertEquals(normalCount, histogram.getNormalCount()); + Assertions.assertEquals(slowCount, histogram.getSlowCount()); + Assertions.assertEquals(verySlowCount, histogram.getVerySlowCount()); + Assertions.assertEquals(totalErrorCount, histogram.getTotalErrorCount()); } private void assertTimeHistogram(List histogramList, HistogramSlot histogramSlot, List expectedTimeCounts) { if (CollectionUtils.isEmpty(histogramList)) { - Assert.fail("Checked against empty histogramList."); + fail("Checked against empty histogramList."); } String slotName = histogramSlot.getSlotName(); for (TimeViewModel timeViewModel : histogramList) { @@ -338,18 +341,18 @@ private void assertTimeHistogram(List histogramList, HistogramSlo for (ResponseTimeViewModel.TimeCount actualTimeCount : histogram.getColumnValue()) { if (expectedTimeCount.getTime() == actualTimeCount.getTime()) { expectedTimeCountExists = true; - Assert.assertEquals("TimeCount mismatch for slot : " + slotName, expectedTimeCount.getCount(), actualTimeCount.getCount()); + Assertions.assertEquals(expectedTimeCount.getCount(), actualTimeCount.getCount(), "TimeCount mismatch for slot : " + slotName); break; } } if (!expectedTimeCountExists) { - Assert.fail("Expected TimeCount for " + slotName + " not found, time : " + expectedTimeCount.getTime() + ", count : " + expectedTimeCount.getCount()); + fail("Expected TimeCount for " + slotName + " not found, time : " + expectedTimeCount.getTime() + ", count : " + expectedTimeCount.getCount()); } } return; } } - Assert.fail("Expected " + slotName + " but had none."); + fail("Expected " + slotName + " but had none."); } private void assertAgentHistogram(Map agentHistogramMap, String agentId, int fastCount, int normalCount, int slowCount, int verySlowCount, int totalErrorCount) { @@ -358,7 +361,7 @@ private void assertAgentHistogram(Map agentHistogramMap, Stri assertHistogram(agentHistogram, fastCount, normalCount, slowCount, verySlowCount, totalErrorCount); return; } - Assert.fail("Histogram not found for agent : " + agentId); + fail("Histogram not found for agent : " + agentId); } private void assertAgentTimeHistogram(List histogramList, String agentId, HistogramSlot histogramSlot, List expectedTimeCounts) { @@ -368,6 +371,6 @@ private void assertAgentTimeHistogram(List histogram return; } } - Assert.fail("Time histogram not found for agent : " + agentId); + fail("Time histogram not found for agent : " + agentId); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/LinkDataLimiterTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/LinkDataLimiterTest.java index 7026aa3ac651..3c4907918268 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/LinkDataLimiterTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/service/LinkDataLimiterTest.java @@ -1,8 +1,8 @@ package com.navercorp.pinpoint.web.service; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertTrue; public class LinkDataLimiterTest { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/SearchDepthTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/SearchDepthTest.java index 674ba817d993..7487f66b81b9 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/SearchDepthTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/service/SearchDepthTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.web.service; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -28,16 +28,16 @@ public class SearchDepthTest { public void testSearchDepth() { SearchDepth zero = new SearchDepth(2); - Assert.assertEquals(zero.getDepth(), 0); - Assert.assertFalse(zero.isDepthOverflow()); + Assertions.assertEquals(zero.getDepth(), 0); + Assertions.assertFalse(zero.isDepthOverflow()); SearchDepth oneDepth = zero.nextDepth(); - Assert.assertEquals(oneDepth.getDepth(), 1); - Assert.assertFalse(oneDepth.isDepthOverflow()); + Assertions.assertEquals(oneDepth.getDepth(), 1); + Assertions.assertFalse(oneDepth.isDepthOverflow()); SearchDepth twoDepth = oneDepth.nextDepth(); - Assert.assertEquals(twoDepth.getDepth(), 2); - Assert.assertTrue(twoDepth.isDepthOverflow()); + Assertions.assertEquals(twoDepth.getDepth(), 2); + Assertions.assertTrue(twoDepth.isDepthOverflow()); } } \ No newline at end of file diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/UserGroupServiceImplTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/UserGroupServiceImplTest.java index 7473c21ac398..50721026fca2 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/UserGroupServiceImplTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/service/UserGroupServiceImplTest.java @@ -22,23 +22,23 @@ import com.navercorp.pinpoint.web.util.UserInfoDecoder; import com.navercorp.pinpoint.web.vo.User; import com.navercorp.pinpoint.web.vo.UserPhoneInfo; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.when; /** * @author minwoo.jung */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class UserGroupServiceImplTest { @Mock @@ -52,7 +52,7 @@ public class UserGroupServiceImplTest { UserGroupServiceImpl userGroupService; - @Before + @BeforeEach public void before() throws Exception { userGroupService = new UserGroupServiceImpl(userGroupDao, Optional.of(userInfoDecoder), alarmService, new ConfigProperties(), userService); } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/UserServiceImplTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/UserServiceImplTest.java index 852e54135f89..5f4e9bacea42 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/UserServiceImplTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/service/UserServiceImplTest.java @@ -7,22 +7,23 @@ import com.navercorp.pinpoint.web.util.UserInfoDecoder; import com.navercorp.pinpoint.web.util.UserInfoEncoder; import com.navercorp.pinpoint.web.vo.User; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.Mockito; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class UserServiceImplTest { private final static String DECODED_PHONE_NUMBER = "0000000000"; @@ -39,7 +40,7 @@ public class UserServiceImplTest { private UserService userService; - @Before + @BeforeEach public void before() throws Exception { userService = new UserServiceImpl(userDao, Optional.of(userInfoDecoder), Optional.of(userInfoEncoder)); } @@ -73,7 +74,7 @@ public void insertUserList() { userList.add(new User("1", "userId01", "name01", "departmentName01", 82, "01012341234", "name01@pinpoint.com")); userList.add(new User("2", "userId02", "name02", "departmentName01", 82, "01012341234", "name02@pinpoint.com")); userList.add(new User("3", "userId03", "name03", "departmentName01", 82, "01012341234", "name03@pinpoint.com")); - userList.add(new User("4","userId04", "name04", "departmentName01", 82, "01012341234", "name04@pinpoint.com")); + userList.add(new User("4", "userId04", "name04", "departmentName01", 82, "01012341234", "name04@pinpoint.com")); userList.add(new User("5", "userId05", "name05", "departmentName01", 82, "01012341234", "name05@pinpoint.com")); userService.insertUserList(userList); @@ -85,7 +86,7 @@ public void insertUserList() { assertTrue(user.getName().startsWith("name0")); assertTrue(user.getDepartment().startsWith("departmentName")); assertEquals(user.getPhoneCountryCode(), user.getPhoneCountryCode()); - assertEquals(user.getPhoneNumber(),ENCODED_PHONE_NUMBER); + assertEquals(user.getPhoneNumber(), ENCODED_PHONE_NUMBER); assertEquals(user.getEmail(), ENCODED_EMAIL); } } @@ -118,7 +119,7 @@ public void selectUser() { userList.add(new User("1", "userId01", "name01", "departmentName01", 82, "01012341234", "name01@pinpoint.com")); userList.add(new User("2", "userId02", "name02", "departmentName01", 82, "01012341234", "name02@pinpoint.com")); userList.add(new User("3", "userId03", "name03", "departmentName01", 82, "01012341234", "name03@pinpoint.com")); - userList.add(new User("4","userId04", "name04", "departmentName01", 82, "01012341234", "name04@pinpoint.com")); + userList.add(new User("4", "userId04", "name04", "departmentName01", 82, "01012341234", "name04@pinpoint.com")); userList.add(new User("5", "userId05", "name05", "departmentName01", 82, "01012341234", "name05@pinpoint.com")); when(userDao.selectUser()).thenReturn(userList); @@ -130,7 +131,7 @@ public void selectUser() { assertTrue(user.getName().startsWith("name0")); assertTrue(user.getDepartment().startsWith("departmentName")); assertEquals(user.getPhoneCountryCode(), user.getPhoneCountryCode()); - assertEquals(user.getPhoneNumber(),DECODED_PHONE_NUMBER); + assertEquals(user.getPhoneNumber(), DECODED_PHONE_NUMBER); assertEquals(user.getEmail(), DECODED_EMAIL); } } @@ -144,7 +145,7 @@ public void selectUserByUserName() { userList.add(new User("1", "userId01", name, "departmentName01", 82, "01012341234", "name01@pinpoint.com")); userList.add(new User("2", "userId02", name, "departmentName01", 82, "01012341234", "name02@pinpoint.com")); userList.add(new User("3", "userId03", name, "departmentName01", 82, "01012341234", "name03@pinpoint.com")); - userList.add(new User("4","userId04", name, "departmentName01", 82, "01012341234", "name04@pinpoint.com")); + userList.add(new User("4", "userId04", name, "departmentName01", 82, "01012341234", "name04@pinpoint.com")); userList.add(new User("5", "userId05", name, "departmentName01", 82, "01012341234", "name05@pinpoint.com")); when(userDao.selectUserByUserName(name)).thenReturn(userList); @@ -186,7 +187,7 @@ public void selectUserByDepartment() { userList.add(new User("1", "userId01", "name01", departmentName, 82, "01012341234", "name01@pinpoint.com")); userList.add(new User("2", "userId02", "name02", departmentName, 82, "01012341234", "name02@pinpoint.com")); userList.add(new User("3", "userId03", "name03", departmentName, 82, "01012341234", "name03@pinpoint.com")); - userList.add(new User("4","userId04", "name04", departmentName, 82, "01012341234", "name04@pinpoint.com")); + userList.add(new User("4", "userId04", "name04", departmentName, 82, "01012341234", "name04@pinpoint.com")); userList.add(new User("5", "userId05", "name05", departmentName, 82, "01012341234", "name05@pinpoint.com")); when(userDao.selectUserByDepartment(departmentName)).thenReturn(userList); @@ -204,13 +205,13 @@ public void selectUserByDepartment() { @Test public void searchUser() { - String condition = "part"; + String condition = "part"; List userList = new ArrayList<>(5); userList.add(new User("1", "userId01", "name01", "departmentName", 82, "01012341234", "name01@pinpoint.com")); userList.add(new User("2", "userId02", "name02", "departmentName", 82, "01012341234", "name02@pinpoint.com")); userList.add(new User("3", "userId03", "name03", "departmentName", 82, "01012341234", "name03@pinpoint.com")); - userList.add(new User("4","userId04", "name04", "departmentName", 82, "01012341234", "name04@pinpoint.com")); + userList.add(new User("4", "userId04", "name04", "departmentName", 82, "01012341234", "name04@pinpoint.com")); userList.add(new User("5", "userId05", "name05", "departmentName", 82, "01012341234", "name05@pinpoint.com")); when(userDao.searchUser(condition)).thenReturn(userList); @@ -231,7 +232,7 @@ private class CustomUserInfoDecoder implements UserInfoDecoder { @Override public List decodePhoneNumberList(List phoneNumberList) { List changedPhoneNumberList = new ArrayList<>(phoneNumberList.size()); - for (int i = 0 ; i < phoneNumberList.size() ; i++) { + for (int i = 0; i < phoneNumberList.size(); i++) { changedPhoneNumberList.add(DECODED_PHONE_NUMBER); } @@ -272,7 +273,7 @@ public User decodeUserInfo(User user) { @Override public List decodeEmailList(List emailList) { List encodedEmailList = new ArrayList<>(emailList.size()); - for (int i = 0 ; i < emailList.size() ; i++) { + for (int i = 0; i < emailList.size(); i++) { encodedEmailList.add(DECODED_EMAIL); } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/WebhookSendInfoServiceImplTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/WebhookSendInfoServiceImplTest.java index 10e4f7ba6083..1fead6aab4f5 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/WebhookSendInfoServiceImplTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/service/WebhookSendInfoServiceImplTest.java @@ -6,24 +6,26 @@ import com.navercorp.pinpoint.web.dao.memory.MemoryWebhookSendInfoDao; import com.navercorp.pinpoint.web.vo.Webhook; import com.navercorp.pinpoint.web.vo.WebhookSendInfo; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class WebhookSendInfoServiceImplTest { private List webhookSendInfoList; private List webhookList; - @Before + @BeforeEach public void before() { webhookSendInfoList = new ArrayList<>(3); webhookSendInfoList.add(new WebhookSendInfo("0", "1340", "4115234")); diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/WebhookServiceImplTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/WebhookServiceImplTest.java index 58318ce3f616..f93e7522225a 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/WebhookServiceImplTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/service/WebhookServiceImplTest.java @@ -6,23 +6,25 @@ import com.navercorp.pinpoint.web.dao.memory.MemoryWebhookDao; import com.navercorp.pinpoint.web.dao.memory.MemoryWebhookSendInfoDao; import com.navercorp.pinpoint.web.vo.Webhook; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.Mockito.mock; -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class WebhookServiceImplTest { private List webhookList; - @Before + @BeforeEach public void before() { webhookList = new ArrayList<>(2); webhookList.add(new Webhook("1340", "webhook", "testUrl", "testApp", "testGroup")); diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/appmetric/ApplicationDataSourceServiceTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/appmetric/ApplicationDataSourceServiceTest.java index 5f32f611bb99..2f34ad8153c8 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/appmetric/ApplicationDataSourceServiceTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/service/appmetric/ApplicationDataSourceServiceTest.java @@ -22,11 +22,14 @@ import com.navercorp.pinpoint.web.dao.appmetric.ApplicationMetricDao; import com.navercorp.pinpoint.web.vo.stat.AggreJoinDataSourceBo; import com.navercorp.pinpoint.web.vo.stat.AggreJoinDataSourceListBo; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.Mockito.mock; /** diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/map/BidirectionalLinkSelectorTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/map/BidirectionalLinkSelectorTest.java index 1c3906609a8b..afa4a0a97657 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/map/BidirectionalLinkSelectorTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/service/map/BidirectionalLinkSelectorTest.java @@ -16,15 +16,15 @@ package com.navercorp.pinpoint.web.service.map; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkData; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataDuplexMap; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap; import com.navercorp.pinpoint.web.vo.Application; import com.navercorp.pinpoint.web.vo.LinkKey; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -124,33 +124,33 @@ public LinkDataMap answer(InvocationOnMock invocation) throws Throwable { // APP_IN_IN -> APP_IN (callee) LinkKey linkKey_IN_IN_to_IN = new LinkKey(APP_IN_IN, APP_IN); LinkData linkData_IN_IN_to_IN = linkDataDuplexMap.getTargetLinkData(linkKey_IN_IN_to_IN); - Assert.assertNotNull(linkData_IN_IN_to_IN); - Assert.assertEquals(callCount, linkData_IN_IN_to_IN.getTotalCount()); + Assertions.assertNotNull(linkData_IN_IN_to_IN); + Assertions.assertEquals(callCount, linkData_IN_IN_to_IN.getTotalCount()); // APP_IN -> APP_A (callee) LinkKey linkKey_IN_to_A = new LinkKey(APP_IN, APP_A); LinkData linkData_IN_to_A = linkDataDuplexMap.getTargetLinkData(linkKey_IN_to_A); - Assert.assertNotNull(linkData_IN_to_A); - Assert.assertEquals(callCount, linkData_IN_to_A.getTotalCount()); + Assertions.assertNotNull(linkData_IN_to_A); + Assertions.assertEquals(callCount, linkData_IN_to_A.getTotalCount()); // APP_IN (caller) -> APP_IN_OUT LinkKey linkKey_IN_to_IN_OUT = new LinkKey(APP_IN, APP_IN_OUT); LinkData linkData_IN_to_IN_OUT = linkDataDuplexMap.getSourceLinkData(linkKey_IN_to_IN_OUT); - Assert.assertNotNull(linkData_IN_to_IN_OUT); - Assert.assertEquals(callCount, linkData_IN_to_IN_OUT.getTotalCount()); + Assertions.assertNotNull(linkData_IN_to_IN_OUT); + Assertions.assertEquals(callCount, linkData_IN_to_IN_OUT.getTotalCount()); // APP_A (caller) -> APP_OUT LinkKey linkKey_A_to_OUT = new LinkKey(APP_A, APP_OUT); LinkData linkData_A_to_OUT = linkDataDuplexMap.getSourceLinkData(linkKey_A_to_OUT); - Assert.assertNotNull(linkData_A_to_OUT); - Assert.assertEquals(callCount, linkData_A_to_OUT.getTotalCount()); + Assertions.assertNotNull(linkData_A_to_OUT); + Assertions.assertEquals(callCount, linkData_A_to_OUT.getTotalCount()); // APP_OUT (caller) -> APP_OUT_OUT LinkKey linkKey_OUT_to_OUT_OUT = new LinkKey(APP_OUT, APP_OUT_OUT); LinkData linkData_OUT_to_OUT_OUT = linkDataDuplexMap.getSourceLinkData(linkKey_OUT_to_OUT_OUT); - Assert.assertNotNull(linkData_OUT_to_OUT_OUT); - Assert.assertEquals(callCount, linkData_OUT_to_OUT_OUT.getTotalCount()); + Assertions.assertNotNull(linkData_OUT_to_OUT_OUT); + Assertions.assertEquals(callCount, linkData_OUT_to_OUT_OUT.getTotalCount()); // APP_OUT_IN -> APP_OUT (callee) LinkKey linkKey_OUT_IN_to_OUT = new LinkKey(APP_OUT_IN, APP_OUT); LinkData linkData_OUT_IN_to_OUT = linkDataDuplexMap.getTargetLinkData(linkKey_OUT_IN_to_OUT); - Assert.assertNotNull(linkData_OUT_IN_to_OUT); - Assert.assertEquals(callCount, linkData_OUT_IN_to_OUT.getTotalCount()); + Assertions.assertNotNull(linkData_OUT_IN_to_OUT); + Assertions.assertEquals(callCount, linkData_OUT_IN_to_OUT.getTotalCount()); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/map/FilteredMapBuilderTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/map/FilteredMapBuilderTest.java index 58a2822c5229..f9ac04e1f926 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/map/FilteredMapBuilderTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/service/map/FilteredMapBuilderTest.java @@ -18,8 +18,9 @@ import com.navercorp.pinpoint.common.server.bo.SpanBo; import com.navercorp.pinpoint.common.server.bo.SpanEventBo; -import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; import com.navercorp.pinpoint.web.TestTraceUtils; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkData; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataDuplexMap; @@ -28,14 +29,15 @@ import com.navercorp.pinpoint.web.service.DefaultApplicationFactory; import com.navercorp.pinpoint.web.vo.Application; import com.navercorp.pinpoint.web.vo.LinkKey; -import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.vo.ResponseHistograms; import com.navercorp.pinpoint.web.vo.ResponseTime; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.junit.MockitoJUnitRunner; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.junit.jupiter.MockitoSettings; +import org.mockito.quality.Strictness; import java.util.Arrays; import java.util.List; @@ -44,7 +46,8 @@ /** * @author HyunGil Jeong */ -@RunWith(MockitoJUnitRunner.Silent.class) +@ExtendWith(MockitoExtension.class) +@MockitoSettings(strictness = Strictness.LENIENT) public class FilteredMapBuilderTest { private static final Random RANDOM = new Random(); @@ -56,7 +59,7 @@ public class FilteredMapBuilderTest { private ApplicationFactory applicationFactory; - @Before + @BeforeEach public void setUp() { this.applicationFactory = new DefaultApplicationFactory(registry); } @@ -131,25 +134,25 @@ public void twoTier() { ResponseHistograms responseHistograms = filteredMap.getResponseHistograms(); Application rootApplication = new Application("ROOT_APP", registry.findServiceType(TestTraceUtils.TEST_STAND_ALONE_TYPE_CODE)); List rootAppResponseTimes = responseHistograms.getResponseTimeList(rootApplication); - Assert.assertNotNull(rootAppResponseTimes); - Assert.assertEquals(1, rootAppResponseTimes.size()); + Assertions.assertNotNull(rootAppResponseTimes); + Assertions.assertEquals(1, rootAppResponseTimes.size()); Application applicationA = new Application("APP_A", registry.findServiceType(TestTraceUtils.TEST_STAND_ALONE_TYPE_CODE)); List appAResponseTimes = responseHistograms.getResponseTimeList(applicationA); - Assert.assertNotNull(appAResponseTimes); - Assert.assertEquals(1, appAResponseTimes.size()); + Assertions.assertNotNull(appAResponseTimes); + Assertions.assertEquals(1, appAResponseTimes.size()); } private void assertSourceLinkData(LinkDataMap sourceLinkDataMap, String fromApplicationName, ServiceType fromServiceType, String toApplicationName, ServiceType toServiceType) { LinkKey linkKey = new LinkKey(fromApplicationName, fromServiceType, toApplicationName, toServiceType); LinkData sourceLinkData = sourceLinkDataMap.getLinkData(linkKey); String assertMessage = String.format("%s[%s] to %s[%s] source link data does not exist", fromApplicationName, fromServiceType.getName(), toApplicationName, toServiceType.getName()); - Assert.assertNotNull(assertMessage, sourceLinkData); + Assertions.assertNotNull(sourceLinkData, assertMessage); } private void assertTargetLinkData(LinkDataMap targetLinkDataMap, String fromApplicationName, ServiceType fromServiceType, String toApplicationName, ServiceType toServiceType) { LinkKey linkKey = new LinkKey(fromApplicationName, fromServiceType, toApplicationName, toServiceType); LinkData targetLinkData = targetLinkDataMap.getLinkData(linkKey); String assertMessage = String.format("%s[%s] from %s[%s] target link data does not exist", toApplicationName, toServiceType.getName(), fromApplicationName, fromServiceType.getName()); - Assert.assertNotNull(assertMessage, targetLinkData); + Assertions.assertNotNull(targetLinkData, assertMessage); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/map/LinkSelectorTestBase.java b/web/src/test/java/com/navercorp/pinpoint/web/service/map/LinkSelectorTestBase.java index f6e776174c34..3020a0f34dd0 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/map/LinkSelectorTestBase.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/service/map/LinkSelectorTestBase.java @@ -17,6 +17,7 @@ package com.navercorp.pinpoint.web.service.map; import com.google.common.collect.Sets; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.trace.ServiceTypeFactory; import com.navercorp.pinpoint.common.trace.ServiceTypeProperty; @@ -28,11 +29,10 @@ import com.navercorp.pinpoint.web.service.LinkDataMapService; import com.navercorp.pinpoint.web.vo.Application; import com.navercorp.pinpoint.web.vo.LinkKey; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; @@ -71,14 +71,14 @@ public abstract class LinkSelectorTestBase { protected abstract LinkSelectorType getLinkSelectorType(); - @Before + @BeforeEach public void setUp() throws Exception { this.linkDataMapService = mock(LinkDataMapService.class); this.hostApplicationMapDao = mock(HostApplicationMapDao.class); this.linkSelectorFactory = new LinkSelectorFactory(linkDataMapService, applicationsMapCreatorFactory, hostApplicationMapDao); } - @After + @AfterEach public void cleanUp() { executor.shutdown(); try { @@ -105,8 +105,8 @@ public void testEmpty() { LinkSelector linkSelector = linkSelectorFactory.createLinkSelector(getLinkSelectorType()); LinkDataDuplexMap select = linkSelector.select(Collections.singletonList(APP_A), range, 1, 1); - Assert.assertEquals(select.size(), 0); - Assert.assertEquals(select.getTotalCount(), 0); + Assertions.assertEquals(select.size(), 0); + Assertions.assertEquals(select.getTotalCount(), 0); } @Test @@ -128,13 +128,13 @@ public void testCaller() { LinkSelector linkSelector = linkSelectorFactory.createLinkSelector(getLinkSelectorType()); LinkDataDuplexMap linkData = linkSelector.select(Collections.singletonList(APP_A), range, 1, 1); - Assert.assertEquals(linkData.size(), 1); - Assert.assertEquals(linkData.getTotalCount(), callCount_A_B); + Assertions.assertEquals(linkData.size(), 1); + Assertions.assertEquals(linkData.getTotalCount(), callCount_A_B); - Assert.assertEquals(linkData.getSourceLinkDataList().size(), 1); - Assert.assertEquals(linkData.getSourceLinkDataMap().getTotalCount(), callCount_A_B); + Assertions.assertEquals(linkData.getSourceLinkDataList().size(), 1); + Assertions.assertEquals(linkData.getSourceLinkDataMap().getTotalCount(), callCount_A_B); - Assert.assertEquals(linkData.getTargetLinkDataList().size(), 0); + Assertions.assertEquals(linkData.getTargetLinkDataList().size(), 0); } @Test @@ -160,13 +160,13 @@ public void testCaller_multiple() { LinkSelector linkSelector = linkSelectorFactory.createLinkSelector(getLinkSelectorType()); LinkDataDuplexMap linkData = linkSelector.select(Collections.singletonList(APP_A), range, 1, 1); - Assert.assertEquals(linkData.size(), numTargets); - Assert.assertEquals(linkData.getTotalCount(), numTargets * callCount_A_APP); + Assertions.assertEquals(linkData.size(), numTargets); + Assertions.assertEquals(linkData.getTotalCount(), numTargets * callCount_A_APP); - Assert.assertEquals(linkData.getSourceLinkDataList().size(), numTargets); - Assert.assertEquals(linkData.getSourceLinkDataMap().getTotalCount(), numTargets * callCount_A_APP); + Assertions.assertEquals(linkData.getSourceLinkDataList().size(), numTargets); + Assertions.assertEquals(linkData.getSourceLinkDataMap().getTotalCount(), numTargets * callCount_A_APP); - Assert.assertEquals(linkData.getTargetLinkDataList().size(), 0); + Assertions.assertEquals(linkData.getTargetLinkDataList().size(), 0); } @Test @@ -198,20 +198,20 @@ public void testCaller_3tier() { LinkSelector linkSelector = linkSelectorFactory.createLinkSelector(getLinkSelectorType()); LinkDataDuplexMap linkData = linkSelector.select(Collections.singletonList(APP_A), range, 1, 1); - Assert.assertEquals(linkData.size(), 1); - Assert.assertEquals(linkData.getTotalCount(), callCount_A_B); + Assertions.assertEquals(linkData.size(), 1); + Assertions.assertEquals(linkData.getTotalCount(), callCount_A_B); - Assert.assertEquals(linkData.getSourceLinkDataList().size(), 1); - Assert.assertEquals(linkData.getSourceLinkDataMap().getTotalCount(), callCount_A_B); + Assertions.assertEquals(linkData.getSourceLinkDataList().size(), 1); + Assertions.assertEquals(linkData.getSourceLinkDataMap().getTotalCount(), callCount_A_B); assertSource_Target_TotalCount("APP_A->APP_B", linkData, new LinkKey(APP_A, APP_B), callCount_A_B); - Assert.assertEquals(linkData.getTargetLinkDataList().size(), 0); + Assertions.assertEquals(linkData.getTargetLinkDataList().size(), 0); // depth 2 LinkSelector linkSelector2 = linkSelectorFactory.createLinkSelector(getLinkSelectorType()); LinkDataDuplexMap linkData_depth2 = linkSelector2.select(Collections.singletonList(APP_A), range, 2, 2); - Assert.assertEquals(linkData_depth2.size(), 2); - Assert.assertEquals(linkData_depth2.getTotalCount(), callCount_A_B + callCount_B_C); + Assertions.assertEquals(linkData_depth2.size(), 2); + Assertions.assertEquals(linkData_depth2.getTotalCount(), callCount_A_B + callCount_B_C); LinkKey linkKey_A_B = new LinkKey(APP_A, APP_B); assertSource_Target_TotalCount("APP_A->APP_B", linkData_depth2, linkKey_A_B, callCount_A_B); @@ -247,22 +247,22 @@ public void testCaller_rpc() { LinkDataDuplexMap linkData = linkSelector.select(Collections.singletonList(APP_A), range, 1, 1); // Then - Assert.assertEquals(1, linkData.size()); - Assert.assertEquals(callCount_A_B, linkData.getTotalCount()); + Assertions.assertEquals(1, linkData.size()); + Assertions.assertEquals(callCount_A_B, linkData.getTotalCount()); - Assert.assertEquals(1, linkData.getSourceLinkDataList().size()); - Assert.assertEquals(callCount_A_B, linkData.getSourceLinkDataMap().getTotalCount()); + Assertions.assertEquals(1, linkData.getSourceLinkDataList().size()); + Assertions.assertEquals(callCount_A_B, linkData.getSourceLinkDataMap().getTotalCount()); - Assert.assertEquals(0, linkData.getTargetLinkDataList().size()); + Assertions.assertEquals(0, linkData.getTargetLinkDataList().size()); LinkData linkData_A_B = linkData.getSourceLinkData(new LinkKey(APP_A, APP_B)); - Assert.assertEquals(callCount_A_B, linkData_A_B.getTotalCount()); + Assertions.assertEquals(callCount_A_B, linkData_A_B.getTotalCount()); List callDatas = new ArrayList<>(linkData_A_B.getLinkCallDataMap().getLinkDataList()); - Assert.assertEquals(1, callDatas.size()); + Assertions.assertEquals(1, callDatas.size()); LinkCallData callData = callDatas.get(0); - Assert.assertEquals(rpcUri, callData.getTarget()); - Assert.assertEquals(testRpcServiceType, callData.getTargetServiceType()); + Assertions.assertEquals(rpcUri, callData.getTarget()); + Assertions.assertEquals(testRpcServiceType, callData.getTargetServiceType()); } @Test @@ -284,13 +284,13 @@ public void testCallee() { LinkSelector linkSelector = linkSelectorFactory.createLinkSelector(getLinkSelectorType()); LinkDataDuplexMap linkData = linkSelector.select(Collections.singletonList(APP_B), range, 1, 1); - Assert.assertEquals(linkData.size(), 1); - Assert.assertEquals(linkData.getTotalCount(), callCount_A_B); + Assertions.assertEquals(linkData.size(), 1); + Assertions.assertEquals(linkData.getTotalCount(), callCount_A_B); - Assert.assertEquals(linkData.getSourceLinkDataList().size(), 0); + Assertions.assertEquals(linkData.getSourceLinkDataList().size(), 0); - Assert.assertEquals(linkData.getTargetLinkDataList().size(), 1); - Assert.assertEquals(linkData.getTargetLinkDataMap().getTotalCount(), callCount_A_B); + Assertions.assertEquals(linkData.getTargetLinkDataList().size(), 1); + Assertions.assertEquals(linkData.getTargetLinkDataMap().getTotalCount(), callCount_A_B); } @Test @@ -323,18 +323,18 @@ public void testCallee_3tier() { LinkSelector linkSelector = linkSelectorFactory.createLinkSelector(getLinkSelectorType()); LinkDataDuplexMap linkData = linkSelector.select(Collections.singletonList(APP_C), range, 1, 1); - Assert.assertEquals(linkData.size(), 1); - Assert.assertEquals(linkData.getTotalCount(), callCount_B_C); + Assertions.assertEquals(linkData.size(), 1); + Assertions.assertEquals(linkData.getTotalCount(), callCount_B_C); - Assert.assertEquals(linkData.getSourceLinkDataList().size(), 0); + Assertions.assertEquals(linkData.getSourceLinkDataList().size(), 0); - Assert.assertEquals(linkData.getTargetLinkDataList().size(), 1); - Assert.assertEquals(linkData.getTotalCount(), callCount_B_C); + Assertions.assertEquals(linkData.getTargetLinkDataList().size(), 1); + Assertions.assertEquals(linkData.getTotalCount(), callCount_B_C); // depth 2 LinkSelector linkSelector2 = linkSelectorFactory.createLinkSelector(getLinkSelectorType()); LinkDataDuplexMap linkData_depth2 = linkSelector2.select(Collections.singletonList(APP_C), range, 2, 2); - Assert.assertEquals(linkData_depth2.size(), 2); + Assertions.assertEquals(linkData_depth2.size(), 2); LinkKey linkKey_A_B = new LinkKey(APP_A, APP_B); assertTarget_Source_TotalCount("APP_A->APP_B", linkData_depth2, linkKey_A_B, callCount_A_B); @@ -389,20 +389,20 @@ public void testVirtual() { // Then LinkData linkData_A_B = linkData.getSourceLinkData(new LinkKey(APP_A, APP_B)); LinkData linkData_A_C = linkData.getSourceLinkData(new LinkKey(APP_A, APP_C)); - Assert.assertEquals(callCount_A_B, linkData_A_B.getTotalCount()); - Assert.assertEquals(callCount_A_C, linkData_A_C.getTotalCount()); + Assertions.assertEquals(callCount_A_B, linkData_A_B.getTotalCount()); + Assertions.assertEquals(callCount_A_C, linkData_A_C.getTotalCount()); List callData_A_Bs = new ArrayList<>(linkData_A_B.getLinkCallDataMap().getLinkDataList()); - Assert.assertEquals(1, callData_A_Bs.size()); + Assertions.assertEquals(1, callData_A_Bs.size()); LinkCallData callData_A_B = callData_A_Bs.get(0); - Assert.assertEquals(rpcUri, callData_A_B.getTarget()); - Assert.assertEquals(testRpcServiceType, callData_A_B.getTargetServiceType()); + Assertions.assertEquals(rpcUri, callData_A_B.getTarget()); + Assertions.assertEquals(testRpcServiceType, callData_A_B.getTargetServiceType()); List callData_A_Cs = new ArrayList<>(linkData_A_C.getLinkCallDataMap().getLinkDataList()); - Assert.assertEquals(1, callData_A_Cs.size()); + Assertions.assertEquals(1, callData_A_Cs.size()); LinkCallData callData_A_C = callData_A_Cs.get(0); - Assert.assertEquals(rpcUri, callData_A_C.getTarget()); - Assert.assertEquals(testRpcServiceType, callData_A_C.getTargetServiceType()); + Assertions.assertEquals(rpcUri, callData_A_C.getTarget()); + Assertions.assertEquals(testRpcServiceType, callData_A_C.getTargetServiceType()); } @Test @@ -549,28 +549,28 @@ public void testVirtual_3tier_callee_limited() { // Then LinkData linkData_A_B = linkData.getSourceLinkData(new LinkKey(APP_A, APP_B)); LinkData linkData_A_C = linkData.getSourceLinkData(new LinkKey(APP_A, APP_C)); - Assert.assertEquals(callCount_A_B, linkData_A_B.getTotalCount()); - Assert.assertEquals(callCount_A_C, linkData_A_C.getTotalCount()); + Assertions.assertEquals(callCount_A_B, linkData_A_B.getTotalCount()); + Assertions.assertEquals(callCount_A_C, linkData_A_C.getTotalCount()); LinkData linkData_B_D = linkData.getSourceLinkData(new LinkKey(APP_B, APP_D)); - Assert.assertEquals(callCount_B_D, linkData_B_D.getTotalCount()); + Assertions.assertEquals(callCount_B_D, linkData_B_D.getTotalCount()); LinkData linkData_C_D = linkData.getSourceLinkData(new LinkKey(APP_C, APP_D)); - Assert.assertEquals(callCount_C_D, linkData_C_D.getTotalCount()); + Assertions.assertEquals(callCount_C_D, linkData_C_D.getTotalCount()); LinkData targetLinkData_A_B = linkData.getTargetLinkData(new LinkKey(APP_A, APP_B)); LinkData targetLinkData_A_C = linkData.getTargetLinkData(new LinkKey(APP_A, APP_C)); - Assert.assertEquals(callCount_A_B, targetLinkData_A_B.getTotalCount()); - Assert.assertEquals(callCount_A_C, targetLinkData_A_C.getTotalCount()); + Assertions.assertEquals(callCount_A_B, targetLinkData_A_B.getTotalCount()); + Assertions.assertEquals(callCount_A_C, targetLinkData_A_C.getTotalCount()); } private void assertTarget_Source_TotalCount(String message, LinkDataDuplexMap linkData, LinkKey linkKey, long count) { LinkData sourceLinkData = linkData.getTargetLinkData(linkKey); long totalCount = sourceLinkData.getTotalCount(); - Assert.assertEquals(message, totalCount, count); + Assertions.assertEquals(totalCount, count, message); } private void assertSource_Target_TotalCount(String message, LinkDataDuplexMap linkData, LinkKey linkKey, long count) { LinkData sourceLinkData = linkData.getSourceLinkData(linkKey); long totalCount = sourceLinkData.getTotalCount(); - Assert.assertEquals(message, totalCount, count); + Assertions.assertEquals(totalCount, count, message); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/map/LinkVisitCheckerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/map/LinkVisitCheckerTest.java index 1071e4042a47..34437225cc7a 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/map/LinkVisitCheckerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/service/map/LinkVisitCheckerTest.java @@ -18,9 +18,8 @@ import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.vo.Application; - -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -39,12 +38,12 @@ public void testVisitCaller() { LinkVisitChecker checker = new LinkVisitChecker(); Application testApplication = new Application("test", ServiceType.STAND_ALONE); - Assert.assertFalse(checker.visitCaller(testApplication)); - Assert.assertTrue(checker.visitCaller(testApplication)); + Assertions.assertFalse(checker.visitCaller(testApplication)); + Assertions.assertTrue(checker.visitCaller(testApplication)); Application newApp = new Application("newApp", ServiceType.STAND_ALONE); - Assert.assertFalse(checker.visitCaller(newApp)); - Assert.assertTrue(checker.visitCaller(newApp)); + Assertions.assertFalse(checker.visitCaller(newApp)); + Assertions.assertTrue(checker.visitCaller(newApp)); } @Test @@ -52,12 +51,12 @@ public void testVisitCallee() { LinkVisitChecker checker = new LinkVisitChecker(); Application testApplication = new Application("test", ServiceType.STAND_ALONE); - Assert.assertFalse(checker.visitCallee(testApplication)); - Assert.assertTrue(checker.visitCallee(testApplication)); + Assertions.assertFalse(checker.visitCallee(testApplication)); + Assertions.assertTrue(checker.visitCallee(testApplication)); Application newApp = new Application("newApp", ServiceType.STAND_ALONE); - Assert.assertFalse(checker.visitCallee(newApp)); - Assert.assertTrue(checker.visitCallee(newApp)); + Assertions.assertFalse(checker.visitCallee(newApp)); + Assertions.assertTrue(checker.visitCallee(newApp)); } @Test @@ -80,8 +79,8 @@ public void testVisitCallerParallel() throws Exception { } submitLatch.countDown(); visitedLatch.await(); - Assert.assertEquals(1, firstVisitCount.get()); - Assert.assertEquals(concurrency - 1, alreadyVisitedCount.get()); + Assertions.assertEquals(1, firstVisitCount.get()); + Assertions.assertEquals(concurrency - 1, alreadyVisitedCount.get()); } @Test @@ -112,8 +111,8 @@ public void testVisitCallerParallelMultipleApplications() throws Exception { } submitLatch.countDown(); visitedLatch.await(); - Assert.assertEquals(3, firstVisitCount.get()); - Assert.assertEquals(concurrency - 3, alreadyVisitedCount.get()); + Assertions.assertEquals(3, firstVisitCount.get()); + Assertions.assertEquals(concurrency - 3, alreadyVisitedCount.get()); } private static class VisitJobContext { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/map/UnidirectionalLinkSelectorTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/map/UnidirectionalLinkSelectorTest.java index 1aceee455885..fa3677dbaaf0 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/map/UnidirectionalLinkSelectorTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/service/map/UnidirectionalLinkSelectorTest.java @@ -16,15 +16,15 @@ package com.navercorp.pinpoint.web.service.map; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkData; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataDuplexMap; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap; import com.navercorp.pinpoint.web.vo.Application; import com.navercorp.pinpoint.web.vo.LinkKey; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -126,31 +126,31 @@ public LinkDataMap answer(InvocationOnMock invocation) throws Throwable { // APP_IN_IN -> APP_IN (callee) LinkKey linkKey_IN_IN_to_IN = new LinkKey(APP_IN_IN, APP_IN); LinkData linkData_IN_IN_to_IN = linkDataDuplexMap.getTargetLinkData(linkKey_IN_IN_to_IN); - Assert.assertNotNull(linkData_IN_IN_to_IN); - Assert.assertEquals(callCount, linkData_IN_IN_to_IN.getTotalCount()); + Assertions.assertNotNull(linkData_IN_IN_to_IN); + Assertions.assertEquals(callCount, linkData_IN_IN_to_IN.getTotalCount()); // APP_IN -> APP_A (callee) LinkKey linkKey_IN_to_A = new LinkKey(APP_IN, APP_A); LinkData linkData_IN_to_A = linkDataDuplexMap.getTargetLinkData(linkKey_IN_to_A); - Assert.assertNotNull(linkData_IN_to_A); - Assert.assertEquals(callCount, linkData_IN_to_A.getTotalCount()); + Assertions.assertNotNull(linkData_IN_to_A); + Assertions.assertEquals(callCount, linkData_IN_to_A.getTotalCount()); // APP_IN (caller) -> APP_IN_OUT should not exist LinkKey linkKey_IN_to_IN_OUT = new LinkKey(APP_IN, APP_IN_OUT); LinkData linkData_IN_to_IN_OUT = linkDataDuplexMap.getSourceLinkData(linkKey_IN_to_IN_OUT); - Assert.assertNull(linkData_IN_to_IN_OUT); + Assertions.assertNull(linkData_IN_to_IN_OUT); // APP_A (caller) -> APP_OUT LinkKey linkKey_A_to_OUT = new LinkKey(APP_A, APP_OUT); LinkData linkData_A_to_OUT = linkDataDuplexMap.getSourceLinkData(linkKey_A_to_OUT); - Assert.assertNotNull(linkData_A_to_OUT); - Assert.assertEquals(callCount, linkData_A_to_OUT.getTotalCount()); + Assertions.assertNotNull(linkData_A_to_OUT); + Assertions.assertEquals(callCount, linkData_A_to_OUT.getTotalCount()); // APP_OUT (caller) -> APP_OUT_OUT LinkKey linkKey_OUT_to_OUT_OUT = new LinkKey(APP_OUT, APP_OUT_OUT); LinkData linkData_OUT_to_OUT_OUT = linkDataDuplexMap.getSourceLinkData(linkKey_OUT_to_OUT_OUT); - Assert.assertNotNull(linkData_OUT_to_OUT_OUT); - Assert.assertEquals(callCount, linkData_OUT_to_OUT_OUT.getTotalCount()); + Assertions.assertNotNull(linkData_OUT_to_OUT_OUT); + Assertions.assertEquals(callCount, linkData_OUT_to_OUT_OUT.getTotalCount()); // APP_OUT_IN -> APP_OUT (callee) should not exist LinkKey linkKey_OUT_IN_to_OUT = new LinkKey(APP_OUT_IN, APP_OUT); LinkData linkData_OUT_IN_to_OUT = linkDataDuplexMap.getTargetLinkData(linkKey_OUT_IN_to_OUT); - Assert.assertNull(linkData_OUT_IN_to_OUT); + Assertions.assertNull(linkData_OUT_IN_to_OUT); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/map/processor/AcceptApplicationLocalCacheTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/map/processor/AcceptApplicationLocalCacheTest.java index 4cce588e1567..de61ff8f2ba1 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/map/processor/AcceptApplicationLocalCacheTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/service/map/processor/AcceptApplicationLocalCacheTest.java @@ -16,15 +16,14 @@ package com.navercorp.pinpoint.web.service.map.processor; -import java.util.HashSet; -import java.util.Set; - -import com.navercorp.pinpoint.web.service.map.AcceptApplication; -import org.junit.Assert; -import org.junit.Test; - import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.web.service.map.AcceptApplication; import com.navercorp.pinpoint.web.vo.Application; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +import java.util.HashSet; +import java.util.Set; public class AcceptApplicationLocalCacheTest { @@ -44,13 +43,13 @@ public void testFind() { // found Set acceptApplications = cache.get(rpc); - Assert.assertEquals(acceptApplications.size(), 1); - Assert.assertEquals(acceptApplications.iterator().next(), localhost); + Assertions.assertEquals(acceptApplications.size(), 1); + Assertions.assertEquals(acceptApplications.iterator().next(), localhost); // not found Set unknown = cache.get(new RpcApplication("unknown:8080", tomcat)); - Assert.assertTrue(unknown.isEmpty()); - Assert.assertFalse(unknown.iterator().hasNext()); + Assertions.assertTrue(unknown.isEmpty()); + Assertions.assertFalse(unknown.iterator().hasNext()); } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/map/processor/RpcCallProcessorTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/map/processor/RpcCallProcessorTest.java index fb7456e23fd3..53e256c32209 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/map/processor/RpcCallProcessorTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/service/map/processor/RpcCallProcessorTest.java @@ -17,6 +17,7 @@ package com.navercorp.pinpoint.web.service.map.processor; import com.google.common.collect.Sets; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkData; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap; @@ -25,12 +26,11 @@ import com.navercorp.pinpoint.web.service.map.VirtualLinkMarker; import com.navercorp.pinpoint.web.vo.Application; import com.navercorp.pinpoint.web.vo.LinkKey; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.Collections; import java.util.Set; @@ -45,7 +45,7 @@ /** * @author HyunGil Jeong */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class RpcCallProcessorTest { private final Range testRange = Range.between(System.currentTimeMillis(), System.currentTimeMillis()); @@ -73,10 +73,10 @@ public void nonRpcClientOrQueueCallsShouldNotBeReplaced() { // Then LinkKey linkKey = new LinkKey(fromApplication, toApplication); - Assert.assertNotNull(replacedLinkDataMap.getLinkData(linkKey)); - Assert.assertEquals(linkDataMap.size(), replacedLinkDataMap.size()); + Assertions.assertNotNull(replacedLinkDataMap.getLinkData(linkKey)); + Assertions.assertEquals(linkDataMap.size(), replacedLinkDataMap.size()); - Assert.assertTrue(virtualLinkMarker.getVirtualLinkData().isEmpty()); + Assertions.assertTrue(virtualLinkMarker.getVirtualLinkData().isEmpty()); } @Test @@ -103,15 +103,15 @@ public void oneAcceptApplication() { // Then LinkKey originalLinkKey = new LinkKey(fromApplication, toApplication); - Assert.assertNull(replacedLinkDataMap.getLinkData(originalLinkKey)); + Assertions.assertNull(replacedLinkDataMap.getLinkData(originalLinkKey)); LinkKey replacedLinkKey = new LinkKey(fromApplication, expectedToApplication); LinkData replacedLinkData = replacedLinkDataMap.getLinkData(replacedLinkKey); - Assert.assertNotNull(replacedLinkData); - Assert.assertEquals(fromApplication, replacedLinkData.getFromApplication()); - Assert.assertEquals(expectedToApplication, replacedLinkData.getToApplication()); + Assertions.assertNotNull(replacedLinkData); + Assertions.assertEquals(fromApplication, replacedLinkData.getFromApplication()); + Assertions.assertEquals(expectedToApplication, replacedLinkData.getToApplication()); - Assert.assertTrue(virtualLinkMarker.getVirtualLinkData().isEmpty()); + Assertions.assertTrue(virtualLinkMarker.getVirtualLinkData().isEmpty()); } @Test @@ -141,23 +141,23 @@ public void multipleAcceptApplications() { // Then LinkKey originalLinkKey = new LinkKey(fromApplication, toApplication); - Assert.assertNull(replacedLinkDataMap.getLinkData(originalLinkKey)); + Assertions.assertNull(replacedLinkDataMap.getLinkData(originalLinkKey)); LinkKey replacedLinkKey1 = new LinkKey(fromApplication, expectedToApplication1); LinkData replacedLinkData1 = replacedLinkDataMap.getLinkData(replacedLinkKey1); - Assert.assertNotNull(replacedLinkData1); - Assert.assertEquals(fromApplication, replacedLinkData1.getFromApplication()); - Assert.assertEquals(expectedToApplication1, replacedLinkData1.getToApplication()); + Assertions.assertNotNull(replacedLinkData1); + Assertions.assertEquals(fromApplication, replacedLinkData1.getFromApplication()); + Assertions.assertEquals(expectedToApplication1, replacedLinkData1.getToApplication()); LinkKey replacedLinkKey2 = new LinkKey(fromApplication, expectedToApplication2); LinkData replacedLinkData2 = replacedLinkDataMap.getLinkData(replacedLinkKey2); - Assert.assertNotNull(replacedLinkData2); - Assert.assertEquals(fromApplication, replacedLinkData2.getFromApplication()); - Assert.assertEquals(expectedToApplication2, replacedLinkData2.getToApplication()); + Assertions.assertNotNull(replacedLinkData2); + Assertions.assertEquals(fromApplication, replacedLinkData2.getFromApplication()); + Assertions.assertEquals(expectedToApplication2, replacedLinkData2.getToApplication()); Set virtualLinkDatas = virtualLinkMarker.getVirtualLinkData(); - Assert.assertTrue(virtualLinkDatas.contains(replacedLinkData1)); - Assert.assertTrue(virtualLinkDatas.contains(replacedLinkData2)); + Assertions.assertTrue(virtualLinkDatas.contains(replacedLinkData1)); + Assertions.assertTrue(virtualLinkDatas.contains(replacedLinkData2)); } @Test @@ -183,14 +183,14 @@ public void rpcWithoutAcceptApplication_shouldBeReplacedToUnknown() { // Then LinkKey originalLinkKey = new LinkKey(fromApplication, toApplication); - Assert.assertNull(replacedLinkDataMap.getLinkData(originalLinkKey)); + Assertions.assertNull(replacedLinkDataMap.getLinkData(originalLinkKey)); LinkKey replacedLinkKey = new LinkKey(fromApplication, expectedToApplication); LinkData replacedLinkData = replacedLinkDataMap.getLinkData(replacedLinkKey); - Assert.assertEquals(fromApplication, replacedLinkData.getFromApplication()); - Assert.assertEquals(expectedToApplication, replacedLinkData.getToApplication()); + Assertions.assertEquals(fromApplication, replacedLinkData.getFromApplication()); + Assertions.assertEquals(expectedToApplication, replacedLinkData.getToApplication()); - Assert.assertTrue(virtualLinkMarker.getVirtualLinkData().isEmpty()); + Assertions.assertTrue(virtualLinkMarker.getVirtualLinkData().isEmpty()); } @Test @@ -217,10 +217,10 @@ public void queueWithoutAcceptApplication_shouldNotReplace() { // Then LinkKey linkKey = new LinkKey(fromApplication, toApplication); LinkData linkData = replacedLinkDataMap.getLinkData(linkKey); - Assert.assertEquals(fromApplication, linkData.getFromApplication()); - Assert.assertEquals(toApplication, linkData.getToApplication()); + Assertions.assertEquals(fromApplication, linkData.getFromApplication()); + Assertions.assertEquals(toApplication, linkData.getToApplication()); - Assert.assertTrue(virtualLinkMarker.getVirtualLinkData().isEmpty()); + Assertions.assertTrue(virtualLinkMarker.getVirtualLinkData().isEmpty()); } @Test @@ -254,13 +254,13 @@ public void multipleAcceptApplications_with_AliasAndOriginal() { // Then LinkKey originalLinkKey = new LinkKey(fromApplication, toApplication); - Assert.assertNull(replacedLinkDataMap.getLinkData(originalLinkKey)); + Assertions.assertNull(replacedLinkDataMap.getLinkData(originalLinkKey)); LinkKey replacedLinkKey2 = new LinkKey(fromApplication, expectedToApplication2); LinkData replacedLinkData2 = replacedLinkDataMap.getLinkData(replacedLinkKey2); - Assert.assertNotNull(replacedLinkData2); - Assert.assertEquals(fromApplication, replacedLinkData2.getFromApplication()); - Assert.assertEquals(expectedToApplication2, replacedLinkData2.getToApplication()); + Assertions.assertNotNull(replacedLinkData2); + Assertions.assertEquals(fromApplication, replacedLinkData2.getFromApplication()); + Assertions.assertEquals(expectedToApplication2, replacedLinkData2.getToApplication()); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/map/processor/WasOnlyProcessorTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/map/processor/WasOnlyProcessorTest.java index 8c5f19a460a5..bdeab161f200 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/map/processor/WasOnlyProcessorTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/service/map/processor/WasOnlyProcessorTest.java @@ -16,15 +16,15 @@ package com.navercorp.pinpoint.web.service.map.processor; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.common.trace.ServiceTypeFactory; import com.navercorp.pinpoint.common.trace.ServiceTypeProperty; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkData; import com.navercorp.pinpoint.web.applicationmap.rawdata.LinkDataMap; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author HyunGil Jeong @@ -48,7 +48,7 @@ public void shouldFilterLinksToTerminalNodes() { LinkDataMap filteredLinkDataMap = wasOnlyProcessor.processLinkDataMap(linkDataMap, testRange); // Then - Assert.assertTrue(filteredLinkDataMap.getLinkDataList().isEmpty()); + Assertions.assertTrue(filteredLinkDataMap.getLinkDataList().isEmpty()); } @Test @@ -65,7 +65,7 @@ public void shouldFilterLinksToUnknownNodes() { LinkDataMap filteredLinkDataMap = wasOnlyProcessor.processLinkDataMap(linkDataMap, testRange); // Then - Assert.assertTrue(filteredLinkDataMap.getLinkDataList().isEmpty()); + Assertions.assertTrue(filteredLinkDataMap.getLinkDataList().isEmpty()); } @Test @@ -82,7 +82,7 @@ public void shouldNotFilterLinksToWasNodes() { LinkDataMap filteredLinkDataMap = wasOnlyProcessor.processLinkDataMap(linkDataMap, testRange); // Then - Assert.assertFalse(filteredLinkDataMap.getLinkDataList().isEmpty()); + Assertions.assertFalse(filteredLinkDataMap.getLinkDataList().isEmpty()); } @Test @@ -99,6 +99,6 @@ public void shouldNotFilterLinksToQueueNodes() { LinkDataMap filteredLinkDataMap = wasOnlyProcessor.processLinkDataMap(linkDataMap, testRange); // Then - Assert.assertFalse(filteredLinkDataMap.getLinkDataList().isEmpty()); + Assertions.assertFalse(filteredLinkDataMap.getLinkDataList().isEmpty()); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/stat/AgentWarningStatServiceTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/stat/AgentWarningStatServiceTest.java index 43f6d1bf2049..1989c6028c20 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/stat/AgentWarningStatServiceTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/service/stat/AgentWarningStatServiceTest.java @@ -17,15 +17,15 @@ package com.navercorp.pinpoint.web.service.stat; import com.navercorp.pinpoint.common.server.bo.stat.DeadlockThreadCountBo; -import com.navercorp.pinpoint.web.dao.stat.AgentStatDao; import com.navercorp.pinpoint.common.server.util.time.Range; +import com.navercorp.pinpoint.web.dao.stat.AgentStatDao; import com.navercorp.pinpoint.web.vo.timeline.inspector.AgentStatusTimelineSegment; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.ArrayList; import java.util.List; @@ -37,7 +37,7 @@ /** * @author Taejin Koo */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class AgentWarningStatServiceTest { private static final long CURRENT_TIME = System.currentTimeMillis(); @@ -49,7 +49,7 @@ public class AgentWarningStatServiceTest { private AgentWarningStatService agentWarningStatService; - @Before + @BeforeEach public void setUp() throws Exception { this.agentWarningStatService = new AgentWarningStatServiceImpl(deadlockDao); } @@ -61,7 +61,7 @@ public void selectTest1() { List mockData = createMockData(10, 5000); when(deadlockDao.getAgentStatList("pinpoint", range)).thenReturn(mockData); List timelineSegmentList = agentWarningStatService.select("pinpoint", range); - Assert.assertEquals(1, timelineSegmentList.size()); + Assertions.assertEquals(1, timelineSegmentList.size()); } @Test @@ -71,7 +71,7 @@ public void selectTest2() { List mockData = createMockData(10, 70000); when(deadlockDao.getAgentStatList("pinpoint", range)).thenReturn(mockData); List timelineSegmentList = agentWarningStatService.select("pinpoint", range); - Assert.assertEquals(10, timelineSegmentList.size()); + Assertions.assertEquals(10, timelineSegmentList.size()); } private List createMockData(int mockSize, long interval) { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/servlet/RewriteForV2FilterTest.java b/web/src/test/java/com/navercorp/pinpoint/web/servlet/RewriteForV2FilterTest.java index ea9fb1df4658..c8a54a8abb67 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/servlet/RewriteForV2FilterTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/servlet/RewriteForV2FilterTest.java @@ -16,7 +16,8 @@ package com.navercorp.pinpoint.web.servlet; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; import javax.servlet.FilterChain; @@ -32,17 +33,19 @@ public class RewriteForV2FilterTest { public static final String ADMIN_REWRITE_TARGET = "/auth"; - @Test(expected = NullPointerException.class) + @Test public void rewriteTest() throws IOException, ServletException { - RewriteForV2Filter rewriteForV2Filter = new RewriteForV2Filter(true); + Assertions.assertThrows(NullPointerException.class, () -> { + RewriteForV2Filter rewriteForV2Filter = new RewriteForV2Filter(true); - HttpServletRequest servletRequest = Mockito.mock(HttpServletRequest.class); - Mockito.when(servletRequest.getRequestURI()).thenReturn(ADMIN_REWRITE_TARGET); + HttpServletRequest servletRequest = Mockito.mock(HttpServletRequest.class); + Mockito.when(servletRequest.getRequestURI()).thenReturn(ADMIN_REWRITE_TARGET); - ServletResponse servletResponse = Mockito.mock(ServletResponse.class); - FilterChain filterChain = Mockito.mock(FilterChain.class); + ServletResponse servletResponse = Mockito.mock(ServletResponse.class); + FilterChain filterChain = Mockito.mock(FilterChain.class); - rewriteForV2Filter.doFilter(servletRequest, servletResponse, filterChain); + rewriteForV2Filter.doFilter(servletRequest, servletResponse, filterChain); + }); } @Test diff --git a/web/src/test/java/com/navercorp/pinpoint/web/task/ChainedTaskDecoratorTest.java b/web/src/test/java/com/navercorp/pinpoint/web/task/ChainedTaskDecoratorTest.java index b7b4a8fc786a..5ce995c16b65 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/task/ChainedTaskDecoratorTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/task/ChainedTaskDecoratorTest.java @@ -16,9 +16,9 @@ package com.navercorp.pinpoint.web.task; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.core.task.TaskDecorator; @@ -35,7 +35,7 @@ public class ChainedTaskDecoratorTest { private SimpleAsyncTaskExecutor executor; - @Before + @BeforeEach public void setup() { executor = new SimpleAsyncTaskExecutor("Test-Worker-"); } @@ -57,9 +57,9 @@ public void chainedDecoratorsShouldBeCalled() throws InterruptedException { } completeLatch.await(5L, TimeUnit.SECONDS); // Then - Assert.assertEquals(testCount, decorator1.getCount()); - Assert.assertEquals(testCount, decorator2.getCount()); - Assert.assertEquals(testCount, decorator3.getCount()); + Assertions.assertEquals(testCount, decorator1.getCount()); + Assertions.assertEquals(testCount, decorator2.getCount()); + Assertions.assertEquals(testCount, decorator3.getCount()); } private static class CountingTaskDecorator implements TaskDecorator { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/task/RequestContextPropagatingTaskDecoratorTest.java b/web/src/test/java/com/navercorp/pinpoint/web/task/RequestContextPropagatingTaskDecoratorTest.java index c6a7efcd737d..577d1fb5c402 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/task/RequestContextPropagatingTaskDecoratorTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/task/RequestContextPropagatingTaskDecoratorTest.java @@ -16,12 +16,13 @@ package com.navercorp.pinpoint.web.task; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; @@ -33,7 +34,7 @@ /** * @author HyunGil Jeong */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class RequestContextPropagatingTaskDecoratorTest { private final RequestContextPropagatingTaskDecorator decorator = new RequestContextPropagatingTaskDecorator(); @@ -42,7 +43,7 @@ public class RequestContextPropagatingTaskDecoratorTest { @Mock private RequestAttributes requestAttributes; - @Before + @BeforeEach public void setup() { executor.setTaskDecorator(decorator); } @@ -74,6 +75,6 @@ public void onError() { completeLatch.await(5, TimeUnit.SECONDS); // Then boolean testVerified = verifiedFlag.get(); - Assert.assertTrue("RequestContext has not been propagated", testVerified); + Assertions.assertTrue(testVerified, "RequestContext has not been propagated"); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/task/SecurityContextPropagatingTaskDecoratorTest.java b/web/src/test/java/com/navercorp/pinpoint/web/task/SecurityContextPropagatingTaskDecoratorTest.java index fd101184f9f9..5520826636ad 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/task/SecurityContextPropagatingTaskDecoratorTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/task/SecurityContextPropagatingTaskDecoratorTest.java @@ -16,12 +16,12 @@ package com.navercorp.pinpoint.web.task; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.security.core.context.SecurityContext; import org.springframework.security.core.context.SecurityContextHolder; @@ -33,7 +33,7 @@ /** * @author HyunGil Jeong */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class SecurityContextPropagatingTaskDecoratorTest { private final SecurityContextPropagatingTaskDecorator decorator = new SecurityContextPropagatingTaskDecorator(); @@ -42,7 +42,7 @@ public class SecurityContextPropagatingTaskDecoratorTest { @Mock private SecurityContext securityContext; - @Before + @BeforeEach public void setup() { executor.setTaskDecorator(decorator); } @@ -74,6 +74,6 @@ public void onError() { completeLatch.await(5, TimeUnit.SECONDS); // Then boolean testVerified = verifiedFlag.get(); - Assert.assertTrue("SecurityContext has not been propagated", testVerified); + Assertions.assertTrue(testVerified, "SecurityContext has not been propagated"); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/util/BatchUtilsTest.java b/web/src/test/java/com/navercorp/pinpoint/web/util/BatchUtilsTest.java index 0ff33cae27d8..3bf9cc61bb0f 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/util/BatchUtilsTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/util/BatchUtilsTest.java @@ -16,9 +16,10 @@ package com.navercorp.pinpoint.web.util; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author minwoo.jung diff --git a/web/src/test/java/com/navercorp/pinpoint/web/util/DateLimiterTest.java b/web/src/test/java/com/navercorp/pinpoint/web/util/DateLimiterTest.java index 1edc76682114..0648a1f3dd91 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/util/DateLimiterTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/util/DateLimiterTest.java @@ -17,10 +17,8 @@ package com.navercorp.pinpoint.web.util; import com.navercorp.pinpoint.common.server.util.time.Range; - -import org.junit.Assert; - -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.time.Duration; import java.time.Instant; @@ -59,13 +57,13 @@ public void checkFail() { Limiter limiter = new DateLimiter(Duration.ofDays(2)); try { limiter.limit(Instant.EPOCH, ofDays(2).plusMillis(1)); - Assert.fail(); + Assertions.fail(); } catch (Exception ignored) { } try { limiter.limit(ofDays(2), Instant.EPOCH); - Assert.fail(); + Assertions.fail(); } catch (Exception ignored) { } } @@ -75,13 +73,13 @@ public void checkRangeFail() { Limiter limiter = new DateLimiter(Duration.ofDays(2)); try { limiter.limit(Range.between(Instant.EPOCH, ofDays(2).plusMillis(1))); - Assert.fail(); + Assertions.fail(); } catch (Exception ignored) { } try { limiter.limit(Range.between(ofDays(2), Instant.EPOCH)); - Assert.fail(); + Assertions.fail(); } catch (Exception ignored) { } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/util/DateTimeUtilsTest.java b/web/src/test/java/com/navercorp/pinpoint/web/util/DateTimeUtilsTest.java index 4ade15f3b718..eae9c064e17f 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/util/DateTimeUtilsTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/util/DateTimeUtilsTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.web.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Calendar; import java.util.Date; @@ -31,7 +31,7 @@ public class DateTimeUtilsTest { @Test public void timestampToMidNight() { long current = System.currentTimeMillis(); - Assert.assertEquals(timestampToMidNight(current), DateTimeUtils.timestampToStartOfDay(current)); + Assertions.assertEquals(timestampToMidNight(current), DateTimeUtils.timestampToStartOfDay(current)); } private static long timestampToMidNight(long timestamp) { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/util/LimitUtilsTest.java b/web/src/test/java/com/navercorp/pinpoint/web/util/LimitUtilsTest.java index 8a999e5dfcc7..8a3f06b8b9ba 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/util/LimitUtilsTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/util/LimitUtilsTest.java @@ -16,11 +16,8 @@ package com.navercorp.pinpoint.web.util; -import org.junit.Assert; - -import org.junit.Test; - -import com.navercorp.pinpoint.web.util.LimitUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -29,17 +26,17 @@ public class LimitUtilsTest { @Test public void testCheckLimit() { int equals = LimitUtils.checkRange(LimitUtils.MAX); - Assert.assertEquals(equals, LimitUtils.MAX); + Assertions.assertEquals(equals, LimitUtils.MAX); int over = LimitUtils.checkRange(LimitUtils.MAX + 1); - Assert.assertEquals(over, LimitUtils.MAX); + Assertions.assertEquals(over, LimitUtils.MAX); int low = LimitUtils.checkRange(0); - Assert.assertEquals(low, 0); + Assertions.assertEquals(low, 0); try { LimitUtils.checkRange(-1); - Assert.fail(); + Assertions.fail(); } catch (Exception ignored) { } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/util/ListListUtilsTest.java b/web/src/test/java/com/navercorp/pinpoint/web/util/ListListUtilsTest.java index 684f5447f55c..468b1e461b94 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/util/ListListUtilsTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/util/ListListUtilsTest.java @@ -1,7 +1,7 @@ package com.navercorp.pinpoint.web.util; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; @@ -20,6 +20,6 @@ public void toList() { listList.add(b); List sum = ListListUtils.toList(listList); - Assert.assertEquals(4, sum.size()); + Assertions.assertEquals(4, sum.size()); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/util/SimpleOrderedThreadPoolTest.java b/web/src/test/java/com/navercorp/pinpoint/web/util/SimpleOrderedThreadPoolTest.java index 32650f110c13..8377837e558f 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/util/SimpleOrderedThreadPoolTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/util/SimpleOrderedThreadPoolTest.java @@ -17,10 +17,10 @@ package com.navercorp.pinpoint.web.util; import com.navercorp.pinpoint.common.profiler.concurrent.PinpointThreadFactory; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Random; import java.util.concurrent.CountDownLatch; @@ -48,7 +48,7 @@ public void testExecute() throws Exception { threadPool.shutdown(); threadPool.awaitTermination(10000, TimeUnit.MILLISECONDS); - Assert.assertEquals(latch.getCount(), 0); + Assertions.assertEquals(latch.getCount(), 0); } public class TestHashSelectorRunnable implements Runnable, SimpleOrderedThreadPool.HashSelector { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/util/TimeWindowSlotCentricSamplerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/util/TimeWindowSlotCentricSamplerTest.java index 47f6cd8fc184..a6e0b050ae36 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/util/TimeWindowSlotCentricSamplerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/util/TimeWindowSlotCentricSamplerTest.java @@ -16,14 +16,14 @@ package com.navercorp.pinpoint.web.util; -import static org.junit.Assert.*; -import static com.navercorp.pinpoint.web.util.TimeWindowSlotCentricSampler.*; +import com.navercorp.pinpoint.common.server.util.time.Range; +import org.junit.jupiter.api.Test; import java.util.concurrent.TimeUnit; -import org.junit.Test; - -import com.navercorp.pinpoint.common.server.util.time.Range; +import static com.navercorp.pinpoint.web.util.TimeWindowSlotCentricSampler.DEFAULT_IDEAL_NUM_TIMESLOTS; +import static com.navercorp.pinpoint.web.util.TimeWindowSlotCentricSampler.DEFAULT_MINIMUM_TIMESLOT; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author hyungil.jeong diff --git a/web/src/test/java/com/navercorp/pinpoint/web/util/TimeWindowTest.java b/web/src/test/java/com/navercorp/pinpoint/web/util/TimeWindowTest.java index aa3f4a1d55a1..50e1615fd59c 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/util/TimeWindowTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/util/TimeWindowTest.java @@ -17,12 +17,10 @@ package com.navercorp.pinpoint.web.util; import com.navercorp.pinpoint.common.server.util.time.Range; - -import org.junit.Assert; - -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Iterator; import java.util.concurrent.TimeUnit; @@ -39,21 +37,21 @@ public void testGetNextWindowFirst() { TimeWindow window = new TimeWindow(Range.between(0L, 1000)); logger.debug("{}", window.getWindowRange()); Iterator iterator = window.iterator(); - Assert.assertEquals(iterator.next(), (Long)0L); + Assertions.assertEquals(iterator.next(), (Long)0L); try { iterator.next(); - Assert.fail("no more element"); + Assertions.fail("no more element"); } catch (Exception ignored) { } TimeWindow window2 = new TimeWindow(Range.between(0L, TimeUnit.MINUTES.toMillis(1))); logger.debug("{}", window2.getWindowRange()); Iterator iterator2 = window2.iterator(); - Assert.assertEquals(iterator2.next(), (Long)0L); - Assert.assertEquals(iterator2.next(), (Long)(1000*60L)); + Assertions.assertEquals(iterator2.next(), (Long)0L); + Assertions.assertEquals(iterator2.next(), (Long)(1000*60L)); try { iterator2.next(); - Assert.fail("no more element"); + Assertions.fail("no more element"); } catch (Exception ignored) { } } @@ -66,7 +64,7 @@ public void testGetNextWindow() { for (Long aLong : window) { i++; } - Assert.assertEquals(i, 2); + Assertions.assertEquals(i, 2); } @Test @@ -78,7 +76,7 @@ public void testGetNextWindow2() { logger.debug("{}", aLong); i++; } - Assert.assertEquals(i, 2); + Assertions.assertEquals(i, 2); } @Test @@ -107,8 +105,8 @@ public void refineRange() { Range windowRange = window.getWindowRange(); // 1 should be replace by 0. logger.debug("{}", windowRange); - Assert.assertEquals(windowRange.getFrom(), 0); - Assert.assertEquals(windowRange.getTo(), TimeUnit.MINUTES.toMillis(1)); + Assertions.assertEquals(windowRange.getFrom(), 0); + Assertions.assertEquals(windowRange.getTo(), TimeUnit.MINUTES.toMillis(1)); } @@ -118,7 +116,7 @@ public void testGetWindowRangeLength() { TimeWindow window = new TimeWindow(range); long windowRangeLength = window.getWindowRangeCount(); logger.debug("{}", windowRangeLength); - Assert.assertEquals(1, windowRangeLength); + Assertions.assertEquals(1, windowRangeLength); } @@ -128,7 +126,7 @@ public void testGetWindowRangeLength2() { TimeWindow window = new TimeWindow(range); long windowRangeLength = window.getWindowRangeCount(); logger.debug("{}", windowRangeLength); - Assert.assertEquals(2, windowRangeLength); + Assertions.assertEquals(2, windowRangeLength); } @Test @@ -137,7 +135,7 @@ public void testRefineIndex1() { TimeWindow window = new TimeWindow(range); long index = window.getWindowIndex(2); logger.debug("{}", index); - Assert.assertEquals(0, index); + Assertions.assertEquals(0, index); } @Test @@ -146,6 +144,6 @@ public void testRefineIndex2() { TimeWindow window = new TimeWindow(range); long index = window.getWindowIndex(1000 * 60L); logger.debug("{}", index); - Assert.assertEquals(1, index); + Assertions.assertEquals(1, index); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/util/ValueValidatorTest.java b/web/src/test/java/com/navercorp/pinpoint/web/util/ValueValidatorTest.java index 5543f00bd99c..cead138592f4 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/util/ValueValidatorTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/util/ValueValidatorTest.java @@ -17,10 +17,10 @@ package com.navercorp.pinpoint.web.util; import com.navercorp.pinpoint.web.vo.User; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author minwoo.jung diff --git a/web/src/test/java/com/navercorp/pinpoint/web/util/etag/ETagUtilsTest.java b/web/src/test/java/com/navercorp/pinpoint/web/util/etag/ETagUtilsTest.java index 57bff949658d..d644693cdd0a 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/util/etag/ETagUtilsTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/util/etag/ETagUtilsTest.java @@ -16,22 +16,22 @@ package com.navercorp.pinpoint.web.util.etag; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class ETagUtilsTest { @Test public void parse_weak() { ETag eTag = ETagUtils.parseETag("W/\"0815\""); - Assert.assertEquals("0815", eTag.getTag()); - Assert.assertTrue(eTag.isWeak()); + Assertions.assertEquals("0815", eTag.getTag()); + Assertions.assertTrue(eTag.isWeak()); } @Test public void parse_string() { ETag eTag = ETagUtils.parseETag("\"0815\""); - Assert.assertEquals("0815", eTag.getTag()); - Assert.assertFalse(eTag.isWeak()); + Assertions.assertEquals("0815", eTag.getTag()); + Assertions.assertFalse(eTag.isWeak()); } } \ No newline at end of file diff --git a/web/src/test/java/com/navercorp/pinpoint/web/view/AgentActiveThreadDumpListSerializerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/view/AgentActiveThreadDumpListSerializerTest.java index 643ae5d0ea42..5b7049e3519a 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/view/AgentActiveThreadDumpListSerializerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/view/AgentActiveThreadDumpListSerializerTest.java @@ -26,8 +26,8 @@ import com.navercorp.pinpoint.thrift.dto.command.TThreadDump; import com.navercorp.pinpoint.web.vo.AgentActiveThreadDumpFactory; import com.navercorp.pinpoint.web.vo.AgentActiveThreadDumpList; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.lang.management.ThreadInfo; import java.util.ArrayList; @@ -50,20 +50,20 @@ public void serializeTest() throws Exception { List list = mapper.readValue(jsonValue, List.class); - Assert.assertTrue(CollectionUtils.hasLength(list)); + Assertions.assertTrue(CollectionUtils.hasLength(list)); Map map = (Map) list.get(0); - Assert.assertTrue(map.containsKey("threadId")); - Assert.assertTrue(map.containsKey("threadName")); - Assert.assertTrue(map.containsKey("threadState")); - Assert.assertTrue(map.containsKey("startTime")); - Assert.assertTrue(map.containsKey("execTime")); - Assert.assertTrue(map.containsKey("localTraceId")); - Assert.assertTrue(map.containsKey("sampled")); - Assert.assertTrue(map.containsKey("transactionId")); - Assert.assertTrue(map.containsKey("entryPoint")); - Assert.assertTrue(map.containsKey("detailMessage")); + Assertions.assertTrue(map.containsKey("threadId")); + Assertions.assertTrue(map.containsKey("threadName")); + Assertions.assertTrue(map.containsKey("threadState")); + Assertions.assertTrue(map.containsKey("startTime")); + Assertions.assertTrue(map.containsKey("execTime")); + Assertions.assertTrue(map.containsKey("localTraceId")); + Assertions.assertTrue(map.containsKey("sampled")); + Assertions.assertTrue(map.containsKey("transactionId")); + Assertions.assertTrue(map.containsKey("entryPoint")); + Assertions.assertTrue(map.containsKey("detailMessage")); } private AgentActiveThreadDumpList createThreadDumpList(ThreadInfo[] allThreadInfo) { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/view/AgentEventMarkerSerializerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/view/AgentEventMarkerSerializerTest.java index 8408adf351ef..4edde080a30b 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/view/AgentEventMarkerSerializerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/view/AgentEventMarkerSerializerTest.java @@ -21,10 +21,10 @@ import com.navercorp.pinpoint.common.server.util.AgentEventType; import com.navercorp.pinpoint.web.vo.AgentEvent; import com.navercorp.pinpoint.web.vo.timeline.inspector.AgentEventMarker; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Map; @@ -37,7 +37,7 @@ public void serializeTest() throws Exception { AgentEventMarker marker = makeData(); String jsonValue = mapper.writeValueAsString(marker); Map map = mapper.readValue(jsonValue, Map.class); - Assert.assertEquals(27, map.get("totalCount")); + Assertions.assertEquals(27, map.get("totalCount")); logger.debug(map.get("typeCounts").toString()); } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/view/ApplicationGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/view/ApplicationGroupTest.java index 4a9c52634da9..602aa1a7e1eb 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/view/ApplicationGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/view/ApplicationGroupTest.java @@ -5,10 +5,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.vo.Application; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; @@ -33,9 +33,9 @@ public void getApplicationList() throws JsonProcessingException { logger.debug("json:{}", json); Map ele1 = list.get(0); - Assert.assertEquals("test1", ele1.get("applicationName")); - Assert.assertEquals("TEST", ele1.get("serviceType")); - Assert.assertEquals("5", ele1.get("code")); + Assertions.assertEquals("test1", ele1.get("applicationName")); + Assertions.assertEquals("TEST", ele1.get("serviceType")); + Assertions.assertEquals("5", ele1.get("code")); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/view/DataSourceChartSerializerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/view/DataSourceChartSerializerTest.java index 792a75ebda4b..915b1bab188d 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/view/DataSourceChartSerializerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/view/DataSourceChartSerializerTest.java @@ -18,21 +18,21 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.navercorp.pinpoint.common.server.bo.stat.DataSourceBo; -import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; import com.navercorp.pinpoint.web.mapper.stat.sampling.sampler.DataSourceSampler; import com.navercorp.pinpoint.web.test.util.DataSourceTestUtils; import com.navercorp.pinpoint.web.util.TimeWindow; -import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.vo.stat.SampledDataSource; import com.navercorp.pinpoint.web.vo.stat.chart.agent.DataSourceChart; import org.apache.commons.lang3.RandomUtils; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; import java.util.ArrayList; import java.util.List; @@ -44,7 +44,7 @@ /** * @author Taejin Koo */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class DataSourceChartSerializerTest { private static final int MIN_VALUE_OF_MAX_CONNECTION_SIZE = 20; @@ -57,7 +57,7 @@ public class DataSourceChartSerializerTest { @Mock private ServiceTypeRegistryService serviceTypeRegistryService; - @Before + @BeforeEach public void setUp() throws Exception { when(serviceTypeRegistryService.findServiceType(any(Short.class))).thenReturn(ServiceType.UNKNOWN); } @@ -73,11 +73,11 @@ public void serializeTest() throws Exception { String jsonValue = mapper.writeValueAsString(dataSourceChartGroup); Map map = mapper.readValue(jsonValue, Map.class); - Assert.assertTrue(map.containsKey("id")); - Assert.assertTrue(map.containsKey("jdbcUrl")); - Assert.assertTrue(map.containsKey("databaseName")); - Assert.assertTrue(map.containsKey("serviceType")); - Assert.assertTrue(map.containsKey("charts")); + Assertions.assertTrue(map.containsKey("id")); + Assertions.assertTrue(map.containsKey("jdbcUrl")); + Assertions.assertTrue(map.containsKey("databaseName")); + Assertions.assertTrue(map.containsKey("serviceType")); + Assertions.assertTrue(map.containsKey("charts")); } private List createSampledDataSourceList(TimeWindow timeWindow) { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/view/DotSerializerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/view/DotSerializerTest.java index a407d969ee8c..5f571e84071e 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/view/DotSerializerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/view/DotSerializerTest.java @@ -20,12 +20,10 @@ import com.navercorp.pinpoint.common.profiler.util.TransactionId; import com.navercorp.pinpoint.common.profiler.util.TransactionIdUtils; import com.navercorp.pinpoint.web.vo.scatter.Dot; - -import org.junit.Assert; - -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -41,6 +39,6 @@ public void testSerialize() throws Exception { TransactionId transactionId = TransactionIdUtils.parseTransactionId("aigw.dev.1^1395798795017^1527177"); Dot dot = new Dot(transactionId, 100, 99, 1, "agent"); String jsonValue = mapper.writeValueAsString(dot); - Assert.assertEquals("[100,99,\"aigw.dev.1^1395798795017^1527177\",0]", jsonValue); + Assertions.assertEquals("[100,99,\"aigw.dev.1^1395798795017^1527177\",0]", jsonValue); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/view/HistogramSerializerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/view/HistogramSerializerTest.java index aa39f62c7af9..44fdd19bb908 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/view/HistogramSerializerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/view/HistogramSerializerTest.java @@ -20,11 +20,10 @@ import com.navercorp.pinpoint.common.trace.HistogramSchema; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.applicationmap.histogram.Histogram; - -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Map; @@ -56,7 +55,7 @@ public void testSerialize() throws Exception { String internalJson = internalJson(original); Map hashMap = objectMapper.readValue(internalJson, Map.class); - Assert.assertEquals(objectMapperHashMap, hashMap); + Assertions.assertEquals(objectMapperHashMap, hashMap); } /** diff --git a/web/src/test/java/com/navercorp/pinpoint/web/view/InspectorViewTest.java b/web/src/test/java/com/navercorp/pinpoint/web/view/InspectorViewTest.java index c1d436eed86c..16e9b626dd41 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/view/InspectorViewTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/view/InspectorViewTest.java @@ -10,8 +10,8 @@ import com.navercorp.pinpoint.web.vo.stat.chart.InspectorDataBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; import com.navercorp.pinpoint.web.vo.stat.chart.agent.AgentStatPoint; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.HashMap; @@ -61,12 +61,12 @@ public void inspectorViewTest() { InspectorData inspectorData = inspectorDataBuilder.build(timeWindow, testAgentStatDataPoints); InspectorView inspectorView = new InspectorView(inspectorData); - Assert.assertEquals(inspectorView.getTitle(), title); - Assert.assertEquals(inspectorView.getUnit(), unit); - Assert.assertEquals(inspectorView.getTimestamp().size(), timeWindow.getWindowRangeCount()); - Assert.assertEquals(inspectorView.getMetricValueGroups().size(), TestChartType.values().length); + Assertions.assertEquals(inspectorView.getTitle(), title); + Assertions.assertEquals(inspectorView.getUnit(), unit); + Assertions.assertEquals(inspectorView.getTimestamp().size(), timeWindow.getWindowRangeCount()); + Assertions.assertEquals(inspectorView.getMetricValueGroups().size(), TestChartType.values().length); InspectorView.InspectorValueGroupView inspectorValueGroupView = inspectorView.getMetricValueGroups().get(0); - Assert.assertEquals(inspectorValueGroupView.getMetricValues().size(), valueFunctionMap.size()); + Assertions.assertEquals(inspectorValueGroupView.getMetricValues().size(), valueFunctionMap.size()); } private List createTestAgentStatDataPoint() { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/view/LinkSerializerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/view/LinkSerializerTest.java index ad1d2c3c595e..259258fa1cd7 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/view/LinkSerializerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/view/LinkSerializerTest.java @@ -19,6 +19,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.common.trace.ServiceType; import com.navercorp.pinpoint.web.applicationmap.link.CreateType; import com.navercorp.pinpoint.web.applicationmap.link.Link; @@ -26,11 +27,9 @@ import com.navercorp.pinpoint.web.applicationmap.rawdata.AgentHistogram; import com.navercorp.pinpoint.web.applicationmap.rawdata.AgentHistogramList; import com.navercorp.pinpoint.web.vo.Application; -import com.navercorp.pinpoint.common.server.util.time.Range; - -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; /** * @author emeroad diff --git a/web/src/test/java/com/navercorp/pinpoint/web/view/ServerInstanceListSerializerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/view/ServerInstanceListSerializerTest.java index 312f3efafec8..e6f70c88a263 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/view/ServerInstanceListSerializerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/view/ServerInstanceListSerializerTest.java @@ -16,10 +16,13 @@ package com.navercorp.pinpoint.web.view; -import java.util.HashSet; -import java.util.Set; - -import com.fasterxml.jackson.databind.*; +import com.fasterxml.jackson.databind.DeserializationConfig; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.KeyDeserializer; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectWriter; +import com.fasterxml.jackson.databind.SerializationConfig; import com.fasterxml.jackson.databind.cfg.HandlerInstantiator; import com.fasterxml.jackson.databind.cfg.MapperConfig; import com.fasterxml.jackson.databind.introspect.Annotated; @@ -27,17 +30,18 @@ import com.fasterxml.jackson.databind.jsontype.TypeResolverBuilder; import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; import com.navercorp.pinpoint.web.applicationmap.ServerInstanceListTest; - -import com.navercorp.pinpoint.web.util.ServiceTypeRegistryMockFactory; -import org.junit.Test; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.LogManager; - import com.navercorp.pinpoint.web.applicationmap.nodes.ServerBuilder; import com.navercorp.pinpoint.web.applicationmap.nodes.ServerInstanceList; +import com.navercorp.pinpoint.web.util.ServiceTypeRegistryMockFactory; import com.navercorp.pinpoint.web.vo.AgentInfo; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Test; import org.springframework.http.converter.json.Jackson2ObjectMapperFactoryBean; +import java.util.HashSet; +import java.util.Set; + /** * @author emeroad */ diff --git a/web/src/test/java/com/navercorp/pinpoint/web/view/UriStatHistogramPointSerializerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/view/UriStatHistogramPointSerializerTest.java index dffa8a3895de..a51daddbf2e5 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/view/UriStatHistogramPointSerializerTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/view/UriStatHistogramPointSerializerTest.java @@ -16,14 +16,13 @@ package com.navercorp.pinpoint.web.view; -import com.navercorp.pinpoint.common.trace.UriStatHistogramBucket; -import com.navercorp.pinpoint.web.vo.stat.chart.agent.UriStatHistogramPoint; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.navercorp.pinpoint.common.trace.UriStatHistogramBucket; +import com.navercorp.pinpoint.web.vo.stat.chart.agent.UriStatHistogramPoint; import org.apache.commons.lang3.StringUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.concurrent.ThreadLocalRandom; @@ -49,7 +48,7 @@ public void jsonTest() throws JsonProcessingException { String arrayAsString = Arrays.toString(newArrayValue); String replace = StringUtils.replace(arrayAsString, " ", ""); - Assert.assertEquals(replace, jsonString); + Assertions.assertEquals(replace, jsonString); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentActiveThreadCountFactoryTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentActiveThreadCountFactoryTest.java index 7dbff1d8439b..01535a992dd9 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentActiveThreadCountFactoryTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentActiveThreadCountFactoryTest.java @@ -19,8 +19,8 @@ import com.navercorp.pinpoint.common.util.CollectionUtils; import com.navercorp.pinpoint.thrift.dto.command.TCmdActiveThreadCount; import com.navercorp.pinpoint.thrift.dto.command.TCmdActiveThreadCountRes; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; @@ -29,10 +29,12 @@ */ public class AgentActiveThreadCountFactoryTest { - @Test(expected = NullPointerException.class) + @Test public void assertAgentIdTest() { - AgentActiveThreadCountFactory factory = new AgentActiveThreadCountFactory(); - factory.create(new TCmdActiveThreadCountRes()); + Assertions.assertThrows(NullPointerException.class, () -> { + AgentActiveThreadCountFactory factory = new AgentActiveThreadCountFactory(); + factory.create(new TCmdActiveThreadCountRes()); + }); } @Test @@ -44,8 +46,8 @@ public void invalidActiveThreadCountTest1() { factory.setAgentId("test"); AgentActiveThreadCount agentActiveThreadCount = factory.create(response); - Assert.assertEquals(factory.INTERNAL_ERROR.getCode(), agentActiveThreadCount.getCode()); - Assert.assertEquals(0, CollectionUtils.nullSafeSize(agentActiveThreadCount.getActiveThreadCountList())); + Assertions.assertEquals(factory.INTERNAL_ERROR.getCode(), agentActiveThreadCount.getCode()); + Assertions.assertEquals(0, CollectionUtils.nullSafeSize(agentActiveThreadCount.getActiveThreadCountList())); } @Test @@ -57,8 +59,8 @@ public void invalidActiveThreadCountTest2() { factory.setAgentId("test"); AgentActiveThreadCount agentActiveThreadCount = factory.create(response); - Assert.assertEquals(factory.INTERNAL_ERROR.getCode(), agentActiveThreadCount.getCode()); - Assert.assertEquals(0, CollectionUtils.nullSafeSize(agentActiveThreadCount.getActiveThreadCountList())); + Assertions.assertEquals(factory.INTERNAL_ERROR.getCode(), agentActiveThreadCount.getCode()); + Assertions.assertEquals(0, CollectionUtils.nullSafeSize(agentActiveThreadCount.getActiveThreadCountList())); } @Test @@ -69,8 +71,8 @@ public void invalidArgumentTest1() { factory.setAgentId("test"); AgentActiveThreadCount agentActiveThreadCount = factory.create(response); - Assert.assertEquals(factory.INTERNAL_ERROR.getCode(), agentActiveThreadCount.getCode()); - Assert.assertEquals(0, CollectionUtils.nullSafeSize(agentActiveThreadCount.getActiveThreadCountList())); + Assertions.assertEquals(factory.INTERNAL_ERROR.getCode(), agentActiveThreadCount.getCode()); + Assertions.assertEquals(0, CollectionUtils.nullSafeSize(agentActiveThreadCount.getActiveThreadCountList())); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentActiveThreadCountListTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentActiveThreadCountListTest.java index b5094745f09a..873522fed081 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentActiveThreadCountListTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentActiveThreadCountListTest.java @@ -19,8 +19,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.navercorp.pinpoint.thrift.dto.command.TCmdActiveThreadCountRes; import com.navercorp.pinpoint.thrift.dto.command.TRouteResult; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; @@ -55,8 +55,8 @@ public void testName() throws Exception { Map map = om.readValue(listAsString, Map.class); - Assert.assertTrue(map.containsKey(hostName1)); - Assert.assertTrue(map.containsKey(hostName2)); + Assertions.assertTrue(map.containsKey(hostName1)); + Assertions.assertTrue(map.containsKey(hostName2)); assertDataWithSerializedJsonString((Map) map.get(hostName1), TRouteResult.NOT_ACCEPTABLE, null); assertDataWithSerializedJsonString((Map) map.get(hostName2), TRouteResult.OK, Arrays.asList(1, 2, 3, 4)); @@ -64,15 +64,15 @@ public void testName() throws Exception { void assertDataWithSerializedJsonString(Map data, TRouteResult routeResult, List status) { if (routeResult == TRouteResult.OK) { - Assert.assertEquals(data.get("code"), 0); + Assertions.assertEquals(data.get("code"), 0); } else { - Assert.assertEquals(data.get("code"), -1); + Assertions.assertEquals(data.get("code"), -1); } - Assert.assertEquals(data.get("message"), routeResult.name()); + Assertions.assertEquals(data.get("message"), routeResult.name()); if (status != null) { - Assert.assertEquals(data.get("status"), status); + Assertions.assertEquals(data.get("status"), status); } } @@ -100,9 +100,9 @@ public void testOrderName() { final List sortedList = list.getAgentActiveThreadRepository(); - Assert.assertEquals(sortedList.get(0).getAgentId(), "hostName1"); - Assert.assertEquals(sortedList.get(1).getAgentId(), "hostName2"); - Assert.assertEquals(sortedList.get(2).getAgentId(), "hostName3"); + Assertions.assertEquals(sortedList.get(0).getAgentId(), "hostName1"); + Assertions.assertEquals(sortedList.get(1).getAgentId(), "hostName2"); + Assertions.assertEquals(sortedList.get(2).getAgentId(), "hostName3"); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentActiveThreadDumpListTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentActiveThreadDumpListTest.java index 90142c9fcca4..212253408928 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentActiveThreadDumpListTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentActiveThreadDumpListTest.java @@ -26,8 +26,8 @@ import com.navercorp.pinpoint.thrift.dto.command.TThreadDump; import com.navercorp.pinpoint.thrift.dto.command.TThreadLightDump; import com.navercorp.pinpoint.thrift.dto.command.TThreadState; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -52,7 +52,7 @@ public void basicFunctionTest1() { AgentActiveThreadDumpList activeThreadDumpList = createThreadDumpList(threads); - Assert.assertEquals(CREATE_DUMP_SIZE, activeThreadDumpList.getAgentActiveThreadDumpRepository().size()); + Assertions.assertEquals(CREATE_DUMP_SIZE, activeThreadDumpList.getAgentActiveThreadDumpRepository().size()); } finally { clearResource(waitingJobList); } @@ -72,7 +72,7 @@ public void basicFunctionTest2() { for (AgentActiveThreadDump dump : sortOldestAgentActiveThreadDumpRepository) { long startTime = dump.getStartTime(); if (before > startTime) { - Assert.fail(); + Assertions.fail(); } before = startTime; } @@ -81,19 +81,21 @@ public void basicFunctionTest2() { } } - @Test(expected = UnsupportedOperationException.class) + @Test public void checkUnmodifiableList() { - List waitingJobList = createWaitingJobList(CREATE_DUMP_SIZE); - try { - Thread[] threads = createThread(waitingJobList); + Assertions.assertThrows(UnsupportedOperationException.class, () -> { + List waitingJobList = createWaitingJobList(CREATE_DUMP_SIZE); + try { + Thread[] threads = createThread(waitingJobList); - AgentActiveThreadDumpList activeThreadDumpList = createThreadDumpList(threads); + AgentActiveThreadDumpList activeThreadDumpList = createThreadDumpList(threads); - List agentActiveThreadDumpRepository = activeThreadDumpList.getAgentActiveThreadDumpRepository(); - agentActiveThreadDumpRepository.remove(0); - } finally { - clearResource(waitingJobList); - } + List agentActiveThreadDumpRepository = activeThreadDumpList.getAgentActiveThreadDumpRepository(); + agentActiveThreadDumpRepository.remove(0); + } finally { + clearResource(waitingJobList); + } + }); } private List createWaitingJobList(int createActiveTraceRepositorySize) { @@ -127,7 +129,7 @@ private AgentActiveThreadDumpList createThreadDumpList(Thread[] threads) { TActiveThreadDump tActiveThreadDump = new TActiveThreadDump(); tActiveThreadDump.setStartTime(System.currentTimeMillis() - ThreadLocalRandom.current().nextLong(100000)); - final ThreadDumpMetricSnapshot threadDumpMetricSnapshot =ThreadDumpUtils.createThreadDump(thread); + final ThreadDumpMetricSnapshot threadDumpMetricSnapshot = ThreadDumpUtils.createThreadDump(thread); final TThreadDump threadDump = this.threadDumpThriftMessageConverter.toMessage(threadDumpMetricSnapshot); tActiveThreadDump.setThreadDump(threadDump); diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentDownloadInfoTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentDownloadInfoTest.java index 159bed10d305..dd9833a438ce 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentDownloadInfoTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentDownloadInfoTest.java @@ -24,8 +24,8 @@ import com.navercorp.pinpoint.web.dao.AgentDownloadInfoDaoFactory; import com.navercorp.pinpoint.web.dao.memory.MemoryAgentDownloadInfoDao; import com.navercorp.pinpoint.web.dao.rest.GithubAgentDownloadInfoDao; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.springframework.web.client.RestTemplate; import java.io.IOException; @@ -45,15 +45,15 @@ public void factoryTest() { String downloadUrl = "http://localhost:8080/pinpoint-agent-1.6.0.tar.gz"; AgentDownloadInfoDao agentDownloadInfoDao = AgentDownloadInfoDaoFactory.create(version, downloadUrl, restTemplate); - Assert.assertTrue(agentDownloadInfoDao instanceof MemoryAgentDownloadInfoDao); - Assert.assertEquals(version, agentDownloadInfoDao.getDownloadInfoList().get(0).getVersion()); - Assert.assertEquals(downloadUrl, agentDownloadInfoDao.getDownloadInfoList().get(0).getDownloadUrl()); + Assertions.assertTrue(agentDownloadInfoDao instanceof MemoryAgentDownloadInfoDao); + Assertions.assertEquals(version, agentDownloadInfoDao.getDownloadInfoList().get(0).getVersion()); + Assertions.assertEquals(downloadUrl, agentDownloadInfoDao.getDownloadInfoList().get(0).getDownloadUrl()); agentDownloadInfoDao = AgentDownloadInfoDaoFactory.create(version, "", restTemplate); - Assert.assertTrue(agentDownloadInfoDao instanceof GithubAgentDownloadInfoDao); + Assertions.assertTrue(agentDownloadInfoDao instanceof GithubAgentDownloadInfoDao); agentDownloadInfoDao = AgentDownloadInfoDaoFactory.create(" ", downloadUrl, restTemplate); - Assert.assertTrue(agentDownloadInfoDao instanceof GithubAgentDownloadInfoDao); + Assertions.assertTrue(agentDownloadInfoDao instanceof GithubAgentDownloadInfoDao); } @Test @@ -64,7 +64,7 @@ public void defaultTest() throws Exception { TypeReference> typeReference = new TypeReference>() {}; List agentDownloadInfoList = objectMapper.readValue(mockResponseString, typeReference); - Assert.assertEquals(15, agentDownloadInfoList.size()); + Assertions.assertEquals(15, agentDownloadInfoList.size()); } private String getMockJsonString() throws IOException { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentInfoFilterChainTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentInfoFilterChainTest.java index 076e4e65517f..cc28b7c704cc 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentInfoFilterChainTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentInfoFilterChainTest.java @@ -1,8 +1,8 @@ package com.navercorp.pinpoint.web.vo; import com.navercorp.pinpoint.common.server.util.AgentLifeCycleState; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class AgentInfoFilterChainTest { @@ -18,7 +18,7 @@ public void filter_from_accept() { AgentInfo info = new AgentInfo(); info.setStatus(status); - Assert.assertEquals(AgentInfoFilter.ACCEPT, chain.filter(info)); + Assertions.assertEquals(AgentInfoFilter.ACCEPT, chain.filter(info)); } @Test @@ -33,6 +33,6 @@ public void filter_from_reject() { AgentInfo info = new AgentInfo(); info.setStatus(status); - Assert.assertEquals(AgentInfoFilter.ACCEPT, chain.filter(info)); + Assertions.assertEquals(AgentInfoFilter.ACCEPT, chain.filter(info)); } } \ No newline at end of file diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentInstallationInfoTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentInstallationInfoTest.java index 83232f781574..8077636f18ba 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentInstallationInfoTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/AgentInstallationInfoTest.java @@ -17,8 +17,8 @@ package com.navercorp.pinpoint.web.vo; import com.fasterxml.jackson.databind.ObjectMapper; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Map; @@ -38,9 +38,9 @@ public void testName() throws Exception { System.out.println(map); - Assert.assertTrue(map.containsKey("version")); - Assert.assertTrue(map.containsKey("downloadUrl")); - Assert.assertTrue(map.containsKey("installationArgument")); + Assertions.assertTrue(map.containsKey("version")); + Assertions.assertTrue(map.containsKey("downloadUrl")); + Assertions.assertTrue(map.containsKey("installationArgument")); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/ApplicationAgentsListTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/ApplicationAgentsListTest.java index 8e6fdcca0a8d..6a767dd47843 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/ApplicationAgentsListTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/ApplicationAgentsListTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.web.vo; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; @@ -39,21 +39,21 @@ public void groupByApplicationName() { List applicationAgentLists = applicationAgentsList.getApplicationAgentLists(); - Assert.assertEquals(2, applicationAgentLists.size()); + Assertions.assertEquals(2, applicationAgentLists.size()); ApplicationAgentList app1AgentList = applicationAgentLists.get(0); - Assert.assertEquals("APP_1", app1AgentList.getGroupName()); + Assertions.assertEquals("APP_1", app1AgentList.getGroupName()); List app1AgentInfos = app1AgentList.getAgentInfos(); - Assert.assertEquals(2, app1AgentInfos.size()); - Assert.assertEquals(app1Agent1, app1AgentInfos.get(0)); - Assert.assertEquals(app1Agent2, app1AgentInfos.get(1)); + Assertions.assertEquals(2, app1AgentInfos.size()); + Assertions.assertEquals(app1Agent1, app1AgentInfos.get(0)); + Assertions.assertEquals(app1Agent2, app1AgentInfos.get(1)); ApplicationAgentList app2AgentList = applicationAgentLists.get(1); - Assert.assertEquals("APP_2", app2AgentList.getGroupName()); + Assertions.assertEquals("APP_2", app2AgentList.getGroupName()); List app2AgentInfos = app2AgentList.getAgentInfos(); - Assert.assertEquals(2, app2AgentInfos.size()); - Assert.assertEquals(app2Agent1, app2AgentInfos.get(0)); - Assert.assertEquals(app2Agent2, app2AgentInfos.get(1)); + Assertions.assertEquals(2, app2AgentInfos.size()); + Assertions.assertEquals(app2Agent1, app2AgentInfos.get(0)); + Assertions.assertEquals(app2Agent2, app2AgentInfos.get(1)); } @Test @@ -67,26 +67,26 @@ public void groupByHostNameShouldHaveContainersFirstAndGroupedSeparatelyByAgentS List applicationAgentLists = applicationAgentsList.getApplicationAgentLists(); - Assert.assertEquals(3, applicationAgentLists.size()); + Assertions.assertEquals(3, applicationAgentLists.size()); ApplicationAgentList containerAgentList = applicationAgentLists.get(0); - Assert.assertEquals(ApplicationAgentsList.HostNameContainerGroupingKey.CONTAINER, containerAgentList.getGroupName()); + Assertions.assertEquals(ApplicationAgentsList.HostNameContainerGroupingKey.CONTAINER, containerAgentList.getGroupName()); List containerAgents = containerAgentList.getAgentInfos(); - Assert.assertEquals(2, containerAgents.size()); - Assert.assertEquals(containerAgent2, containerAgents.get(0)); - Assert.assertEquals(containerAgent1, containerAgents.get(1)); + Assertions.assertEquals(2, containerAgents.size()); + Assertions.assertEquals(containerAgent2, containerAgents.get(0)); + Assertions.assertEquals(containerAgent1, containerAgents.get(1)); ApplicationAgentList host1AgentList = applicationAgentLists.get(1); - Assert.assertEquals("Host1", host1AgentList.getGroupName()); + Assertions.assertEquals("Host1", host1AgentList.getGroupName()); List host1Agents = host1AgentList.getAgentInfos(); - Assert.assertEquals(1, host1Agents.size()); - Assert.assertEquals(host1Agent1, host1Agents.get(0)); + Assertions.assertEquals(1, host1Agents.size()); + Assertions.assertEquals(host1Agent1, host1Agents.get(0)); ApplicationAgentList host2AgentList = applicationAgentLists.get(2); - Assert.assertEquals("Host2", host2AgentList.getGroupName()); + Assertions.assertEquals("Host2", host2AgentList.getGroupName()); List host2Agents = host2AgentList.getAgentInfos(); - Assert.assertEquals(1, host2Agents.size()); - Assert.assertEquals(host2Agent1, host2Agents.get(0)); + Assertions.assertEquals(1, host2Agents.size()); + Assertions.assertEquals(host2Agent1, host2Agents.get(0)); } @Test @@ -105,26 +105,26 @@ public void mergeLists() { applicationAgentsList.merge(applicationAgentsListToMerge); List applicationAgentLists = applicationAgentsList.getApplicationAgentLists(); - Assert.assertEquals(3, applicationAgentLists.size()); + Assertions.assertEquals(3, applicationAgentLists.size()); ApplicationAgentList containerAgentList = applicationAgentLists.get(0); - Assert.assertEquals(ApplicationAgentsList.HostNameContainerGroupingKey.CONTAINER, containerAgentList.getGroupName()); + Assertions.assertEquals(ApplicationAgentsList.HostNameContainerGroupingKey.CONTAINER, containerAgentList.getGroupName()); List containerAgents = containerAgentList.getAgentInfos(); - Assert.assertEquals(2, containerAgents.size()); - Assert.assertEquals(containerAgent2, containerAgents.get(0)); - Assert.assertEquals(containerAgent1, containerAgents.get(1)); + Assertions.assertEquals(2, containerAgents.size()); + Assertions.assertEquals(containerAgent2, containerAgents.get(0)); + Assertions.assertEquals(containerAgent1, containerAgents.get(1)); ApplicationAgentList host1AgentList = applicationAgentLists.get(1); - Assert.assertEquals("Host1", host1AgentList.getGroupName()); + Assertions.assertEquals("Host1", host1AgentList.getGroupName()); List host1Agents = host1AgentList.getAgentInfos(); - Assert.assertEquals(1, host1Agents.size()); - Assert.assertEquals(host1Agent1, host1Agents.get(0)); + Assertions.assertEquals(1, host1Agents.size()); + Assertions.assertEquals(host1Agent1, host1Agents.get(0)); ApplicationAgentList host2AgentList = applicationAgentLists.get(2); - Assert.assertEquals("Host2", host2AgentList.getGroupName()); + Assertions.assertEquals("Host2", host2AgentList.getGroupName()); List host2Agents = host2AgentList.getAgentInfos(); - Assert.assertEquals(1, host2Agents.size()); - Assert.assertEquals(host2Agent1, host2Agents.get(0)); + Assertions.assertEquals(1, host2Agents.size()); + Assertions.assertEquals(host2Agent1, host2Agents.get(0)); } @Test @@ -141,25 +141,25 @@ public void mergeListsGroupedDifferently() { groupedByHostnameList.merge(groupedByApplicationNameList); List applicationAgentLists = groupedByHostnameList.getApplicationAgentLists(); - Assert.assertEquals(3, applicationAgentLists.size()); + Assertions.assertEquals(3, applicationAgentLists.size()); ApplicationAgentList containerAgentList = applicationAgentLists.get(0); - Assert.assertEquals(ApplicationAgentsList.HostNameContainerGroupingKey.CONTAINER, containerAgentList.getGroupName()); + Assertions.assertEquals(ApplicationAgentsList.HostNameContainerGroupingKey.CONTAINER, containerAgentList.getGroupName()); List containerAgents = containerAgentList.getAgentInfos(); - Assert.assertEquals(1, containerAgents.size()); - Assert.assertEquals(agent3, containerAgents.get(0)); + Assertions.assertEquals(1, containerAgents.size()); + Assertions.assertEquals(agent3, containerAgents.get(0)); ApplicationAgentList host1AgentList = applicationAgentLists.get(1); - Assert.assertEquals("Host1", host1AgentList.getGroupName()); + Assertions.assertEquals("Host1", host1AgentList.getGroupName()); List host1Agents = host1AgentList.getAgentInfos(); - Assert.assertEquals(1, host1Agents.size()); - Assert.assertEquals(agent1, host1Agents.get(0)); + Assertions.assertEquals(1, host1Agents.size()); + Assertions.assertEquals(agent1, host1Agents.get(0)); ApplicationAgentList host2AgentList = applicationAgentLists.get(2); - Assert.assertEquals("Host2", host2AgentList.getGroupName()); + Assertions.assertEquals("Host2", host2AgentList.getGroupName()); List host2Agents = host2AgentList.getAgentInfos(); - Assert.assertEquals(1, host2Agents.size()); - Assert.assertEquals(agent2, host2Agents.get(0)); + Assertions.assertEquals(1, host2Agents.size()); + Assertions.assertEquals(agent2, host2Agents.get(0)); } private static List shuffleAgentInfos(AgentInfo... agentInfos) { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/ApplicationTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/ApplicationTest.java index 9f26a617dbc4..2238ac136b9b 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/ApplicationTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/ApplicationTest.java @@ -16,10 +16,9 @@ package com.navercorp.pinpoint.web.vo; -import org.junit.Assert; -import org.junit.Test; - import com.navercorp.pinpoint.common.trace.ServiceType; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; /** * @author emeroad @@ -31,8 +30,8 @@ public void testEquals() throws Exception { Application two = new Application("test", ServiceType.STAND_ALONE); Application three = new Application("other", ServiceType.INTERNAL_METHOD); - Assert.assertEquals(one, two); + Assertions.assertEquals(one, two); - Assert.assertNotEquals(one, three); + Assertions.assertNotEquals(one, three); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/CodeResultTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/CodeResultTest.java index 1bc0b64a84fc..5f00715ed210 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/CodeResultTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/CodeResultTest.java @@ -4,10 +4,10 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.navercorp.pinpoint.web.response.CodeResult; -import org.junit.Assert; -import org.junit.Test; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class CodeResultTest { @@ -22,7 +22,7 @@ public void getMessage_NON_NULL() throws JsonProcessingException { String jsonString = mapper.writeValueAsString(result); JsonNode jsonNode = mapper.readTree(jsonString); - Assert.assertNotNull(jsonNode.get("code")); - Assert.assertNull(jsonNode.get("result")); + Assertions.assertNotNull(jsonNode.get("code")); + Assertions.assertNull(jsonNode.get("result")); } } \ No newline at end of file diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/ResponseHistogramsTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/ResponseHistogramsTest.java index fe2a4d9473e7..439e80661ce4 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/ResponseHistogramsTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/ResponseHistogramsTest.java @@ -18,12 +18,12 @@ import com.navercorp.pinpoint.common.server.bo.SpanBo; import com.navercorp.pinpoint.common.server.util.time.Range; -import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; import com.navercorp.pinpoint.common.trace.ServiceType; +import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; import com.navercorp.pinpoint.web.TestTraceUtils; import com.navercorp.pinpoint.web.applicationmap.histogram.Histogram; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Iterator; import java.util.List; @@ -50,7 +50,7 @@ public void empty() { List responseTimeList = responseHistograms.getResponseTimeList(application); // Then - Assert.assertTrue(responseTimeList.isEmpty()); + Assertions.assertTrue(responseTimeList.isEmpty()); } @Test @@ -74,8 +74,8 @@ public void nonExistentApplication() { List responseTimeList = responseHistograms.getResponseTimeList(nonExistentApplication); // Then - Assert.assertFalse(properResponseTimeList.isEmpty()); - Assert.assertTrue(responseTimeList.isEmpty()); + Assertions.assertFalse(properResponseTimeList.isEmpty()); + Assertions.assertTrue(responseTimeList.isEmpty()); } @Test @@ -111,30 +111,30 @@ public void timeslots() { // Then List responseTimeList = responseHistograms.getResponseTimeList(application); - Assert.assertNotNull(responseTimeList); - Assert.assertEquals(3, responseTimeList.size()); + Assertions.assertNotNull(responseTimeList); + Assertions.assertEquals(3, responseTimeList.size()); for (ResponseTime responseTime : responseTimeList) { Histogram applicationResponseHistogram = responseTime.getApplicationResponseHistogram(); long timeslotTimestamp = responseTime.getTimeStamp(); if (timeslotTimestamp == timeslot1) { - Assert.assertEquals(1, applicationResponseHistogram.getFastCount()); - Assert.assertEquals(1, applicationResponseHistogram.getNormalCount()); - Assert.assertEquals(2, applicationResponseHistogram.getSuccessCount()); - Assert.assertEquals(0, applicationResponseHistogram.getTotalErrorCount()); - Assert.assertEquals(2, applicationResponseHistogram.getTotalCount()); + Assertions.assertEquals(1, applicationResponseHistogram.getFastCount()); + Assertions.assertEquals(1, applicationResponseHistogram.getNormalCount()); + Assertions.assertEquals(2, applicationResponseHistogram.getSuccessCount()); + Assertions.assertEquals(0, applicationResponseHistogram.getTotalErrorCount()); + Assertions.assertEquals(2, applicationResponseHistogram.getTotalCount()); } else if (timeslotTimestamp == timeslot2) { - Assert.assertEquals(1, applicationResponseHistogram.getSlowCount()); - Assert.assertEquals(1, applicationResponseHistogram.getVerySlowCount()); - Assert.assertEquals(2, applicationResponseHistogram.getSuccessCount()); - Assert.assertEquals(0, applicationResponseHistogram.getTotalErrorCount()); - Assert.assertEquals(2, applicationResponseHistogram.getTotalCount()); + Assertions.assertEquals(1, applicationResponseHistogram.getSlowCount()); + Assertions.assertEquals(1, applicationResponseHistogram.getVerySlowCount()); + Assertions.assertEquals(2, applicationResponseHistogram.getSuccessCount()); + Assertions.assertEquals(0, applicationResponseHistogram.getTotalErrorCount()); + Assertions.assertEquals(2, applicationResponseHistogram.getTotalCount()); } else if (timeslotTimestamp == timeslot3) { - Assert.assertEquals(1, applicationResponseHistogram.getFastErrorCount()); - Assert.assertEquals(1, applicationResponseHistogram.getTotalErrorCount()); - Assert.assertEquals(0, applicationResponseHistogram.getSuccessCount()); - Assert.assertEquals(1, applicationResponseHistogram.getTotalCount()); + Assertions.assertEquals(1, applicationResponseHistogram.getFastErrorCount()); + Assertions.assertEquals(1, applicationResponseHistogram.getTotalErrorCount()); + Assertions.assertEquals(0, applicationResponseHistogram.getSuccessCount()); + Assertions.assertEquals(1, applicationResponseHistogram.getTotalCount()); } else { - Assert.fail("unexpected responseTime in timeslot : " + timeslotTimestamp); + Assertions.fail("unexpected responseTime in timeslot : " + timeslotTimestamp); } } } @@ -172,21 +172,21 @@ public void multipleAgents() { // Then List responseTimeList = responseHistograms.getResponseTimeList(application); - Assert.assertNotNull(responseTimeList); - Assert.assertEquals(1, responseTimeList.size()); + Assertions.assertNotNull(responseTimeList); + Assertions.assertEquals(1, responseTimeList.size()); ResponseTime responseTime = responseTimeList.get(0); - Assert.assertEquals(5, responseTime.getAgentResponseHistogramList().size()); + Assertions.assertEquals(5, responseTime.getAgentResponseHistogramList().size()); Histogram fastAgentHistogram = responseTime.findHistogram(fastAgentId); - Assert.assertEquals(1, fastAgentHistogram.getFastCount()); + Assertions.assertEquals(1, fastAgentHistogram.getFastCount()); Histogram normalAgentHistogram = responseTime.findHistogram(normalAgentId); - Assert.assertEquals(1, normalAgentHistogram.getNormalCount()); + Assertions.assertEquals(1, normalAgentHistogram.getNormalCount()); Histogram slowAgentHistogram = responseTime.findHistogram(slowAgentId); - Assert.assertEquals(1, slowAgentHistogram.getSlowCount()); + Assertions.assertEquals(1, slowAgentHistogram.getSlowCount()); Histogram verySlowAgentHistogram = responseTime.findHistogram(verySlowAgentId); - Assert.assertEquals(1, verySlowAgentHistogram.getVerySlowCount()); + Assertions.assertEquals(1, verySlowAgentHistogram.getVerySlowCount()); Histogram errorAgentHistogram = responseTime.findHistogram(errorAgentId); - Assert.assertEquals(1, errorAgentHistogram.getFastErrorCount()); + Assertions.assertEquals(1, errorAgentHistogram.getFastErrorCount()); } @Test @@ -221,17 +221,17 @@ public void multipleApplications() { // Then List appAResponseTimeList = responseHistograms.getResponseTimeList(appA); - Assert.assertEquals(1, appAResponseTimeList.size()); + Assertions.assertEquals(1, appAResponseTimeList.size()); ResponseTime appAResponseTime = appAResponseTimeList.get(0); Histogram appAAgentHistogram = appAResponseTime.findHistogram(appAAgentId); - Assert.assertEquals(2, appAAgentHistogram.getFastCount()); - Assert.assertEquals(2, appAAgentHistogram.getTotalCount()); + Assertions.assertEquals(2, appAAgentHistogram.getFastCount()); + Assertions.assertEquals(2, appAAgentHistogram.getTotalCount()); List appBResponseTimeList = responseHistograms.getResponseTimeList(appB); - Assert.assertEquals(1, appBResponseTimeList.size()); + Assertions.assertEquals(1, appBResponseTimeList.size()); ResponseTime appBResponseTime = appBResponseTimeList.get(0); Histogram appBAgentHistogram = appBResponseTime.findHistogram(appBAgentId); - Assert.assertEquals(3, appBAgentHistogram.getNormalCount()); - Assert.assertEquals(3, appBAgentHistogram.getTotalCount()); + Assertions.assertEquals(3, appBAgentHistogram.getNormalCount()); + Assertions.assertEquals(3, appBAgentHistogram.getTotalCount()); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/UserTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/UserTest.java index 6aa54c00a5a7..53b904b6937d 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/UserTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/UserTest.java @@ -16,12 +16,12 @@ package com.navercorp.pinpoint.web.vo; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/callstacks/RecordFactoryTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/callstacks/RecordFactoryTest.java index e288b11154d6..d0a81811d3e7 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/callstacks/RecordFactoryTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/callstacks/RecordFactoryTest.java @@ -16,27 +16,26 @@ package com.navercorp.pinpoint.web.vo.callstacks; +import com.navercorp.pinpoint.common.profiler.util.TransactionId; import com.navercorp.pinpoint.common.server.bo.SpanBo; import com.navercorp.pinpoint.common.server.trace.ApiParserProvider; import com.navercorp.pinpoint.loader.service.AnnotationKeyRegistryService; import com.navercorp.pinpoint.loader.service.ServiceTypeRegistryService; -import com.navercorp.pinpoint.common.profiler.util.TransactionId; import com.navercorp.pinpoint.web.calltree.span.Align; import com.navercorp.pinpoint.web.calltree.span.SpanAlign; import com.navercorp.pinpoint.web.service.AnnotationKeyMatcherService; import com.navercorp.pinpoint.web.service.ProxyRequestTypeRegistryService; - import com.navercorp.pinpoint.web.service.RecorderFactoryProvider; -import org.junit.Assert; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.junit.jupiter.MockitoExtension; /** * @author Woonduk Kang(emeroad) */ -@RunWith(MockitoJUnitRunner.class) +@ExtendWith(MockitoExtension.class) public class RecordFactoryTest { @Mock @@ -76,11 +75,10 @@ public void getException_check_argument() { Record exceptionRecord = factory.getException(0, 0, align); - Assert.assertNotNull(exceptionRecord.getArguments()); + Assertions.assertNotNull(exceptionRecord.getArguments()); } - @Test public void getParameter_check_argument() { @@ -88,7 +86,7 @@ public void getParameter_check_argument() { Record exceptionRecord = factory.getParameter(0, 0, "testMethod", null); - Assert.assertEquals(exceptionRecord.getArguments(), "null"); + Assertions.assertEquals(exceptionRecord.getArguments(), "null"); } } \ No newline at end of file diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/chart/TimeSeriesChartBuilderTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/chart/TimeSeriesChartBuilderTest.java index 77be58b3249f..ba44b11b5956 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/chart/TimeSeriesChartBuilderTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/chart/TimeSeriesChartBuilderTest.java @@ -16,11 +16,11 @@ package com.navercorp.pinpoint.web.vo.chart; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.util.TimeWindow; import com.navercorp.pinpoint.web.util.TimeWindowSampler; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Collections; @@ -78,7 +78,7 @@ public void empty() { Chart chart = builder.build(timeWindow, points); // Then List sampledPoints = chart.getPoints(); - Assert.assertTrue(sampledPoints.isEmpty()); + Assertions.assertTrue(sampledPoints.isEmpty()); } @Test @@ -96,7 +96,7 @@ public void sampled() { // Then List sampledPoints = chart.getPoints(); for (int i = 0; i < sampledPoints.size(); i++) { - Assert.assertEquals(i, sampledPoints.get(i).getYVal()); + Assertions.assertEquals(i, sampledPoints.get(i).getYVal()); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DataSourceChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DataSourceChartGroupTest.java index 2d2453c9972f..9980465b50e6 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DataSourceChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DataSourceChartGroupTest.java @@ -28,9 +28,9 @@ import com.navercorp.pinpoint.web.vo.chart.Point; import com.navercorp.pinpoint.web.vo.stat.SampledDataSource; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; @@ -55,7 +55,7 @@ public class DataSourceChartGroupTest { @Mock private ServiceTypeRegistryService serviceTypeRegistryService; - @Before + @BeforeEach public void setUp() throws Exception { MockitoAnnotations.initMocks(this); when(serviceTypeRegistryService.findServiceType(any(Short.class))).thenReturn(ServiceType.UNKNOWN); @@ -80,16 +80,16 @@ public void basicFunctionTest2() { List sampledDataSourceList = List.of(); DataSourceChart dataSourceChartGroup = new DataSourceChart(timeWindow, sampledDataSourceList, serviceTypeRegistryService); - Assert.assertEquals(-1, dataSourceChartGroup.getId()); - Assert.assertNull(dataSourceChartGroup.getJdbcUrl()); - Assert.assertNull(dataSourceChartGroup.getDatabaseName()); - Assert.assertNull(dataSourceChartGroup.getServiceType()); + Assertions.assertEquals(-1, dataSourceChartGroup.getId()); + Assertions.assertNull(dataSourceChartGroup.getJdbcUrl()); + Assertions.assertNull(dataSourceChartGroup.getDatabaseName()); + Assertions.assertNull(dataSourceChartGroup.getServiceType()); Map>> charts = dataSourceChartGroup.getCharts().getCharts(); - Assert.assertEquals(2, charts.size()); + Assertions.assertEquals(2, charts.size()); for (Chart chart : charts.values()) { - Assert.assertTrue(CollectionUtils.isEmpty(chart.getPoints())); + Assertions.assertTrue(CollectionUtils.isEmpty(chart.getPoints())); } } @@ -124,7 +124,7 @@ private void assertEquals(List sampledDataSourceList, StatCha SampledDataSource sampledDataSource = sampledDataSourceList.get(i); Point point = sampledDataSource.getActiveConnectionSize(); - Assert.assertEquals(activeConnectionSizeChartPointList.get(i), point); + Assertions.assertEquals(activeConnectionSizeChartPointList.get(i), point); } Chart> maxConnectionSizeChart = charts.get(DataSourceChart.DataSourceChartType.MAX_CONNECTION_SIZE); @@ -133,7 +133,7 @@ private void assertEquals(List sampledDataSourceList, StatCha SampledDataSource sampledDataSource = sampledDataSourceList.get(i); AgentStatPoint point = sampledDataSource.getMaxConnectionSize(); - Assert.assertEquals(maxConnectionSizeChartPointList.get(i), point); + Assertions.assertEquals(maxConnectionSizeChartPointList.get(i), point); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DeadlockChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DeadlockChartGroupTest.java index 21d78c88b249..199c9b8a412b 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DeadlockChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/DeadlockChartGroupTest.java @@ -25,8 +25,8 @@ import com.navercorp.pinpoint.web.vo.stat.chart.StatChart; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; import org.apache.commons.lang3.RandomUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -91,7 +91,7 @@ private void assertEquals(List sampledDeadlockList, StatChartGr SampledDeadlock sampledDeadlock = sampledDeadlockList.get(i); AgentStatPoint point = sampledDeadlock.getDeadlockedThreadCount(); - Assert.assertEquals(deadlockCountChartPointList.get(i), point); + Assertions.assertEquals(deadlockCountChartPointList.get(i), point); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/ResponseTimeChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/ResponseTimeChartGroupTest.java index ccb2b9008aeb..523fd1824f2e 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/ResponseTimeChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/agent/ResponseTimeChartGroupTest.java @@ -25,8 +25,8 @@ import com.navercorp.pinpoint.web.vo.stat.SampledResponseTime; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; import org.apache.commons.lang3.RandomUtils; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; @@ -96,7 +96,7 @@ private void assertEquals(List sampledResponseTimeList, Sta SampledResponseTime sampledResponseTime = sampledResponseTimeList.get(i); Point point = sampledResponseTime.getAvg(); - Assert.assertEquals(avgChartPointList.get(i), point); + Assertions.assertEquals(avgChartPointList.get(i), point); } Chart> maxChart = charts.get(ResponseTimeChart.ResponseTimeChartType.MAX); @@ -105,7 +105,7 @@ private void assertEquals(List sampledResponseTimeList, Sta SampledResponseTime sampledResponseTime = sampledResponseTimeList.get(i); AgentStatPoint point = sampledResponseTime.getMax(); - Assert.assertEquals(maxChartPointList.get(i), point); + Assertions.assertEquals(maxChartPointList.get(i), point); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationActiveTraceChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationActiveTraceChartGroupTest.java index 3488e247b5c5..e49f1f76711c 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationActiveTraceChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationActiveTraceChartGroupTest.java @@ -23,13 +23,13 @@ import com.navercorp.pinpoint.web.vo.stat.AggreJoinActiveTraceBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationCpuLoadChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationCpuLoadChartGroupTest.java index 6c544d39feb5..5f89aeeca078 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationCpuLoadChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationCpuLoadChartGroupTest.java @@ -23,13 +23,13 @@ import com.navercorp.pinpoint.web.vo.stat.AggreJoinCpuLoadBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDataSourceChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDataSourceChartGroupTest.java index 32de4d545cdb..2941d05aa6b1 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDataSourceChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDataSourceChartGroupTest.java @@ -22,13 +22,13 @@ import com.navercorp.pinpoint.web.vo.chart.Chart; import com.navercorp.pinpoint.web.vo.stat.AggreJoinDataSourceBo; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDirectBufferChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDirectBufferChartGroupTest.java index 8aa8541c9ee2..76ec6d4ead61 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDirectBufferChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationDirectBufferChartGroupTest.java @@ -23,13 +23,13 @@ import com.navercorp.pinpoint.web.vo.stat.AggreJoinDirectBufferBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Roy Kim diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationFileDescriptorChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationFileDescriptorChartGroupTest.java index 86a3b5912233..ea123fd5663c 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationFileDescriptorChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationFileDescriptorChartGroupTest.java @@ -23,13 +23,13 @@ import com.navercorp.pinpoint.web.vo.stat.AggreJoinFileDescriptorBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Roy Kim diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationLoadedClassChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationLoadedClassChartGroupTest.java index e8580f39d948..d5165b7a6e6e 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationLoadedClassChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationLoadedClassChartGroupTest.java @@ -23,13 +23,13 @@ import com.navercorp.pinpoint.web.vo.stat.AggreJoinLoadedClassBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ApplicationLoadedClassChartGroupTest { @Test diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationMemoryChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationMemoryChartGroupTest.java index db4141b0d9c8..426f62d67850 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationMemoryChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationMemoryChartGroupTest.java @@ -23,13 +23,13 @@ import com.navercorp.pinpoint.web.vo.stat.AggreJoinMemoryBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationResponseTimeChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationResponseTimeChartGroupTest.java index f472359bbddf..83a3b94730c9 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationResponseTimeChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationResponseTimeChartGroupTest.java @@ -23,13 +23,13 @@ import com.navercorp.pinpoint.web.vo.stat.AggreJoinResponseTimeBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTotalThreadCountChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTotalThreadCountChartGroupTest.java index 4163a03aa8f8..6543fbf9264a 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTotalThreadCountChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTotalThreadCountChartGroupTest.java @@ -23,13 +23,13 @@ import com.navercorp.pinpoint.web.vo.stat.AggreJoinTotalThreadCountBo; import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class ApplicationTotalThreadCountChartGroupTest { @Test diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTransactionChartGroupTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTransactionChartGroupTest.java index 4f8d1d00335b..3b20f3dcd040 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTransactionChartGroupTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/stat/chart/application/ApplicationTransactionChartGroupTest.java @@ -24,13 +24,13 @@ import com.navercorp.pinpoint.web.vo.stat.chart.ChartGroupBuilder; import com.navercorp.pinpoint.web.vo.stat.chart.StatChartGroup; import org.apache.commons.math3.util.Precision; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author minwoo.jung diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/timeline/inspector/AgentEventTimelineTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/timeline/inspector/AgentEventTimelineTest.java index d1f2144e38f2..acaa3c48306f 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/timeline/inspector/AgentEventTimelineTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/timeline/inspector/AgentEventTimelineTest.java @@ -18,11 +18,11 @@ import com.navercorp.pinpoint.common.server.bo.event.AgentEventBo; import com.navercorp.pinpoint.common.server.util.AgentEventType; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.filter.agent.AgentEventFilter; import com.navercorp.pinpoint.web.vo.AgentEvent; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; @@ -52,7 +52,7 @@ public void noFilter() { .from(agentEvents) .build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); } @Test @@ -70,7 +70,7 @@ public void nullFilter() { .addFilter(null) .build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); } @Test @@ -109,13 +109,13 @@ public void multipleFilters() { AgentEventMarker marker = segment.getValue(); allEventsTotalCount += marker.getTotalCount(); Map eventTypeCountMap = marker.getTypeCounts(); - Assert.assertTrue(includedAgentEventTypes.containsAll(eventTypeCountMap.keySet())); - Assert.assertFalse(eventTypeCountMap.containsKey(AgentEventType.AGENT_UNEXPECTED_SHUTDOWN)); - Assert.assertFalse(eventTypeCountMap.containsKey(AgentEventType.AGENT_UNEXPECTED_CLOSE_BY_SERVER)); - Assert.assertFalse(eventTypeCountMap.containsKey(AgentEventType.USER_THREAD_DUMP)); - Assert.assertFalse(eventTypeCountMap.containsKey(AgentEventType.OTHER)); + Assertions.assertTrue(includedAgentEventTypes.containsAll(eventTypeCountMap.keySet())); + Assertions.assertFalse(eventTypeCountMap.containsKey(AgentEventType.AGENT_UNEXPECTED_SHUTDOWN)); + Assertions.assertFalse(eventTypeCountMap.containsKey(AgentEventType.AGENT_UNEXPECTED_CLOSE_BY_SERVER)); + Assertions.assertFalse(eventTypeCountMap.containsKey(AgentEventType.USER_THREAD_DUMP)); + Assertions.assertFalse(eventTypeCountMap.containsKey(AgentEventType.OTHER)); } - Assert.assertEquals(allEventsTotalCount, includedAgentEventTypes.size()); + Assertions.assertEquals(allEventsTotalCount, includedAgentEventTypes.size()); } @Test @@ -137,7 +137,7 @@ public void leftBiasedSpread() { .from(Arrays.asList(event1, event2, event3, event4, event5, event6)) .build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); } @Test @@ -159,7 +159,7 @@ public void rightBiasedSpread() { .from(Arrays.asList(event1, event2, event3, event4, event5, event6)) .build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); } @Test @@ -192,7 +192,7 @@ public void rangeLessThanNumTimeslots() { .from(Arrays.asList(event1, event2, event3, event4, event5, event6, event7, event8, event9, event10)) .build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); } @Test @@ -205,7 +205,7 @@ public void fullTimeslots_multipleEvents() { int numTimeslots = 100; int expectedEventCountPerSegment = 20; List agentEvents = new ArrayList<>(); - for (int i = 0 ; i < timeRangeMs; i += (timeRangeMs / (numTimeslots * expectedEventCountPerSegment))) { + for (int i = 0; i < timeRangeMs; i += (timeRangeMs / (numTimeslots * expectedEventCountPerSegment))) { agentEvents.add(createAgentEvent(from + i, AgentEventType.AGENT_PING)); } // When @@ -214,12 +214,12 @@ public void fullTimeslots_multipleEvents() { .build(); // Then List timelineSegments = timeline.getTimelineSegments(); - Assert.assertEquals(numTimeslots, timelineSegments.size()); + Assertions.assertEquals(numTimeslots, timelineSegments.size()); for (AgentEventTimelineSegment timelineSegment : timelineSegments) { AgentEventMarker eventMarker = timelineSegment.getValue(); - Assert.assertEquals(expectedEventCountPerSegment, eventMarker.getTotalCount()); + Assertions.assertEquals(expectedEventCountPerSegment, eventMarker.getTotalCount()); int pingEventCount = eventMarker.getTypeCounts().get(AgentEventType.AGENT_PING); - Assert.assertEquals(expectedEventCountPerSegment, pingEventCount); + Assertions.assertEquals(expectedEventCountPerSegment, pingEventCount); } } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/timeline/inspector/AgentStatusTimelineBuilderTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/timeline/inspector/AgentStatusTimelineBuilderTest.java index 10bf31c48518..e4cb60c5ab2a 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/timeline/inspector/AgentStatusTimelineBuilderTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/timeline/inspector/AgentStatusTimelineBuilderTest.java @@ -19,11 +19,11 @@ import com.navercorp.pinpoint.common.server.bo.event.AgentEventBo; import com.navercorp.pinpoint.common.server.util.AgentEventType; import com.navercorp.pinpoint.common.server.util.AgentLifeCycleState; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.vo.AgentEvent; import com.navercorp.pinpoint.web.vo.AgentStatus; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; @@ -39,6 +39,7 @@ public class AgentStatusTimelineBuilderTest { private static final long DIFF = TO - FROM; private static final AgentStatus DEFAULT_STATUS; + static { DEFAULT_STATUS = createAgentStatus(0, AgentLifeCycleState.RUNNING); } @@ -57,7 +58,7 @@ public void defaultTest1() { // Then List actualTimelineSegmentList = timeline.getTimelineSegments(); - Assert.assertEquals(3, actualTimelineSegmentList.size()); + Assertions.assertEquals(3, actualTimelineSegmentList.size()); AgentStatusTimelineSegment first = actualTimelineSegmentList.get(0); assertTimelineSegment(first, FROM, startTime, AgentState.RUNNING); @@ -87,7 +88,7 @@ public void defaultTest2() { // Then List actualTimelineSegmentList = timeline.getTimelineSegments(); - Assert.assertEquals(5, actualTimelineSegmentList.size()); + Assertions.assertEquals(5, actualTimelineSegmentList.size()); AgentStatusTimelineSegment first = actualTimelineSegmentList.get(0); assertTimelineSegment(first, FROM, firstStartTime, AgentState.RUNNING); @@ -118,7 +119,7 @@ public void boundaryValueTest1() { // Then List actualTimelineSegmentList = timeline.getTimelineSegments(); - Assert.assertEquals(2, actualTimelineSegmentList.size()); + Assertions.assertEquals(2, actualTimelineSegmentList.size()); AgentStatusTimelineSegment unstableTimelineSegment = actualTimelineSegmentList.get(0); assertTimelineSegment(unstableTimelineSegment, FROM, endTime, AgentState.UNSTABLE_RUNNING); @@ -140,7 +141,7 @@ public void boundaryValueTest2() { // Then List actualTimelineSegmentList = timeline.getTimelineSegments(); - Assert.assertEquals(2, actualTimelineSegmentList.size()); + Assertions.assertEquals(2, actualTimelineSegmentList.size()); AgentStatusTimelineSegment first = actualTimelineSegmentList.get(0); assertTimelineSegment(first, FROM, startTime, AgentState.RUNNING); @@ -163,7 +164,7 @@ public void overBoundaryValueTest1() { // Then List actualTimelineSegmentList = timeline.getTimelineSegments(); - Assert.assertEquals(1, actualTimelineSegmentList.size()); + Assertions.assertEquals(1, actualTimelineSegmentList.size()); AgentStatusTimelineSegment timelineSegment1 = actualTimelineSegmentList.get(0); assertTimelineSegment(timelineSegment1, FROM, TO, AgentState.RUNNING); @@ -182,16 +183,16 @@ public void overBoundaryValueTest2() { // Then List actualTimelineSegmentList = timeline.getTimelineSegments(); - Assert.assertEquals(1, actualTimelineSegmentList.size()); + Assertions.assertEquals(1, actualTimelineSegmentList.size()); AgentStatusTimelineSegment timelineSegment1 = actualTimelineSegmentList.get(0); assertTimelineSegment(timelineSegment1, FROM, TO, AgentState.RUNNING); } private void assertTimelineSegment(AgentStatusTimelineSegment timelineSegment, long startTime, long endTime, AgentState state) { - Assert.assertEquals(startTime, timelineSegment.getStartTimestamp()); - Assert.assertEquals(endTime, timelineSegment.getEndTimestamp()); - Assert.assertEquals(state, timelineSegment.getValue()); + Assertions.assertEquals(startTime, timelineSegment.getStartTimestamp()); + Assertions.assertEquals(endTime, timelineSegment.getEndTimestamp()); + Assertions.assertEquals(state, timelineSegment.getValue()); } private AgentStatusTimelineSegment createTimelineSegment(long startTimestamp, long endTimestamp) { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/timeline/inspector/AgentStatusTimelineTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/timeline/inspector/AgentStatusTimelineTest.java index 18e6494dd644..40e715d953de 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/timeline/inspector/AgentStatusTimelineTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/vo/timeline/inspector/AgentStatusTimelineTest.java @@ -19,11 +19,11 @@ import com.navercorp.pinpoint.common.server.bo.event.AgentEventBo; import com.navercorp.pinpoint.common.server.util.AgentEventType; import com.navercorp.pinpoint.common.server.util.AgentLifeCycleState; +import com.navercorp.pinpoint.common.server.util.time.Range; import com.navercorp.pinpoint.web.vo.AgentEvent; import com.navercorp.pinpoint.web.vo.AgentStatus; -import com.navercorp.pinpoint.common.server.util.time.Range; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; @@ -43,8 +43,8 @@ public void nullAgentStatus() { // When AgentStatusTimeline timeline = new AgentStatusTimelineBuilder(timelineRange, null).build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); - Assert.assertFalse(timeline.isIncludeWarning()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertFalse(timeline.isIncludeWarning()); } @Test @@ -56,8 +56,8 @@ public void nullAgentStatus_nullAgentEvents() { // When AgentStatusTimeline timeline = new AgentStatusTimelineBuilder(timelineRange, null).build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); - Assert.assertFalse(timeline.isIncludeWarning()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertFalse(timeline.isIncludeWarning()); } @Test @@ -71,8 +71,8 @@ public void agentStatus() { AgentStatus initialStatus = createAgentStatus(50, expectedState); AgentStatusTimeline timeline = new AgentStatusTimelineBuilder(timelineRange, initialStatus).build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); - Assert.assertFalse(timeline.isIncludeWarning()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertFalse(timeline.isIncludeWarning()); } @Test @@ -86,8 +86,8 @@ public void agentStatus_nullAgentEvents() { AgentStatus initialStatus = createAgentStatus(50, expectedState); AgentStatusTimeline timeline = new AgentStatusTimelineBuilder(timelineRange, initialStatus, null).build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); - Assert.assertFalse(timeline.isIncludeWarning()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertFalse(timeline.isIncludeWarning()); } @Test @@ -105,8 +105,8 @@ public void singleLifeCycle_startedBeforeTimelineStartTimestamp() { createAgentEvent(agentA, 190, AgentEventType.AGENT_PING) )).build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); - Assert.assertFalse(timeline.isIncludeWarning()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertFalse(timeline.isIncludeWarning()); } @Test @@ -125,8 +125,8 @@ public void singleLifeCycle_startedAfterTimelineStartTimestamp_initialStateRunni createAgentEvent(agentA, 180, AgentEventType.AGENT_PING) )).build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); - Assert.assertTrue(timeline.isIncludeWarning()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertTrue(timeline.isIncludeWarning()); } @Test @@ -145,8 +145,8 @@ public void singleLifeCycle_startedAfterTimelineStartTimestamp_initialStateShutd createAgentEvent(agentA, 180, AgentEventType.AGENT_PING) )).build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); - Assert.assertFalse(timeline.isIncludeWarning()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertFalse(timeline.isIncludeWarning()); } @Test @@ -166,8 +166,8 @@ public void singleLifeCycle_endedBeforeTimelineEndTimestamp() { createAgentEvent(agentA, 180, AgentEventType.AGENT_SHUTDOWN) )).build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); - Assert.assertFalse(timeline.isIncludeWarning()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertFalse(timeline.isIncludeWarning()); } @Test @@ -186,8 +186,8 @@ public void singleLifeCycle_disconnected() { createAgentEvent(agentA, 180, AgentEventType.AGENT_PING) )).build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); - Assert.assertFalse(timeline.isIncludeWarning()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertFalse(timeline.isIncludeWarning()); } @Test @@ -209,8 +209,8 @@ public void multipleLifeCycles_disconnected() { createAgentEvent(agentB, 180, AgentEventType.AGENT_PING) )).build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); - Assert.assertFalse(timeline.isIncludeWarning()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertFalse(timeline.isIncludeWarning()); } @Test @@ -232,8 +232,8 @@ public void multipleLifeCycles_noOverlap() { createAgentEvent(agentB, 180, AgentEventType.AGENT_PING) )).build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); - Assert.assertFalse(timeline.isIncludeWarning()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertFalse(timeline.isIncludeWarning()); } @Test @@ -255,8 +255,8 @@ public void multipleLifeCycles_noOverlap2() { createAgentEvent(agentB, 180, AgentEventType.AGENT_PING) )).build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); - Assert.assertFalse(timeline.isIncludeWarning()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertFalse(timeline.isIncludeWarning()); } @Test @@ -281,8 +281,8 @@ public void multipleLifeCycles_noOverlap3() { createAgentEvent(agentB, 180, AgentEventType.AGENT_SHUTDOWN) )).build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); - Assert.assertFalse(timeline.isIncludeWarning()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertFalse(timeline.isIncludeWarning()); } @Test @@ -304,8 +304,8 @@ public void multipleLifeCycles_overlap() { createAgentEvent(agentA, 180, AgentEventType.AGENT_SHUTDOWN) )).build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); - Assert.assertTrue(timeline.isIncludeWarning()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertTrue(timeline.isIncludeWarning()); } @Test @@ -325,8 +325,8 @@ public void multipleLifeCycles_overlap2() { createAgentEvent(agentB, 180, AgentEventType.AGENT_PING) )).build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); - Assert.assertTrue(timeline.isIncludeWarning()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertTrue(timeline.isIncludeWarning()); } @Test @@ -351,8 +351,8 @@ public void multipleLifeCycles_overlap3() { createAgentEvent(agentC, 190, AgentEventType.AGENT_SHUTDOWN) )).build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); - Assert.assertTrue(timeline.isIncludeWarning()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertTrue(timeline.isIncludeWarning()); } @Test @@ -378,8 +378,8 @@ public void multipleLifeCycles_overlap4() { createAgentEvent(agentC, 190, AgentEventType.AGENT_SHUTDOWN) )).build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); - Assert.assertTrue(timeline.isIncludeWarning()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertTrue(timeline.isIncludeWarning()); } @Test @@ -412,8 +412,8 @@ public void multipleLifeCycles_mixed() { createAgentEvent(agentD, 290, AgentEventType.AGENT_CLOSED_BY_SERVER) )).build(); // Then - Assert.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); - Assert.assertTrue(timeline.isIncludeWarning()); + Assertions.assertEquals(expectedTimelineSegments, timeline.getTimelineSegments()); + Assertions.assertTrue(timeline.isIncludeWarning()); } private AgentStatus createAgentStatus(long timestamp, AgentLifeCycleState state) { diff --git a/web/src/test/java/com/navercorp/pinpoint/web/websocket/PinpointWebSocketTimerTaskDecoratorTest.java b/web/src/test/java/com/navercorp/pinpoint/web/websocket/PinpointWebSocketTimerTaskDecoratorTest.java index ae925699ebae..1f5fbbb5d0c6 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/websocket/PinpointWebSocketTimerTaskDecoratorTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/websocket/PinpointWebSocketTimerTaskDecoratorTest.java @@ -17,8 +17,8 @@ package com.navercorp.pinpoint.web.websocket; import com.navercorp.pinpoint.web.task.TimerTaskDecoratorFactory; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContext; @@ -64,7 +64,7 @@ public void run() { } }).start(); } - Assert.assertTrue("Timed out waiting for timer task completion", schedulerLatch.await(2 * DELAY_MS, TimeUnit.MILLISECONDS)); + Assertions.assertTrue(schedulerLatch.await(2 * DELAY_MS, TimeUnit.MILLISECONDS), "Timed out waiting for timer task completion"); } private static class TestTimerTask extends TimerTask { @@ -81,9 +81,9 @@ private TestTimerTask(CountDownLatch executeLatch, Authentication expectedAuthen public void run() { try { SecurityContext securityContext = SecurityContextHolder.getContext(); - Assert.assertNotNull(securityContext); + Assertions.assertNotNull(securityContext); Authentication actualAuthentication = securityContext.getAuthentication(); - Assert.assertSame(expectedAuthentication, actualAuthentication); + Assertions.assertSame(expectedAuthentication, actualAuthentication); } finally { executeLatch.countDown(); } diff --git a/web/src/test/java/com/navercorp/pinpoint/web/websocket/message/PinpointWebSocketMessageConverterTest.java b/web/src/test/java/com/navercorp/pinpoint/web/websocket/message/PinpointWebSocketMessageConverterTest.java index d8562ae61bb2..cda396a8b198 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/websocket/message/PinpointWebSocketMessageConverterTest.java +++ b/web/src/test/java/com/navercorp/pinpoint/web/websocket/message/PinpointWebSocketMessageConverterTest.java @@ -16,8 +16,8 @@ package com.navercorp.pinpoint.web.websocket.message; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; import java.util.HashMap; import java.util.Map; @@ -38,13 +38,13 @@ public void requestMessageTest() throws Exception { String textMessage = messageConverter.getRequestTextMessage(command, parameters); PinpointWebSocketMessage webSocketMessage = messageConverter.getWebSocketMessage(textMessage); - Assert.assertNotNull(webSocketMessage); - Assert.assertTrue(webSocketMessage instanceof RequestMessage); + Assertions.assertNotNull(webSocketMessage); + Assertions.assertTrue(webSocketMessage instanceof RequestMessage); RequestMessage requestMessage = (RequestMessage) webSocketMessage; - Assert.assertEquals(PinpointWebSocketMessageType.REQUEST, requestMessage.getType()); - Assert.assertEquals(command, requestMessage.getCommand()); - Assert.assertEquals(parameters, requestMessage.getParameters()); + Assertions.assertEquals(PinpointWebSocketMessageType.REQUEST, requestMessage.getType()); + Assertions.assertEquals(command, requestMessage.getCommand()); + Assertions.assertEquals(parameters, requestMessage.getParameters()); } @Test @@ -56,13 +56,13 @@ public void responseMessageTest() throws Exception { String textMessage = messageConverter.getResponseTextMessage(command, result); PinpointWebSocketMessage webSocketMessage = messageConverter.getWebSocketMessage(textMessage); - Assert.assertNotNull(webSocketMessage); - Assert.assertTrue(webSocketMessage instanceof ResponseMessage); + Assertions.assertNotNull(webSocketMessage); + Assertions.assertTrue(webSocketMessage instanceof ResponseMessage); ResponseMessage responseMessage = (ResponseMessage) webSocketMessage; - Assert.assertEquals(PinpointWebSocketMessageType.RESPONSE, responseMessage.getType()); - Assert.assertEquals(command, responseMessage.getCommand()); - Assert.assertEquals(result, responseMessage.getResult()); + Assertions.assertEquals(PinpointWebSocketMessageType.RESPONSE, responseMessage.getType()); + Assertions.assertEquals(command, responseMessage.getCommand()); + Assertions.assertEquals(result, responseMessage.getResult()); } @Test @@ -74,13 +74,13 @@ public void sendMessageTest() throws Exception { String textMessage = messageConverter.getSendTextMessage(command, parameters); PinpointWebSocketMessage webSocketMessage = messageConverter.getWebSocketMessage(textMessage); - Assert.assertNotNull(webSocketMessage); - Assert.assertTrue(webSocketMessage instanceof SendMessage); + Assertions.assertNotNull(webSocketMessage); + Assertions.assertTrue(webSocketMessage instanceof SendMessage); SendMessage sendMessage = (SendMessage) webSocketMessage; - Assert.assertEquals(PinpointWebSocketMessageType.SEND, sendMessage.getType()); - Assert.assertEquals(command, sendMessage.getCommand()); - Assert.assertEquals(parameters, sendMessage.getParameters()); + Assertions.assertEquals(PinpointWebSocketMessageType.SEND, sendMessage.getType()); + Assertions.assertEquals(command, sendMessage.getCommand()); + Assertions.assertEquals(parameters, sendMessage.getParameters()); } @Test @@ -88,9 +88,9 @@ public void pingMessageTest() throws Exception { String textMessage = messageConverter.getPingTextMessage(); PinpointWebSocketMessage webSocketMessage = messageConverter.getWebSocketMessage(textMessage); - Assert.assertNotNull(webSocketMessage); - Assert.assertTrue(webSocketMessage instanceof PingMessage); - Assert.assertEquals(PinpointWebSocketMessageType.PING, webSocketMessage.getType()); + Assertions.assertNotNull(webSocketMessage); + Assertions.assertTrue(webSocketMessage instanceof PingMessage); + Assertions.assertEquals(PinpointWebSocketMessageType.PING, webSocketMessage.getType()); } @@ -99,24 +99,24 @@ public void pongMessageTest() throws Exception { String textMessage = messageConverter.getPongTextMessage(); PinpointWebSocketMessage webSocketMessage = messageConverter.getWebSocketMessage(textMessage); - Assert.assertNotNull(webSocketMessage); - Assert.assertTrue(webSocketMessage instanceof PongMessage); - Assert.assertEquals(PinpointWebSocketMessageType.PONG, webSocketMessage.getType()); + Assertions.assertNotNull(webSocketMessage); + Assertions.assertTrue(webSocketMessage instanceof PongMessage); + Assertions.assertEquals(PinpointWebSocketMessageType.PONG, webSocketMessage.getType()); } @Test public void UnknownMessageTest() throws Exception { PinpointWebSocketMessage emptyString = messageConverter.getWebSocketMessage(""); - Assert.assertSame(emptyString.getClass(), UnknownMessage.class); - Assert.assertEquals(PinpointWebSocketMessageType.UNKNOWN, emptyString.getType()); + Assertions.assertSame(emptyString.getClass(), UnknownMessage.class); + Assertions.assertEquals(PinpointWebSocketMessageType.UNKNOWN, emptyString.getType()); PinpointWebSocketMessage nullValue = messageConverter.getWebSocketMessage(null); - Assert.assertSame(nullValue.getClass(), UnknownMessage.class); - Assert.assertEquals(PinpointWebSocketMessageType.UNKNOWN, nullValue.getType()); + Assertions.assertSame(nullValue.getClass(), UnknownMessage.class); + Assertions.assertEquals(PinpointWebSocketMessageType.UNKNOWN, nullValue.getType()); PinpointWebSocketMessage emptyObject = messageConverter.getWebSocketMessage("{}"); - Assert.assertSame(emptyObject.getClass(), UnknownMessage.class); - Assert.assertEquals(PinpointWebSocketMessageType.UNKNOWN, emptyObject.getType()); + Assertions.assertSame(emptyObject.getClass(), UnknownMessage.class); + Assertions.assertEquals(PinpointWebSocketMessageType.UNKNOWN, emptyObject.getType()); }