Merge pull request #884 from emeroad/1.1.x

remove deprecated api

bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/WeakAtomicReferenceArrayTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.bootstrap.interceptor;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;

bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/PinpointBootStrapTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.bootstrap;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/PinpointURLClassLoaderTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.bootstrap;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/ValidIdCheckerTest.java

@@ -18,7 +18,7 @@ package com.navercorp.pinpoint.bootstrap;
 
 import java.util.regex.Pattern;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/DumpTypeTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.bootstrap.config;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ExcludeUrlFilterTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.bootstrap.config;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfilableClassFilterTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.bootstrap.config;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfilerConfigTest.java

@@ -19,7 +19,7 @@ package com.navercorp.pinpoint.bootstrap.config;
 import java.io.IOException;
 import java.util.Properties;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanSimpleAroundInterceptorTest.java

@@ -17,7 +17,7 @@
 package com.navercorp.pinpoint.bootstrap.interceptor;
 
 import static org.mockito.Mockito.*;
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/BytecodeUtilsTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.bootstrap.plugin;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/util/MetaObjectTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.bootstrap.util;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/util/NetworkUtilsTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.bootstrap.util;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/util/spring/PropertyPlaceholderHelperTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.bootstrap.util.spring;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseApplicationTrraceIndexColumnTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.collector.dao.hbase;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseHostApplicationMapDaoTest.java

@@ -25,7 +25,7 @@ import com.navercorp.pinpoint.common.util.DefaultTimeSlot;
 import com.navercorp.pinpoint.common.util.TimeSlot;
 import com.navercorp.pinpoint.common.util.TimeUtils;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

collector/src/test/java/com/navercorp/pinpoint/collector/receiver/tcp/TCPReceiverTest.java

@@ -19,7 +19,7 @@ package com.navercorp.pinpoint.collector.receiver.tcp;
 import com.navercorp.pinpoint.collector.receiver.UdpDispatchHandler;
 import com.navercorp.pinpoint.collector.receiver.tcp.TCPReceiver;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

collector/src/test/java/com/navercorp/pinpoint/collector/receiver/udp/UDPReceiverTest.java

@@ -23,7 +23,7 @@ import com.navercorp.pinpoint.collector.receiver.DataReceiver;
 import com.navercorp.pinpoint.collector.receiver.DispatchHandler;
 import com.navercorp.pinpoint.collector.receiver.udp.BaseUDPReceiver;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.thrift.TBase;
 import org.junit.Ignore;

collector/src/test/java/com/navercorp/pinpoint/collector/util/ConcurrentCounterMapTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.collector.util;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

commons-hbase/src/test/java/com/navercorp/pinpoint/common/hbase/HbaseTemplate2IT.java

@@ -19,7 +19,7 @@ package com.navercorp.pinpoint.common.hbase;
 import java.io.IOException;
 import java.util.Properties;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;

commons/src/test/java/com/navercorp/pinpoint/common/AnnotationKeyTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.common;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

commons/src/test/java/com/navercorp/pinpoint/common/ServiceTypeTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.common;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

commons/src/test/java/com/navercorp/pinpoint/common/bo/SpanBoTest.java

@@ -20,7 +20,7 @@ package com.navercorp.pinpoint.common.bo;
 import com.navercorp.pinpoint.common.ServiceType;
 import com.navercorp.pinpoint.common.bo.SpanBo;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

commons/src/test/java/com/navercorp/pinpoint/common/bo/SpanEventBoTest.java

@@ -19,7 +19,7 @@ package com.navercorp.pinpoint.common.bo;
 import com.navercorp.pinpoint.common.ServiceType;
 import com.navercorp.pinpoint.common.bo.SpanEventBo;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

commons/src/test/java/com/navercorp/pinpoint/common/buffer/AutomaticBufferTest.java

@@ -59,10 +59,10 @@ public class AutomaticBufferTest {
         buffer.putPadBytes(test, TOTAL_LENGTH);
 
         byte[] result = buffer.getBuffer();
-        junit.framework.Assert.assertEquals(result.length, TOTAL_LENGTH);
-        junit.framework.Assert.assertTrue("check data", Arrays.equals(Arrays.copyOfRange(test, 0, TEST_SIZE), Arrays.copyOfRange(result, 0, TEST_SIZE)));
+        Assert.assertEquals(result.length, TOTAL_LENGTH);
+        Assert.assertTrue("check data", Arrays.equals(Arrays.copyOfRange(test, 0, TEST_SIZE), Arrays.copyOfRange(result, 0, TEST_SIZE)));
         byte[] padBytes = new byte[TOTAL_LENGTH - TEST_SIZE];
-        junit.framework.Assert.assertTrue("check pad", Arrays.equals(Arrays.copyOfRange(padBytes, 0, TEST_SIZE), Arrays.copyOfRange(result, TEST_SIZE, TOTAL_LENGTH)));
+        Assert.assertTrue("check pad", Arrays.equals(Arrays.copyOfRange(padBytes, 0, TEST_SIZE), Arrays.copyOfRange(result, TEST_SIZE, TOTAL_LENGTH)));
 
     }
 
@@ -111,7 +111,7 @@ public class AutomaticBufferTest {
 
         String padString = new String(result, TOTAL_LENGTH - TEST_SIZE, PAD_SIZE, "UTF-8");
         byte[] padBytes = new byte[TOTAL_LENGTH - TEST_SIZE];
-        junit.framework.Assert.assertEquals("check pad", padString, new String(padBytes, Charset.forName("UTF-8")));
+        Assert.assertEquals("check pad", padString, new String(padBytes, Charset.forName("UTF-8")));
 
     }
 

commons/src/test/java/com/navercorp/pinpoint/common/buffer/OffsetAutomaticBufferTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.common.buffer;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

commons/src/test/java/com/navercorp/pinpoint/common/buffer/OffsetFixedBufferTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.common.buffer;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

commons/src/test/java/com/navercorp/pinpoint/common/util/ClassLoaderUtilsTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.common.util;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

commons/src/test/java/com/navercorp/pinpoint/common/util/DefaultSqlParserTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.common.util;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import junit.framework.AssertionFailedError;
 
 import org.junit.Test;

commons/src/test/java/com/navercorp/pinpoint/common/util/HttpUtilsTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.common.util;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

commons/src/test/java/com/navercorp/pinpoint/common/util/MathUtilsTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.common.util;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

commons/src/test/java/com/navercorp/pinpoint/common/util/PinpointThreadFactoryTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.common.util;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

commons/src/test/java/com/navercorp/pinpoint/common/util/PropertyUtilsTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.common.util;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

commons/src/test/java/com/navercorp/pinpoint/common/util/RowKeyUtilsTest.java

@@ -18,7 +18,7 @@ package com.navercorp.pinpoint.common.util;
 
 import com.navercorp.pinpoint.common.bo.SqlMetaDataBo;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

commons/src/test/java/com/navercorp/pinpoint/common/util/RpcCodeRangeTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.common.util;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

commons/src/test/java/com/navercorp/pinpoint/common/util/SpanUtilsTest.java

@@ -18,7 +18,7 @@ package com.navercorp.pinpoint.common.util;
 
 import java.util.Arrays;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

commons/src/test/java/com/navercorp/pinpoint/common/util/ThreadMXBeanUtilsTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.common.util;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

commons/src/test/java/com/navercorp/pinpoint/common/util/TimeSlotTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.common.util;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

commons/src/test/java/com/navercorp/pinpoint/common/util/TimeUtilsTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.common.util;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

commons/src/test/java/com/navercorp/pinpoint/common/util/TransactionIdUtilsTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.common.util;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

profiler/src/main/java/com/navercorp/pinpoint/test/BaseInterceptorTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.test;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.BeforeClass;

profiler/src/test/java/com/navercorp/pinpoint/profiler/DefaultClassFileFilterTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.profiler;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

profiler/src/test/java/com/navercorp/pinpoint/profiler/context/CallStackTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.profiler.context;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Ignore;
 import org.junit.Test;

profiler/src/test/java/com/navercorp/pinpoint/profiler/context/DefaultTraceContextTest.java

@@ -27,7 +27,7 @@ import com.navercorp.pinpoint.profiler.context.DefaultTraceContext;
 import com.navercorp.pinpoint.profiler.context.DefaultTraceId;
 import com.navercorp.pinpoint.profiler.util.RuntimeMXBeanUtils;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

profiler/src/test/java/com/navercorp/pinpoint/profiler/context/HeaderTest.java

@@ -18,7 +18,7 @@ package com.navercorp.pinpoint.profiler.context;
 
 import com.navercorp.pinpoint.bootstrap.context.Header;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

profiler/src/test/java/com/navercorp/pinpoint/profiler/context/SpanEventTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.profiler.context;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

profiler/src/test/java/com/navercorp/pinpoint/profiler/context/ThreadLocalTraceFactoryTest.java

@@ -28,7 +28,7 @@ import com.navercorp.pinpoint.profiler.context.storage.LogStorageFactory;
 import com.navercorp.pinpoint.profiler.monitor.metric.MetricRegistry;
 import com.navercorp.pinpoint.profiler.sampler.TrueSampler;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

profiler/src/test/java/com/navercorp/pinpoint/profiler/context/storage/BufferedStorageTest.java

@@ -25,7 +25,7 @@ import com.navercorp.pinpoint.profiler.context.SpanEvent;
 import com.navercorp.pinpoint.profiler.context.storage.BufferedStorage;
 import com.navercorp.pinpoint.profiler.sender.CountingDataSender;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Before;
 import org.junit.Test;

profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/bci/AspectWeaverClassTest.java

@@ -19,7 +19,7 @@ package com.navercorp.pinpoint.profiler.interceptor.bci;
 import com.navercorp.pinpoint.test.util.LoaderUtils;
 
 import javassist.*;
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/bci/FormatTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.profiler.interceptor.bci;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/LRUCacheTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.profiler.metadata;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/SimpleCacheTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.profiler.metadata;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/arcus/interceptor/BaseOperationTransitionStateInterceptorTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.profiler.modifier.arcus.interceptor;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import net.spy.memcached.ops.OperationState;
 import org.junit.Test;
 

profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/JDBCUrlParserTest.java

@@ -20,7 +20,7 @@ import com.navercorp.pinpoint.bootstrap.context.DatabaseInfo;
 import com.navercorp.pinpoint.common.ServiceType;
 import com.navercorp.pinpoint.profiler.modifier.db.JDBCUrlParser;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/cubrid/CubridConnectionStringParserTest.java

@@ -21,7 +21,7 @@ import com.navercorp.pinpoint.common.ServiceType;
 import com.navercorp.pinpoint.profiler.modifier.db.ConnectionStringParser;
 import com.navercorp.pinpoint.profiler.modifier.db.cubrid.CubridConnectionStringParser;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/interceptor/BindValueUtilsTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.profiler.modifier.db.interceptor;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/jtds/JtdsConnectionStringParserTest.java

@@ -21,7 +21,7 @@ import com.navercorp.pinpoint.common.ServiceType;
 import com.navercorp.pinpoint.profiler.modifier.db.ConnectionStringParser;
 import com.navercorp.pinpoint.profiler.modifier.db.jtds.JtdsConnectionStringParser;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/oracle/parser/OracleNetConnectionDescriptorParserTest.java

@@ -21,7 +21,7 @@ import com.navercorp.pinpoint.profiler.modifier.db.oracle.parser.KeyValue;
 import com.navercorp.pinpoint.profiler.modifier.db.oracle.parser.OracleConnectionStringException;
 import com.navercorp.pinpoint.profiler.modifier.db.oracle.parser.OracleNetConnectionDescriptorParser;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/oracle/parser/OracleNetConnectionDescriptorTokenizerTest.java

@@ -17,7 +17,7 @@
 package com.navercorp.pinpoint.profiler.modifier.db.oracle.parser;
 
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/tomcat/aspect/RequestFacadeAspectTest.java

@@ -19,7 +19,7 @@ package com.navercorp.pinpoint.profiler.modifier.tomcat.aspect;
 import com.navercorp.pinpoint.bootstrap.context.Header;
 import com.navercorp.pinpoint.profiler.modifier.tomcat.aspect.RequestFacadeAspect;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/DefaultRpcMetricTest.java

@@ -21,7 +21,7 @@ import com.navercorp.pinpoint.common.ServiceType;
 import com.navercorp.pinpoint.profiler.monitor.metric.DefaultRpcMetric;
 import com.navercorp.pinpoint.profiler.monitor.metric.HistogramSnapshot;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/MetricRegistryTest.java

@@ -20,7 +20,7 @@ import com.navercorp.pinpoint.common.ServiceType;
 import com.navercorp.pinpoint.profiler.monitor.metric.MetricRegistry;
 import com.navercorp.pinpoint.profiler.monitor.metric.RpcMetric;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/WasStaticAcceptHistogramTest.java

@@ -20,7 +20,7 @@ import com.navercorp.pinpoint.common.ServiceType;
 import com.navercorp.pinpoint.profiler.monitor.metric.DynamicAcceptHistogram;
 import com.navercorp.pinpoint.profiler.monitor.metric.StaticAcceptHistogram;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/SamplerFactoryTest.java

@@ -19,7 +19,7 @@ package com.navercorp.pinpoint.profiler.sampler;
 import com.navercorp.pinpoint.bootstrap.sampler.Sampler;
 import com.navercorp.pinpoint.profiler.sampler.SamplerFactory;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/BufferedUdpDataSenderTest.java

@@ -19,7 +19,7 @@ package com.navercorp.pinpoint.profiler.sender;
 import com.navercorp.pinpoint.common.util.ThreadMXBeanUtils;
 import com.navercorp.pinpoint.profiler.sender.BufferedUdpDataSender;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/RetryQueueTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.profiler.sender;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/TcpDataSenderTest.java

@@ -21,7 +21,7 @@ import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.After;
 import org.junit.Before;

profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/UdpDataSenderTest.java

@@ -20,7 +20,7 @@ import com.navercorp.pinpoint.profiler.logging.Slf4jLoggerBinderInitializer;
 import com.navercorp.pinpoint.profiler.sender.UdpDataSender;
 import com.navercorp.pinpoint.thrift.dto.TAgentInfo;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.thrift.TBase;

profiler/src/test/java/com/navercorp/pinpoint/profiler/util/AttachmentSimpleScopeTest.java

@@ -18,7 +18,7 @@ package com.navercorp.pinpoint.profiler.util;
 
 import com.navercorp.pinpoint.bootstrap.instrument.AttachmentFactory;
 import com.navercorp.pinpoint.bootstrap.instrument.AttachmentScope;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

profiler/src/test/java/com/navercorp/pinpoint/profiler/util/StringUtilsTest.java

@@ -18,7 +18,7 @@ package com.navercorp.pinpoint.profiler.util;
 
 import com.navercorp.pinpoint.bootstrap.util.StringUtils;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

profiler/src/test/java/com/navercorp/pinpoint/profiler/util/ThreadLocalScopePoolTest.java

@@ -20,7 +20,7 @@ import com.navercorp.pinpoint.bootstrap.instrument.AttachmentFactory;
 import com.navercorp.pinpoint.bootstrap.instrument.DefaultScopeDefinition;
 import com.navercorp.pinpoint.bootstrap.instrument.Scope;
 import com.navercorp.pinpoint.bootstrap.instrument.ScopeDefinition;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class ThreadLocalScopePoolTest {

profiler/src/test/java/com/navercorp/pinpoint/profiler/util/bindvalue/BindValueConverterTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.profiler.util.bindvalue;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

rpc/src/test/java/com/navercorp/pinpoint/rpc/packet/PongPacketTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.rpc.packet;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.junit.Test;

rpc/src/test/java/com/navercorp/pinpoint/rpc/stream/StreamChannelManagerTest.java

@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.BeforeClass;
 import org.junit.Test;

rpc/src/test/java/com/navercorp/pinpoint/rpc/stream/StreamChannelStateTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.rpc.stream;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

rpc/src/test/java/com/navercorp/pinpoint/rpc/util/CopyUtilsTest.java

@@ -19,7 +19,7 @@ package com.navercorp.pinpoint.rpc.util;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

rpc/src/test/java/com/navercorp/pinpoint/rpc/util/IDGeneratorTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.rpc.util;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

rpc/src/test/java/com/navercorp/pinpoint/rpc/util/ListUtilsTest.java

@@ -19,7 +19,7 @@ package com.navercorp.pinpoint.rpc.util;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

thrift/src/test/java/com/navercorp/pinpoint/thrift/io/HeaderTBaseDeserializerFactoryTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.thrift.io;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

thrift/src/test/java/com/navercorp/pinpoint/thrift/io/TCommandRegistryTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.thrift.io;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.thrift.TBase;
 import org.apache.thrift.TException;

thrift/src/test/java/com/navercorp/pinpoint/thrift/io/TCommandTypeVersionTest.java

@@ -18,7 +18,7 @@ package com.navercorp.pinpoint.thrift.io;
 
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

web/src/test/java/com/navercorp/pinpoint/web/alarm/MainCategoryTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.web.alarm;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

web/src/test/java/com/navercorp/pinpoint/web/applicationmap/LinkListTest.java

@@ -24,7 +24,7 @@ import com.navercorp.pinpoint.web.applicationmap.Node;
 import com.navercorp.pinpoint.web.vo.Application;
 import com.navercorp.pinpoint.web.vo.Range;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

web/src/test/java/com/navercorp/pinpoint/web/applicationmap/rawdata/AgentHistogramTest.java

@@ -22,7 +22,7 @@ import com.navercorp.pinpoint.web.applicationmap.histogram.TimeHistogram;
 import com.navercorp.pinpoint.web.applicationmap.rawdata.AgentHistogram;
 import com.navercorp.pinpoint.web.vo.Application;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

web/src/test/java/com/navercorp/pinpoint/web/calltree/span/SpanIdMatcherTest.java

@@ -19,7 +19,7 @@ package com.navercorp.pinpoint.web.calltree.span;
 import com.navercorp.pinpoint.common.bo.SpanBo;
 import com.navercorp.pinpoint.web.calltree.span.SpanIdMatcher;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

web/src/test/java/com/navercorp/pinpoint/web/cluster/ClusterTest.java

@@ -22,7 +22,7 @@ import static org.mockito.Mockito.when;
 import java.io.IOException;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.curator.test.TestingServer;
 import org.apache.zookeeper.KeeperException;

web/src/test/java/com/navercorp/pinpoint/web/cluster/zookeeper/ZookeeperClusterTest.java

@@ -19,7 +19,7 @@ package com.navercorp.pinpoint.web.cluster.zookeeper;
 import java.io.IOException;
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.curator.test.TestingServer;
 import org.apache.zookeeper.CreateMode;

web/src/test/java/com/navercorp/pinpoint/web/mapper/ResponseTimeMapperTest.java

@@ -24,7 +24,7 @@ import com.navercorp.pinpoint.web.applicationmap.histogram.Histogram;
 import com.navercorp.pinpoint.web.mapper.ResponseTimeMapper;
 import com.navercorp.pinpoint.web.vo.ResponseTime;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;

web/src/test/java/com/navercorp/pinpoint/web/service/LinkVisitCheckerTest.java

@@ -20,7 +20,7 @@ import com.navercorp.pinpoint.common.ServiceType;
 import com.navercorp.pinpoint.web.service.LinkVisitChecker;
 import com.navercorp.pinpoint.web.vo.Application;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

web/src/test/java/com/navercorp/pinpoint/web/service/map/AcceptApplicationLocalCacheTest.java

@@ -22,7 +22,7 @@ import com.navercorp.pinpoint.web.service.map.AcceptApplicationLocalCache;
 import com.navercorp.pinpoint.web.service.map.RpcApplication;
 import com.navercorp.pinpoint.web.vo.Application;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

web/src/test/java/com/navercorp/pinpoint/web/util/DateLimiterTest.java

@@ -20,7 +20,7 @@ import com.navercorp.pinpoint.web.util.DateLimiter;
 import com.navercorp.pinpoint.web.util.Limiter;
 import com.navercorp.pinpoint.web.vo.Range;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

web/src/test/java/com/navercorp/pinpoint/web/util/LimitUtilsTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.web.util;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

web/src/test/java/com/navercorp/pinpoint/web/util/TimeWindowTest.java

@@ -19,7 +19,7 @@ package com.navercorp.pinpoint.web.util;
 import com.navercorp.pinpoint.web.util.TimeWindow;
 import com.navercorp.pinpoint.web.vo.Range;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

web/src/test/java/com/navercorp/pinpoint/web/view/DotSerializerTest.java

@@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.navercorp.pinpoint.web.vo.TransactionId;
 import com.navercorp.pinpoint.web.vo.scatter.Dot;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

web/src/test/java/com/navercorp/pinpoint/web/view/HistogramSerializerTest.java

@@ -21,7 +21,7 @@ import com.navercorp.pinpoint.common.HistogramSchema;
 import com.navercorp.pinpoint.common.ServiceType;
 import com.navercorp.pinpoint.web.applicationmap.histogram.Histogram;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;

web/src/test/java/com/navercorp/pinpoint/web/vo/ApplicationTest.java

@@ -19,7 +19,7 @@ package com.navercorp.pinpoint.web.vo;
 import com.navercorp.pinpoint.common.ServiceType;
 import com.navercorp.pinpoint.web.vo.Application;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

web/src/test/java/com/navercorp/pinpoint/web/vo/RangeTest.java

@@ -16,7 +16,7 @@
 
 package com.navercorp.pinpoint.web.vo;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

web/src/test/java/com/navercorp/pinpoint/web/vo/TransactionIdTest.java

@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 import org.slf4j.Logger;