diff --git beeline/src/test/org/apache/hive/beeline/TestBeeLineExceptionHandling.java beeline/src/test/org/apache/hive/beeline/TestBeeLineExceptionHandling.java index 65fafc465b..14124b046a 100644 --- beeline/src/test/org/apache/hive/beeline/TestBeeLineExceptionHandling.java +++ beeline/src/test/org/apache/hive/beeline/TestBeeLineExceptionHandling.java @@ -17,7 +17,7 @@ */ package org.apache.hive.beeline; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.thrift.transport.TTransportException; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git beeline/src/test/org/apache/hive/beeline/TestBeeLineOpts.java beeline/src/test/org/apache/hive/beeline/TestBeeLineOpts.java index 80d79d82f0..5c0c9701f8 100644 --- beeline/src/test/org/apache/hive/beeline/TestBeeLineOpts.java +++ beeline/src/test/org/apache/hive/beeline/TestBeeLineOpts.java @@ -17,7 +17,7 @@ */ package org.apache.hive.beeline; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git beeline/src/test/org/apache/hive/beeline/TestClientCommandHookFactory.java beeline/src/test/org/apache/hive/beeline/TestClientCommandHookFactory.java index f4f9efbbd5..34f628ef1b 100644 --- beeline/src/test/org/apache/hive/beeline/TestClientCommandHookFactory.java +++ beeline/src/test/org/apache/hive/beeline/TestClientCommandHookFactory.java @@ -22,7 +22,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.times; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git common/src/test/org/apache/hadoop/hive/conf/TestVariableSubstitution.java common/src/test/org/apache/hadoop/hive/conf/TestVariableSubstitution.java index 683736f0bf..e13e5d4efd 100644 --- common/src/test/org/apache/hadoop/hive/conf/TestVariableSubstitution.java +++ common/src/test/org/apache/hadoop/hive/conf/TestVariableSubstitution.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hive.conf; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; import java.util.HashMap; diff --git hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java index de1e85817d..59468fe062 100644 --- hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java +++ hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java @@ -27,7 +27,7 @@ import java.util.Map; import java.util.Properties; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.apache.avro.Schema; import org.apache.avro.file.DataFileWriter; diff --git hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestDefaultHCatRecord.java hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestDefaultHCatRecord.java index b9d3f642dd..4c3421183e 100644 --- hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestDefaultHCatRecord.java +++ hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestDefaultHCatRecord.java @@ -44,7 +44,7 @@ import org.apache.hive.hcatalog.data.schema.HCatSchema; import org.apache.hive.hcatalog.data.schema.HCatSchemaUtils; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.apache.pig.parser.AliasMasker; diff --git hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestHCatRecordSerDe.java hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestHCatRecordSerDe.java index 59715906c9..e235b2ea59 100644 --- hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestHCatRecordSerDe.java +++ hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestHCatRecordSerDe.java @@ -25,7 +25,7 @@ import java.util.Map.Entry; import java.util.Properties; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.apache.hadoop.conf.Configuration; diff --git hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java index e16674d99f..983a66a52c 100644 --- hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java +++ hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java @@ -63,7 +63,7 @@ import org.apache.hive.hcatalog.data.schema.HCatFieldSchema; import org.apache.hive.hcatalog.data.schema.HCatSchema; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.After; import org.junit.Assume; diff --git hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatDynamicPartitioned.java hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatDynamicPartitioned.java index 34ae5fb6ad..fbb11f2c88 100644 --- hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatDynamicPartitioned.java +++ hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatDynamicPartitioned.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.api.FieldSchema; diff --git hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatInputFormat.java hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatInputFormat.java index 2fa43d7be9..6f61dd3c10 100644 --- hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatInputFormat.java +++ hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatInputFormat.java @@ -19,7 +19,7 @@ package org.apache.hive.hcatalog.mapreduce; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.serde2.thrift.test.IntString; diff --git hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatInputFormatMethods.java hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatInputFormatMethods.java index 4f2311090a..f43cc51f8e 100644 --- hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatInputFormatMethods.java +++ hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatInputFormatMethods.java @@ -19,7 +19,7 @@ package org.apache.hive.hcatalog.mapreduce; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.Job; diff --git hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java index 271709387b..22a0d3f7d1 100644 --- hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java +++ hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java @@ -28,7 +28,7 @@ import java.util.Random; import java.util.concurrent.TimeUnit; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataOutputStream; diff --git hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestInputJobInfo.java hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestInputJobInfo.java index 6ac530767d..a5664966b1 100644 --- hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestInputJobInfo.java +++ hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestInputJobInfo.java @@ -20,7 +20,7 @@ import java.util.Properties; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestPigHCatUtil.java hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestPigHCatUtil.java index 4bfd8141a4..487d5c986d 100644 --- hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestPigHCatUtil.java +++ hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestPigHCatUtil.java @@ -21,7 +21,7 @@ import com.google.common.collect.Lists; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hive.hcatalog.common.HCatConstants; import org.apache.hive.hcatalog.data.schema.HCatFieldSchema; diff --git hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestDelimitedInputWriter.java hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestDelimitedInputWriter.java index 1aa257f3ee..32eead4e0a 100644 --- hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestDelimitedInputWriter.java +++ hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestDelimitedInputWriter.java @@ -19,7 +19,7 @@ package org.apache.hive.hcatalog.streaming; import com.google.common.collect.Lists; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; import java.util.ArrayList; diff --git hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java index 78598a7e5e..31df4bbc02 100644 --- hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java +++ hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java @@ -43,7 +43,7 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import junit.framework.Assert; +import org.junit.Assert; /** * A set of tests exercising e2e WebHCat DDL APIs. These tests are somewhat diff --git hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/tool/TestJobIDParser.java hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/tool/TestJobIDParser.java index 37b5481993..fcdf7eb408 100644 --- hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/tool/TestJobIDParser.java +++ hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/tool/TestJobIDParser.java @@ -24,7 +24,7 @@ import org.apache.hadoop.conf.Configuration; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; public class TestJobIDParser { @Test diff --git itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatHiveCompatibility.java itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatHiveCompatibility.java index dac6218a67..424c2f823a 100644 --- itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatHiveCompatibility.java +++ itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatHiveCompatibility.java @@ -24,7 +24,7 @@ import java.util.Arrays; import java.util.Iterator; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.metastore.api.Partition; import org.apache.hadoop.hive.metastore.api.Table; import org.apache.hive.hcatalog.common.HCatConstants; diff --git itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatHiveThriftCompatibility.java itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatHiveThriftCompatibility.java index 1c14865cdd..6ac24d014b 100644 --- itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatHiveThriftCompatibility.java +++ itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatHiveThriftCompatibility.java @@ -19,7 +19,7 @@ package org.apache.hive.hcatalog.mapreduce; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.serde2.thrift.test.IntString; import org.apache.hadoop.io.BytesWritable; diff --git itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestNoSaslAuth.java itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestNoSaslAuth.java index f40dff808a..4ec86c0c13 100644 --- itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestNoSaslAuth.java +++ itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestNoSaslAuth.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.conf.HiveConf.ConfVars; diff --git itests/hive-unit/src/test/java/org/apache/hive/service/auth/TestCustomAuthentication.java itests/hive-unit/src/test/java/org/apache/hive/service/auth/TestCustomAuthentication.java index d9c6e77469..9705c65af8 100644 --- itests/hive-unit/src/test/java/org/apache/hive/service/auth/TestCustomAuthentication.java +++ itests/hive-unit/src/test/java/org/apache/hive/service/auth/TestCustomAuthentication.java @@ -17,7 +17,7 @@ */ package org.apache.hive.service.auth; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hive.service.server.HiveServer2; import org.junit.AfterClass; diff --git itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/ShowMapredStatsHook.java itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/ShowMapredStatsHook.java index d30b55a5fb..a20206a2e0 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/ShowMapredStatsHook.java +++ itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/ShowMapredStatsHook.java @@ -18,7 +18,7 @@ package org.apache.hadoop.hive.ql.hooks; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.ql.MapRedStats; import org.apache.hadoop.hive.ql.session.SessionState; diff --git itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyContentSummaryCacheHook.java itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyContentSummaryCacheHook.java index 14e1e57d0b..60dda489fd 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyContentSummaryCacheHook.java +++ itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyContentSummaryCacheHook.java @@ -19,7 +19,7 @@ import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.fs.ContentSummary; import org.apache.hadoop.hive.ql.hooks.HookContext.HookType; diff --git itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyHiveSortedInputFormatUsedHook.java itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyHiveSortedInputFormatUsedHook.java index cba1fc21fe..b1c5521ae7 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyHiveSortedInputFormatUsedHook.java +++ itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyHiveSortedInputFormatUsedHook.java @@ -20,7 +20,7 @@ import java.io.Serializable; import java.util.ArrayList; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.ql.exec.Task; import org.apache.hadoop.hive.ql.hooks.HookContext.HookType; diff --git itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyHooksRunInOrder.java itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyHooksRunInOrder.java index 5af5049168..623d845677 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyHooksRunInOrder.java +++ itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyHooksRunInOrder.java @@ -20,7 +20,7 @@ import java.io.Serializable; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.ql.HiveDriverRunHook; import org.apache.hadoop.hive.ql.HiveDriverRunHookContext; diff --git itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyIsLocalModeHook.java itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyIsLocalModeHook.java index 1c455968af..a9f88a527a 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyIsLocalModeHook.java +++ itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyIsLocalModeHook.java @@ -19,7 +19,7 @@ import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.ql.exec.Task; import org.apache.hadoop.hive.ql.exec.TaskRunner; diff --git itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyNumReducersHook.java itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyNumReducersHook.java index a9a25f82c0..ef8d584784 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyNumReducersHook.java +++ itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyNumReducersHook.java @@ -19,7 +19,7 @@ import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.ql.MapRedStats; diff --git itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyPartitionIsNotSubdirectoryOfTableHook.java itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyPartitionIsNotSubdirectoryOfTableHook.java index 495ce6ded2..7155588390 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyPartitionIsNotSubdirectoryOfTableHook.java +++ itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyPartitionIsNotSubdirectoryOfTableHook.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hive.ql.hooks; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.ql.metadata.Partition; import org.apache.hadoop.hive.ql.metadata.Table; diff --git itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyPartitionIsSubdirectoryOfTableHook.java itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyPartitionIsSubdirectoryOfTableHook.java index 0f1569b3fa..b8c4cd2cee 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyPartitionIsSubdirectoryOfTableHook.java +++ itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyPartitionIsSubdirectoryOfTableHook.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hive.ql.hooks; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.ql.metadata.Partition; import org.apache.hadoop.hive.ql.metadata.Table; diff --git ql/src/test/org/apache/hadoop/hive/ql/TestErrorMsg.java ql/src/test/org/apache/hadoop/hive/ql/TestErrorMsg.java index 90707e10c3..8774ccafc4 100644 --- ql/src/test/org/apache/hadoop/hive/ql/TestErrorMsg.java +++ ql/src/test/org/apache/hadoop/hive/ql/TestErrorMsg.java @@ -21,7 +21,7 @@ import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.apache.hadoop.hive.common.JavaUtils; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinEqualityTableContainer.java ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinEqualityTableContainer.java index 05797be1c1..3f4a468ecd 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinEqualityTableContainer.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinEqualityTableContainer.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.Map.Entry; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.io.Text; import org.junit.Before; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinKey.java ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinKey.java index 0239020ed5..ede355d2e7 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinKey.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinKey.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hive.ql.exec.persistence; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.io.Text; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinRowContainer.java ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinRowContainer.java index 9e8e7db51e..93293bc437 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinRowContainer.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinRowContainer.java @@ -19,7 +19,7 @@ import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.serde2.io.ShortWritable; import org.apache.hadoop.io.Text; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinTableContainer.java ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinTableContainer.java index 429abd9d9c..381d720a00 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinTableContainer.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinTableContainer.java @@ -23,7 +23,7 @@ import java.io.ObjectOutputStream; import java.util.Properties; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.serde.serdeConstants; import org.apache.hadoop.hive.serde2.SerDeUtils; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/Utilities.java ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/Utilities.java index 2100da111d..538a348bfb 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/Utilities.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/Utilities.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Properties; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.ql.metadata.HiveException; import org.apache.hadoop.hive.serde.serdeConstants; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorFilterOperator.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorFilterOperator.java index c427f1f51a..2e601d6fda 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorFilterOperator.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorFilterOperator.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.ql.CompilationOpContext; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorLimitOperator.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorLimitOperator.java index d515437a62..7231217988 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorLimitOperator.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorLimitOperator.java @@ -20,7 +20,7 @@ import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hive.ql.CompilationOpContext; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorizedRowBatch.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorizedRowBatch.java index 9b132c4794..258b47bbec 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorizedRowBatch.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorizedRowBatch.java @@ -20,7 +20,7 @@ import java.util.Random; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; /** diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/aggregation/AggregationBase.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/aggregation/AggregationBase.java index f75ab37e9d..aa6e127aa0 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/aggregation/AggregationBase.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/aggregation/AggregationBase.java @@ -54,7 +54,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; -import junit.framework.Assert; +import org.junit.Assert; public class AggregationBase { diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/aggregation/TestVectorAggregation.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/aggregation/TestVectorAggregation.java index 211eaa2484..65ecc70e3b 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/aggregation/TestVectorAggregation.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/aggregation/TestVectorAggregation.java @@ -51,7 +51,7 @@ import org.apache.hadoop.hive.serde2.io.HiveDecimalWritable; import org.apache.hadoop.hive.serde2.io.ShortWritable; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestDecimalUtil.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestDecimalUtil.java index 100f159ec7..5404d6ce06 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestDecimalUtil.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestDecimalUtil.java @@ -18,7 +18,7 @@ package org.apache.hadoop.hive.ql.exec.vector.expressions; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.common.type.HiveDecimal; import org.apache.hadoop.hive.ql.exec.vector.DecimalColumnVector; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmetic.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmetic.java index 1329d794da..f44c5f3b5d 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmetic.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmetic.java @@ -68,7 +68,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmeticExpressions.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmeticExpressions.java index a716224cfe..703b1dc600 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmeticExpressions.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmeticExpressions.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertNull; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.common.type.HiveDecimal; import org.apache.hadoop.hive.ql.exec.vector.DecimalColumnVector; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorBetweenIn.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorBetweenIn.java index 3f09cb1c39..6b521bf18f 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorBetweenIn.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorBetweenIn.java @@ -81,7 +81,7 @@ import org.apache.hadoop.io.WritableComparator; import org.apache.hadoop.io.WritableComparable; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorCastStatement.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorCastStatement.java index 8a68506208..a8ffe1f8fa 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorCastStatement.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorCastStatement.java @@ -58,7 +58,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; import org.apache.hadoop.io.LongWritable; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorCoalesceElt.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorCoalesceElt.java index d367fb9aff..86c0fb33c8 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorCoalesceElt.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorCoalesceElt.java @@ -56,7 +56,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; import org.apache.hadoop.io.IntWritable; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateAddSub.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateAddSub.java index b0e4b264ee..2c439bf55e 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateAddSub.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateAddSub.java @@ -57,7 +57,7 @@ import org.apache.hadoop.hive.serde2.io.ShortWritable; import org.apache.hadoop.io.IntWritable; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateDiff.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateDiff.java index d89299cfe8..32c564962c 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateDiff.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateDiff.java @@ -59,7 +59,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; import org.apache.hadoop.hive.serde2.io.ShortWritable; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorExpressionWriters.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorExpressionWriters.java index aa913447d5..da580556b5 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorExpressionWriters.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorExpressionWriters.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Random; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.apache.hadoop.hive.common.type.HiveDecimal; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorFilterCompare.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorFilterCompare.java index abdbc1cf23..d5824a6f47 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorFilterCompare.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorFilterCompare.java @@ -73,7 +73,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.VarcharTypeInfo; import org.apache.hadoop.io.BooleanWritable; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIfStatement.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIfStatement.java index ce66e2b195..cbee1eefda 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIfStatement.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIfStatement.java @@ -54,7 +54,7 @@ import org.apache.hadoop.io.BooleanWritable; import org.apache.hadoop.io.LongWritable; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIndex.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIndex.java index 9a49088962..d18d8fb3ee 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIndex.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIndex.java @@ -62,7 +62,7 @@ import org.apache.hadoop.io.WritableComparator; import org.apache.hadoop.io.WritableComparable; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorMathFunctions.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorMathFunctions.java index e127d42bf8..072ad7042b 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorMathFunctions.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorMathFunctions.java @@ -22,7 +22,7 @@ import java.util.Arrays; import java.util.Random; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.serde2.RandomTypeUtil; import org.apache.hadoop.hive.common.type.Timestamp; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNegative.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNegative.java index a3f665b864..af5887c098 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNegative.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNegative.java @@ -62,7 +62,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNull.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNull.java index 06d8fc8559..daa76fd0e3 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNull.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNull.java @@ -62,7 +62,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; import org.apache.hadoop.io.BooleanWritable; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorScalarColArithmetic.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorScalarColArithmetic.java index a246a4584d..59df777404 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorScalarColArithmetic.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorScalarColArithmetic.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.ql.exec.vector.DoubleColumnVector; import org.apache.hadoop.hive.ql.exec.vector.LongColumnVector; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringConcat.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringConcat.java index bb41c4f07b..bcedf9bfe8 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringConcat.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringConcat.java @@ -67,7 +67,7 @@ import org.apache.hadoop.io.IntWritable; import org.apache.hadoop.io.LongWritable; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java index 407ce04e4f..c16bea57f4 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java @@ -25,7 +25,7 @@ import java.util.Random; import java.util.StringTokenizer; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.commons.codec.binary.Hex; import org.apache.hadoop.hive.common.type.HiveChar; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringUnary.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringUnary.java index 4099b45a61..cb88d87cb4 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringUnary.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringUnary.java @@ -58,7 +58,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStructField.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStructField.java index 50629973fa..00f7868e1a 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStructField.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStructField.java @@ -65,7 +65,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorSubStr.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorSubStr.java index 2997dcdbb5..291cb2bbab 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorSubStr.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorSubStr.java @@ -59,7 +59,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils; import org.apache.hadoop.io.IntWritable; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExpressions.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExpressions.java index 650bac4703..74f4ad9d21 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExpressions.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExpressions.java @@ -29,7 +29,7 @@ import java.util.Random; import java.util.TimeZone; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.ql.udf.UDFDayOfMonth; import org.apache.hadoop.hive.ql.udf.UDFHour; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExtract.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExtract.java index 21109f3461..c3c5cb2e41 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExtract.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExtract.java @@ -18,7 +18,7 @@ package org.apache.hadoop.hive.ql.exec.vector.expressions; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.common.type.DataTypePhysicalVariation; import org.apache.hadoop.hive.conf.HiveConf; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java index e9be8c1d9f..3107b4edc8 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java @@ -27,7 +27,7 @@ import java.util.Random; import java.util.concurrent.TimeUnit; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.common.type.DataTypePhysicalVariation; import org.apache.hadoop.hive.common.type.HiveDecimal; diff --git ql/src/test/org/apache/hadoop/hive/ql/exec/vector/mapjoin/TestMapJoinOperator.java ql/src/test/org/apache/hadoop/hive/ql/exec/vector/mapjoin/TestMapJoinOperator.java index a37b5a07fb..c4dc547c38 100644 --- ql/src/test/org/apache/hadoop/hive/ql/exec/vector/mapjoin/TestMapJoinOperator.java +++ ql/src/test/org/apache/hadoop/hive/ql/exec/vector/mapjoin/TestMapJoinOperator.java @@ -118,7 +118,7 @@ import java.util.SortedMap; import java.util.TreeMap; -import junit.framework.Assert; +import org.junit.Assert; public class TestMapJoinOperator { diff --git ql/src/test/org/apache/hadoop/hive/ql/io/TestHiveBinarySearchRecordReader.java ql/src/test/org/apache/hadoop/hive/ql/io/TestHiveBinarySearchRecordReader.java index 2a47abfab1..1e46c60df9 100644 --- ql/src/test/org/apache/hadoop/hive/ql/io/TestHiveBinarySearchRecordReader.java +++ ql/src/test/org/apache/hadoop/hive/ql/io/TestHiveBinarySearchRecordReader.java @@ -28,7 +28,7 @@ import java.io.IOException; import java.util.LinkedHashMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.apache.hadoop.fs.Path; diff --git ql/src/test/org/apache/hadoop/hive/ql/io/TestStorageFormatDescriptor.java ql/src/test/org/apache/hadoop/hive/ql/io/TestStorageFormatDescriptor.java index 86d37031ea..b9fc7ea940 100644 --- ql/src/test/org/apache/hadoop/hive/ql/io/TestStorageFormatDescriptor.java +++ ql/src/test/org/apache/hadoop/hive/ql/io/TestStorageFormatDescriptor.java @@ -18,7 +18,7 @@ package org.apache.hadoop.hive.ql.io; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestVectorizedORCReader.java ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestVectorizedORCReader.java index aa99e579e7..913090f2be 100644 --- ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestVectorizedORCReader.java +++ ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestVectorizedORCReader.java @@ -22,7 +22,7 @@ import java.time.LocalDateTime; import java.util.Random; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; diff --git ql/src/test/org/apache/hadoop/hive/ql/io/parquet/serde/TestParquetTimestampUtils.java ql/src/test/org/apache/hadoop/hive/ql/io/parquet/serde/TestParquetTimestampUtils.java index 477825e3f4..b9ab424190 100644 --- ql/src/test/org/apache/hadoop/hive/ql/io/parquet/serde/TestParquetTimestampUtils.java +++ ql/src/test/org/apache/hadoop/hive/ql/io/parquet/serde/TestParquetTimestampUtils.java @@ -22,7 +22,7 @@ import org.apache.hadoop.hive.ql.io.parquet.timestamp.NanoTime; import org.apache.hadoop.hive.ql.io.parquet.timestamp.NanoTimeUtils; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; diff --git ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestHiveLockObject.java ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestHiveLockObject.java index 305ee7b629..52f86bb095 100644 --- ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestHiveLockObject.java +++ ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestHiveLockObject.java @@ -18,7 +18,7 @@ package org.apache.hadoop.hive.ql.lockmgr; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.ql.lockmgr.HiveLockObject.HiveLockObjectData; diff --git ql/src/test/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/TestListBucketingPrunner.java ql/src/test/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/TestListBucketingPrunner.java index af219dff5e..de65ec4a3d 100644 --- ql/src/test/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/TestListBucketingPrunner.java +++ ql/src/test/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/TestListBucketingPrunner.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hive.ql.optimizer.listbucketingpruner; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/parse/TestMacroSemanticAnalyzer.java ql/src/test/org/apache/hadoop/hive/ql/parse/TestMacroSemanticAnalyzer.java index 0334cf2c76..2189ad6bee 100644 --- ql/src/test/org/apache/hadoop/hive/ql/parse/TestMacroSemanticAnalyzer.java +++ ql/src/test/org/apache/hadoop/hive/ql/parse/TestMacroSemanticAnalyzer.java @@ -30,7 +30,7 @@ import org.junit.Before; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; public class TestMacroSemanticAnalyzer { diff --git ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBCompact.java ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBCompact.java index 9a45ccb15f..90df85c58e 100644 --- ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBCompact.java +++ ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBCompact.java @@ -38,7 +38,7 @@ import org.junit.BeforeClass; import org.junit.Test; -import junit.framework.Assert; +import org.junit.Assert; /** * Tests for parsing and semantic analysis of ALTER TABLE ... compact. diff --git ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBJoinTreeApplyPredicate.java ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBJoinTreeApplyPredicate.java index 5e4455c25d..cd246dec90 100644 --- ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBJoinTreeApplyPredicate.java +++ ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBJoinTreeApplyPredicate.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.ql.QueryState; diff --git ql/src/test/org/apache/hadoop/hive/ql/parse/TestSemanticAnalyzerFactory.java ql/src/test/org/apache/hadoop/hive/ql/parse/TestSemanticAnalyzerFactory.java index 8338201454..1db5a00336 100644 --- ql/src/test/org/apache/hadoop/hive/ql/parse/TestSemanticAnalyzerFactory.java +++ ql/src/test/org/apache/hadoop/hive/ql/parse/TestSemanticAnalyzerFactory.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hive.ql.parse; -import junit.framework.Assert; +import org.junit.Assert; import org.antlr.runtime.CommonToken; import org.apache.hadoop.hive.conf.HiveConf; diff --git ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/AuthorizationTestUtil.java ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/AuthorizationTestUtil.java index 40753b6f93..fed0d0116e 100644 --- ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/AuthorizationTestUtil.java +++ ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/AuthorizationTestUtil.java @@ -29,7 +29,7 @@ import org.apache.hadoop.hive.ql.plan.DDLWork; import org.apache.hadoop.hive.ql.session.SessionState; -import junit.framework.Assert; +import org.junit.Assert; /** * Util function for authorization tests diff --git ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/ListSizeMatcher.java ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/ListSizeMatcher.java index 08ab741ad3..c8879dc3ac 100644 --- ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/ListSizeMatcher.java +++ ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/ListSizeMatcher.java @@ -19,7 +19,7 @@ import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; public class ListSizeMatcher { private final List list; diff --git ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/PrivilegesTestBase.java ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/PrivilegesTestBase.java index ff41919eeb..a15fd5d0c0 100644 --- ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/PrivilegesTestBase.java +++ ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/PrivilegesTestBase.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hive.ql.parse.authorization; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.api.PrincipalType; diff --git ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/TestSessionUserName.java ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/TestSessionUserName.java index 2c8c45e49d..61d755d2fd 100644 --- ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/TestSessionUserName.java +++ ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/TestSessionUserName.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hive.ql.parse.authorization; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.hive.metastore.api.MetaException; diff --git ql/src/test/org/apache/hadoop/hive/ql/plan/TestConditionalResolverCommonJoin.java ql/src/test/org/apache/hadoop/hive/ql/plan/TestConditionalResolverCommonJoin.java index ab42f611a7..6ee74ca257 100644 --- ql/src/test/org/apache/hadoop/hive/ql/plan/TestConditionalResolverCommonJoin.java +++ ql/src/test/org/apache/hadoop/hive/ql/plan/TestConditionalResolverCommonJoin.java @@ -18,7 +18,7 @@ package org.apache.hadoop.hive.ql.plan; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hive.conf.HiveConf; diff --git ql/src/test/org/apache/hadoop/hive/ql/plan/TestCreateMacroDesc.java ql/src/test/org/apache/hadoop/hive/ql/plan/TestCreateMacroDesc.java index 8fa31fd703..48906f70dd 100644 --- ql/src/test/org/apache/hadoop/hive/ql/plan/TestCreateMacroDesc.java +++ ql/src/test/org/apache/hadoop/hive/ql/plan/TestCreateMacroDesc.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo; import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory; diff --git ql/src/test/org/apache/hadoop/hive/ql/plan/TestDropMacroDesc.java ql/src/test/org/apache/hadoop/hive/ql/plan/TestDropMacroDesc.java index 929a141c9d..2ee27dc89b 100644 --- ql/src/test/org/apache/hadoop/hive/ql/plan/TestDropMacroDesc.java +++ ql/src/test/org/apache/hadoop/hive/ql/plan/TestDropMacroDesc.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hive.ql.plan; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/plan/TestTezWork.java ql/src/test/org/apache/hadoop/hive/ql/plan/TestTezWork.java index 66d7227874..91b1dece53 100644 --- ql/src/test/org/apache/hadoop/hive/ql/plan/TestTezWork.java +++ ql/src/test/org/apache/hadoop/hive/ql/plan/TestTezWork.java @@ -20,7 +20,7 @@ import java.util.LinkedList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.ql.plan.TezEdgeProperty.EdgeType; import org.apache.hadoop.mapred.JobConf; diff --git ql/src/test/org/apache/hadoop/hive/ql/processors/TestCompileProcessor.java ql/src/test/org/apache/hadoop/hive/ql/processors/TestCompileProcessor.java index 14f02b2134..d1ffc1bfba 100644 --- ql/src/test/org/apache/hadoop/hive/ql/processors/TestCompileProcessor.java +++ ql/src/test/org/apache/hadoop/hive/ql/processors/TestCompileProcessor.java @@ -20,7 +20,7 @@ import java.io.File; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git ql/src/test/org/apache/hadoop/hive/ql/testutil/OperatorTestUtils.java ql/src/test/org/apache/hadoop/hive/ql/testutil/OperatorTestUtils.java index 66767911fe..4de9f19f5d 100644 --- ql/src/test/org/apache/hadoop/hive/ql/testutil/OperatorTestUtils.java +++ ql/src/test/org/apache/hadoop/hive/ql/testutil/OperatorTestUtils.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.ql.exec.CollectOperator; import org.apache.hadoop.hive.ql.exec.Operator; diff --git ql/src/test/org/apache/hadoop/hive/ql/udaf/TestStreamingSum.java ql/src/test/org/apache/hadoop/hive/ql/udaf/TestStreamingSum.java index 8e2254d53b..1eda6c3e3f 100644 --- ql/src/test/org/apache/hadoop/hive/ql/udaf/TestStreamingSum.java +++ ql/src/test/org/apache/hadoop/hive/ql/udaf/TestStreamingSum.java @@ -22,7 +22,7 @@ import java.util.Iterator; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.common.type.HiveDecimal; import org.apache.hadoop.hive.ql.metadata.HiveException; diff --git ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFMacro.java ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFMacro.java index 73672e3e78..9347c490bc 100644 --- ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFMacro.java +++ ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFMacro.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.ql.plan.ExprNodeConstantDesc; import org.apache.hadoop.hive.ql.udf.generic.GenericUDF.DeferredJavaObject; diff --git ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFRound.java ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFRound.java index cc4f7bdb74..c1beed6fec 100644 --- ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFRound.java +++ ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFRound.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.hive.common.type.HiveDecimal; import org.apache.hadoop.hive.ql.exec.UDFArgumentException; diff --git serde/src/test/org/apache/hadoop/hive/serde2/columnar/TestLazyBinaryColumnarSerDe.java serde/src/test/org/apache/hadoop/hive/serde2/columnar/TestLazyBinaryColumnarSerDe.java index 08c7977c4c..6838138b1f 100644 --- serde/src/test/org/apache/hadoop/hive/serde2/columnar/TestLazyBinaryColumnarSerDe.java +++ serde/src/test/org/apache/hadoop/hive/serde2/columnar/TestLazyBinaryColumnarSerDe.java @@ -25,7 +25,7 @@ import java.util.Properties; import java.util.TreeMap; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.apache.hadoop.conf.Configuration; diff --git service/src/test/org/apache/hive/service/cli/TestHiveSQLException.java service/src/test/org/apache/hive/service/cli/TestHiveSQLException.java index ac7fec0304..39a71b0cc4 100644 --- service/src/test/org/apache/hive/service/cli/TestHiveSQLException.java +++ service/src/test/org/apache/hive/service/cli/TestHiveSQLException.java @@ -20,7 +20,7 @@ import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.commons.lang.StringUtils; import org.apache.hive.service.rpc.thrift.TStatus; diff --git service/src/test/org/apache/hive/service/cli/session/TestSessionHooks.java service/src/test/org/apache/hive/service/cli/session/TestSessionHooks.java index 5cbb0bfa6b..6daf7574de 100644 --- service/src/test/org/apache/hive/service/cli/session/TestSessionHooks.java +++ service/src/test/org/apache/hive/service/cli/session/TestSessionHooks.java @@ -23,7 +23,7 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.Assert; +import org.junit.Assert; import junit.framework.TestCase; import org.apache.hadoop.hive.conf.HiveConf; diff --git storage-api/src/test/org/apache/hadoop/hive/common/TestValidReadTxnList.java storage-api/src/test/org/apache/hadoop/hive/common/TestValidReadTxnList.java index f270eb8570..1a28afc76d 100644 --- storage-api/src/test/org/apache/hadoop/hive/common/TestValidReadTxnList.java +++ storage-api/src/test/org/apache/hadoop/hive/common/TestValidReadTxnList.java @@ -17,7 +17,7 @@ */ package org.apache.hadoop.hive.common; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hadoop.conf.Configuration; import org.junit.Test; diff --git testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestExecutor.java testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestExecutor.java index a4a789b579..70b3ea2bfc 100644 --- testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestExecutor.java +++ testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestExecutor.java @@ -29,7 +29,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hive.ptest.api.Status; import org.apache.hive.ptest.api.request.TestStartRequest; diff --git testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestLogger.java testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestLogger.java index 5f6ae7278a..e24d34e9ec 100644 --- testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestLogger.java +++ testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestLogger.java @@ -24,7 +24,7 @@ import java.io.PrintStream; import java.io.StringReader; -import junit.framework.Assert; +import org.junit.Assert; import com.google.common.base.Charsets; diff --git testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/AbstractTestPhase.java testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/AbstractTestPhase.java index 71e1a64224..00ad4d40c9 100644 --- testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/AbstractTestPhase.java +++ testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/AbstractTestPhase.java @@ -27,7 +27,7 @@ import java.util.List; import java.util.concurrent.Executors; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hive.ptest.api.server.TestLogger; import org.apache.hive.ptest.execution.conf.Host; diff --git testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.java testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.java index 8964453d8b..e7ced3df2e 100644 --- testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.java +++ testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.java @@ -31,7 +31,7 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.commons.io.FileUtils; import org.apache.hive.ptest.execution.conf.Host; diff --git testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestJIRAService.java testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestJIRAService.java index 0ea51b7add..2dab3ab32e 100644 --- testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestJIRAService.java +++ testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestJIRAService.java @@ -28,7 +28,7 @@ import java.util.TreeSet; import com.google.common.io.Resources; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hive.ptest.execution.JIRAService.BuildInfo; import org.apache.hive.ptest.execution.conf.Context; diff --git testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLocalCommand.java testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLocalCommand.java index 94f5a74188..c3f81f8762 100644 --- testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLocalCommand.java +++ testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLocalCommand.java @@ -18,7 +18,7 @@ */ package org.apache.hive.ptest.execution; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; import org.slf4j.Logger; diff --git testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLogDirectoryCleaner.java testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLogDirectoryCleaner.java index 3023398a75..6ea940dfd0 100644 --- testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLogDirectoryCleaner.java +++ testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLogDirectoryCleaner.java @@ -22,7 +22,7 @@ import java.util.Collections; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hive.ptest.execution.LogDirectoryCleaner; import org.junit.Rule; diff --git testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPhase.java testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPhase.java index 169e03289d..ea1b3a211b 100644 --- testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPhase.java +++ testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPhase.java @@ -22,7 +22,7 @@ import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hive.ptest.execution.ssh.NonZeroExitCodeException; import org.approvaltests.Approvals; diff --git testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestReportParser.java testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestReportParser.java index d6a75153d7..0af8aec9f6 100644 --- testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestReportParser.java +++ testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestReportParser.java @@ -20,7 +20,7 @@ import java.io.File; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.commons.io.FileUtils; import org.junit.After; diff --git testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestQFileTestBatch.java testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestQFileTestBatch.java index c419a8257d..e7cdf1414e 100644 --- testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestQFileTestBatch.java +++ testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestQFileTestBatch.java @@ -21,7 +21,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestConfiguration.java testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestConfiguration.java index 360f868c3e..6ca3042f5c 100644 --- testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestConfiguration.java +++ testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestConfiguration.java @@ -21,7 +21,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.io.Resources; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hive.ptest.execution.PTest; import org.apache.hive.ptest.execution.context.ExecutionContext; import org.junit.Test; diff --git testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestParser.java testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestParser.java index bbf3226c29..f52a9cdf7f 100644 --- testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestParser.java +++ testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestParser.java @@ -25,7 +25,7 @@ import java.util.Properties; import java.util.concurrent.atomic.AtomicInteger; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.commons.io.FileUtils; import org.apache.hive.ptest.execution.Dirs; diff --git testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/TestCloudExecutionContextProvider.java testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/TestCloudExecutionContextProvider.java index 35a669f79f..4985b7d4e6 100644 --- testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/TestCloudExecutionContextProvider.java +++ testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/TestCloudExecutionContextProvider.java @@ -25,7 +25,7 @@ import java.util.Collections; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hive.ptest.execution.MockSSHCommandExecutor; import org.apache.hive.ptest.execution.conf.Host; diff --git testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestRSyncCommandExecutor.java testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestRSyncCommandExecutor.java index cad1577138..450ace2cd6 100644 --- testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestRSyncCommandExecutor.java +++ testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestRSyncCommandExecutor.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hive.ptest.execution.Constants; import org.apache.hive.ptest.execution.LocalCommand; diff --git testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestSSHCommandExecutor.java testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestSSHCommandExecutor.java index 9499797887..39907cd3fe 100644 --- testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestSSHCommandExecutor.java +++ testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestSSHCommandExecutor.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import junit.framework.Assert; +import org.junit.Assert; import org.apache.hive.ptest.execution.Constants; import org.apache.hive.ptest.execution.LocalCommand;