diff --git a/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/WeakAtomicReferenceArrayTest.java b/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/WeakAtomicReferenceArrayTest.java index 509432f72..9cef40906 100644 --- a/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/WeakAtomicReferenceArrayTest.java +++ b/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; diff --git a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/PinpointBootStrapTest.java b/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/PinpointBootStrapTest.java index 938a6812f..229b161c2 100644 --- a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/PinpointBootStrapTest.java +++ b/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; diff --git a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/PinpointURLClassLoaderTest.java b/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/PinpointURLClassLoaderTest.java index 766fef9c4..06a010512 100644 --- a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/PinpointURLClassLoaderTest.java +++ b/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; diff --git a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/ValidIdCheckerTest.java b/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/ValidIdCheckerTest.java index fceb47608..c5423f19a 100644 --- a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/ValidIdCheckerTest.java +++ b/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; diff --git a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/DumpTypeTest.java b/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/DumpTypeTest.java index f3289ea69..6523a78dd 100644 --- a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/DumpTypeTest.java +++ b/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; diff --git a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ExcludeUrlFilterTest.java b/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ExcludeUrlFilterTest.java index e98ce9bcd..a948d2a8d 100644 --- a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ExcludeUrlFilterTest.java +++ b/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; diff --git a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfilableClassFilterTest.java b/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfilableClassFilterTest.java index 94bc1ffc2..80658330e 100644 --- a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfilableClassFilterTest.java +++ b/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; diff --git a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfilerConfigTest.java b/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfilerConfigTest.java index 29416a79b..4dc7731d2 100644 --- a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/config/ProfilerConfigTest.java +++ b/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; diff --git a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanSimpleAroundInterceptorTest.java b/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanSimpleAroundInterceptorTest.java index 64c29b85c..93b3717f6 100644 --- a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/interceptor/SpanSimpleAroundInterceptorTest.java +++ b/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; diff --git a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/BytecodeUtilsTest.java b/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/BytecodeUtilsTest.java index d907d52a3..75181a2c8 100644 --- a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/plugin/BytecodeUtilsTest.java +++ b/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; diff --git a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/util/MetaObjectTest.java b/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/util/MetaObjectTest.java index eee8a9322..d6c20e170 100644 --- a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/util/MetaObjectTest.java +++ b/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; diff --git a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/util/NetworkUtilsTest.java b/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/util/NetworkUtilsTest.java index 36eaa5c07..4c80aea49 100644 --- a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/util/NetworkUtilsTest.java +++ b/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; diff --git a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/util/spring/PropertyPlaceholderHelperTest.java b/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/util/spring/PropertyPlaceholderHelperTest.java index 802e67314..abeb9127f 100644 --- a/bootstrap/src/test/java/com/navercorp/pinpoint/bootstrap/util/spring/PropertyPlaceholderHelperTest.java +++ b/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; diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseApplicationTrraceIndexColumnTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseApplicationTrraceIndexColumnTest.java index 35ee36025..bda7211d3 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/dao/hbase/HbaseApplicationTrraceIndexColumnTest.java +++ b/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; 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 8c141feab..5ada35bc2 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 @@ -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; diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/tcp/TCPReceiverTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/tcp/TCPReceiverTest.java index 732317713..2adc2d9a6 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/tcp/TCPReceiverTest.java +++ b/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; diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/udp/UDPReceiverTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/udp/UDPReceiverTest.java index d28469afe..e89d9f5b2 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/udp/UDPReceiverTest.java +++ b/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; diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/util/ConcurrentCounterMapTest.java b/collector/src/test/java/com/navercorp/pinpoint/collector/util/ConcurrentCounterMapTest.java index a9e791abd..c214f882e 100644 --- a/collector/src/test/java/com/navercorp/pinpoint/collector/util/ConcurrentCounterMapTest.java +++ b/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; 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 eff52e6b4..5896c149b 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 @@ -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; diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/AnnotationKeyTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/AnnotationKeyTest.java index cd4c2fda6..c41031d79 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/AnnotationKeyTest.java +++ b/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; diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/ServiceTypeTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/ServiceTypeTest.java index 5106315b0..f69bd447a 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/ServiceTypeTest.java +++ b/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; diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/bo/SpanBoTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/bo/SpanBoTest.java index e25b58fbd..8921e5f6d 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/bo/SpanBoTest.java +++ b/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; diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/bo/SpanEventBoTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/bo/SpanEventBoTest.java index 70dc044c7..2eff15dc4 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/bo/SpanEventBoTest.java +++ b/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; diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/buffer/AutomaticBufferTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/buffer/AutomaticBufferTest.java index d1d7fe512..44ba8ace1 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/buffer/AutomaticBufferTest.java +++ b/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"))); } diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/buffer/OffsetAutomaticBufferTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/buffer/OffsetAutomaticBufferTest.java index e092acc46..663805ec1 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/buffer/OffsetAutomaticBufferTest.java +++ b/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; diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/buffer/OffsetFixedBufferTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/buffer/OffsetFixedBufferTest.java index ab034447c..7dc6aa77f 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/buffer/OffsetFixedBufferTest.java +++ b/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; 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 30fbe977e..afee33a16 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,7 +16,7 @@ package com.navercorp.pinpoint.common.util; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/DefaultSqlParserTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/DefaultSqlParserTest.java index 9696cfa70..b17ad76ea 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/DefaultSqlParserTest.java +++ b/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; 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 3e41146d1..984e34786 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,7 +16,7 @@ package com.navercorp.pinpoint.common.util; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; 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 10c098086..8ac90be8f 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,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; diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/PinpointThreadFactoryTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/PinpointThreadFactoryTest.java index a99188b93..955278f01 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/PinpointThreadFactoryTest.java +++ b/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; 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 97dd2afce..dc048496f 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,7 +16,7 @@ package com.navercorp.pinpoint.common.util; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/RowKeyUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/RowKeyUtilsTest.java index c12a924df..a782a3928 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/RowKeyUtilsTest.java +++ b/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; diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/RpcCodeRangeTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/RpcCodeRangeTest.java index da0ca1957..068ed23f6 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/RpcCodeRangeTest.java +++ b/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; diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/SpanUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/SpanUtilsTest.java index 6f60865c9..9742f64e4 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/SpanUtilsTest.java +++ b/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; 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 e1ef4d624..427edbea6 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,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; diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/TimeSlotTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/TimeSlotTest.java index 2a4da8d16..9b4887384 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/TimeSlotTest.java +++ b/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; 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 6280f2ef1..03e51856c 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,7 +16,7 @@ package com.navercorp.pinpoint.common.util; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git a/commons/src/test/java/com/navercorp/pinpoint/common/util/TransactionIdUtilsTest.java b/commons/src/test/java/com/navercorp/pinpoint/common/util/TransactionIdUtilsTest.java index c3a4bbb27..11fafcc8c 100644 --- a/commons/src/test/java/com/navercorp/pinpoint/common/util/TransactionIdUtilsTest.java +++ b/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; diff --git a/profiler/src/main/java/com/navercorp/pinpoint/test/BaseInterceptorTest.java b/profiler/src/main/java/com/navercorp/pinpoint/test/BaseInterceptorTest.java index 35f12f4f6..8751135fa 100644 --- a/profiler/src/main/java/com/navercorp/pinpoint/test/BaseInterceptorTest.java +++ b/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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/DefaultClassFileFilterTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/DefaultClassFileFilterTest.java index 363678502..d316dbb9e 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/DefaultClassFileFilterTest.java +++ b/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; 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 6f506a8e2..e36e6f3f2 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,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; 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 3dab90564..408d401fb 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 @@ -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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/HeaderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/HeaderTest.java index aa0ee4502..6288db695 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/HeaderTest.java +++ b/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; 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 279955c7f..a09412100 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 @@ -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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/ThreadLocalTraceFactoryTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/ThreadLocalTraceFactoryTest.java index f79b37e2f..366c74833 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/context/ThreadLocalTraceFactoryTest.java +++ b/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; 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 7a6b1137f..22ee49234 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 @@ -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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/bci/AspectWeaverClassTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/bci/AspectWeaverClassTest.java index be2325189..9db54460d 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/interceptor/bci/AspectWeaverClassTest.java +++ b/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; 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 ae2c21e42..90bd76064 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,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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/LRUCacheTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/LRUCacheTest.java index e1b2e1246..23cbeaa83 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/LRUCacheTest.java +++ b/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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/SimpleCacheTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/SimpleCacheTest.java index 2dab49b1f..0eb1f714d 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/metadata/SimpleCacheTest.java +++ b/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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/arcus/interceptor/BaseOperationTransitionStateInterceptorTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/arcus/interceptor/BaseOperationTransitionStateInterceptorTest.java index 1d5dec293..f9abadab7 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/arcus/interceptor/BaseOperationTransitionStateInterceptorTest.java +++ b/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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/JDBCUrlParserTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/JDBCUrlParserTest.java index 64112245b..1c1ec9a7a 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/JDBCUrlParserTest.java +++ b/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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/cubrid/CubridConnectionStringParserTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/cubrid/CubridConnectionStringParserTest.java index 84ebe651f..d4799366e 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/cubrid/CubridConnectionStringParserTest.java +++ b/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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/interceptor/BindValueUtilsTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/interceptor/BindValueUtilsTest.java index 38bed9145..1f776b443 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/interceptor/BindValueUtilsTest.java +++ b/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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/jtds/JtdsConnectionStringParserTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/jtds/JtdsConnectionStringParserTest.java index 4b3650512..0578e5513 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/jtds/JtdsConnectionStringParserTest.java +++ b/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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/oracle/parser/OracleNetConnectionDescriptorParserTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/oracle/parser/OracleNetConnectionDescriptorParserTest.java index 86ea2da03..1002753c6 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/oracle/parser/OracleNetConnectionDescriptorParserTest.java +++ b/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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/oracle/parser/OracleNetConnectionDescriptorTokenizerTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/oracle/parser/OracleNetConnectionDescriptorTokenizerTest.java index f5bdabc1b..c5116ee0a 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/db/oracle/parser/OracleNetConnectionDescriptorTokenizerTest.java +++ b/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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/tomcat/aspect/RequestFacadeAspectTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/tomcat/aspect/RequestFacadeAspectTest.java index 31df29086..5b4482a49 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/modifier/tomcat/aspect/RequestFacadeAspectTest.java +++ b/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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/DefaultRpcMetricTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/DefaultRpcMetricTest.java index 6bffbd417..a1ca962a9 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/DefaultRpcMetricTest.java +++ b/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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/MetricRegistryTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/MetricRegistryTest.java index 58417286b..a8cf9f1b3 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/MetricRegistryTest.java +++ b/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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/WasStaticAcceptHistogramTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/WasStaticAcceptHistogramTest.java index c8930d322..00bdd71b8 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/monitor/metric/WasStaticAcceptHistogramTest.java +++ b/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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/SamplerFactoryTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/SamplerFactoryTest.java index cd8ef2f12..5107094fd 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sampler/SamplerFactoryTest.java +++ b/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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/BufferedUdpDataSenderTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/BufferedUdpDataSenderTest.java index 792dde6b4..1133ee894 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/sender/BufferedUdpDataSenderTest.java +++ b/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; 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 a3c544e15..0a6ac48e7 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,7 +16,7 @@ package com.navercorp.pinpoint.profiler.sender; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; 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 3a188d69f..6015f8831 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 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; 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 5a0f130d2..c45196abc 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 @@ -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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/AttachmentSimpleScopeTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/AttachmentSimpleScopeTest.java index 1a3a2c148..ed1e7c821 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/AttachmentSimpleScopeTest.java +++ b/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; diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/StringUtilsTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/StringUtilsTest.java index b93eb5ace..f999fa978 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/StringUtilsTest.java +++ b/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; 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 93368cd36..76e20fdaf 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 @@ -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 { diff --git a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/bindvalue/BindValueConverterTest.java b/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/bindvalue/BindValueConverterTest.java index f6e68300d..86c8039c6 100644 --- a/profiler/src/test/java/com/navercorp/pinpoint/profiler/util/bindvalue/BindValueConverterTest.java +++ b/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; 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 c0151bdbd..1b6e522ef 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,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; 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 60e44c62a..4e841b551 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 @@ -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; 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 612af4985..08e189c44 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,7 +16,7 @@ package com.navercorp.pinpoint.rpc.stream; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; 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 a73648a1f..3cd3e6b0d 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 @@ -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; 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 17a542aed..e17931072 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,7 +16,7 @@ package com.navercorp.pinpoint.rpc.util; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; 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 ad6817faa..33f6cbe2b 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 @@ -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; 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 10bcfbad7..866de9699 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,7 +16,7 @@ package com.navercorp.pinpoint.thrift.io; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; 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 f594875ba..ab24b440d 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 @@ -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; 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 970c6b264..2ded7f00d 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 @@ -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; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/alarm/MainCategoryTest.java b/web/src/test/java/com/navercorp/pinpoint/web/alarm/MainCategoryTest.java index 2ff8dd39b..17431913b 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/alarm/MainCategoryTest.java +++ b/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; 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 c4f9a2701..0ff728c72 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 @@ -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; 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 b0bdffcce..8c01d1139 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 @@ -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; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/SpanIdMatcherTest.java b/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/SpanIdMatcherTest.java index 3f7c3728c..4dc3115dd 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/calltree/span/SpanIdMatcherTest.java +++ b/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; 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 93ee96b58..ac41028d0 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 @@ -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; 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 69053762c..2856f8bba 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 @@ -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; 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 4469702b7..44d58df04 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 @@ -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; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/LinkVisitCheckerTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/LinkVisitCheckerTest.java index 46176bc23..e6ebcfe44 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/LinkVisitCheckerTest.java +++ b/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; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/service/map/AcceptApplicationLocalCacheTest.java b/web/src/test/java/com/navercorp/pinpoint/web/service/map/AcceptApplicationLocalCacheTest.java index 69e034e52..0538de1b9 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/service/map/AcceptApplicationLocalCacheTest.java +++ b/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; 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 ae0eac6fb..cad1c0bec 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 @@ -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; 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 2f82c2462..f9e35e238 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,7 +16,7 @@ package com.navercorp.pinpoint.web.util; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; 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 673c088d6..dcdf5e82f 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 @@ -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; 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 b795537d6..b1c5d78ff 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,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; 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 8336954a1..484adc591 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 @@ -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; 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 9e9b60e95..628f6a360 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 @@ -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; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/RangeTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/RangeTest.java index 6b6ceb0db..0ac115a78 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/RangeTest.java +++ b/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; diff --git a/web/src/test/java/com/navercorp/pinpoint/web/vo/TransactionIdTest.java b/web/src/test/java/com/navercorp/pinpoint/web/vo/TransactionIdTest.java index 178d80d88..a4d449ed6 100644 --- a/web/src/test/java/com/navercorp/pinpoint/web/vo/TransactionIdTest.java +++ b/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;