[pinpoint-apm#8915] Migrate most of junit4 test to junit5 test

donghun-cho · Jun 29, 2022 · 25f807d · 25f807d
1 parent 6a2eeaa
commit 25f807d
Show file tree

Hide file tree

Showing 882 changed files with 9,185 additions and 9,089 deletions.
diff --git a/...c/test/java/com/navercorp/pinpoint/agent/plugin/proxy/apache/ApacheRequestParserTest.java b/...c/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/...app/src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/app/AppRequestParserTest.java b/...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/...src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/nginx/NginxRequestParserTest.java b/...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/...r/src/test/java/com/navercorp/pinpoint/agent/plugin/proxy/user/UserRequestParserTest.java b/...r/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
@@ -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
@@ -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
@@ -17,33 +17,32 @@
 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
     BatchConfiguration configuration;
 
     @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);
     }
 
 }
diff --git 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
@@ -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<String, JobParameter> 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<String, JobParameter> 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
@@ -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<String, ExecutionContext> 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
@@ -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,28 +77,28 @@ 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<Rule> 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() {
 
             @Override
             public List<Application> selectAllApplicationNames() {
                 List<Application> 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<Application> selectApplicationName(String applicationName) {
                 return apps;
             }
 
-            @Override public List<String> selectAgentIds(String applicationName) {return null;}
-            @Override public void deleteApplicationName(String applicationName) { }
+            @Override
+            public List<String> selectAgentIds(String applicationName) {
+                return null;
+            }
 
             @Override
-            public void deleteAgentIds(Map<String, List<String>> applicationAgentIdMap) {}
+            public void deleteApplicationName(String applicationName) {
+            }
+
+            @Override
+            public void deleteAgentIds(Map<String, List<String>> 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<String, Rule> ruleMap ;
+            private final Map<String, Rule> 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<Rule> selectRuleByApplicationId(String applicationId) {
                 return rules;
             }
         };
-        
+
         dataCollectorFactory = mock(DataCollectorFactory.class);
         when(dataCollectorFactory.createDataCollector(any(), any(), anyLong())).thenAnswer(new Answer<DataCollector>() {
             @Override