You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by pv...@apache.org on 2019/03/29 08:51:45 UTC
[hive] branch master updated: HIVE-21467: Remove deprecated
junit.framework.Assert imports (Laszlo Bodor reviewed by Peter Vary)
This is an automated email from the ASF dual-hosted git repository.
pvary pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new 9226dfe HIVE-21467: Remove deprecated junit.framework.Assert imports (Laszlo Bodor reviewed by Peter Vary)
9226dfe is described below
commit 9226dfe7dcaae52cbf477983a21b588b49b8a85b
Author: Laszlo Bodor <bo...@gmail.com>
AuthorDate: Fri Mar 29 09:51:12 2019 +0100
HIVE-21467: Remove deprecated junit.framework.Assert imports (Laszlo Bodor reviewed by Peter Vary)
---
.../hive/beeline/TestBeeLineExceptionHandling.java | 2 +-
.../org/apache/hive/beeline/TestBeeLineOpts.java | 2 +-
.../hive/beeline/TestClientCommandHookFactory.java | 2 +-
.../hadoop/hive/conf/TestVariableSubstitution.java | 2 +-
.../apache/hadoop/hive/hbase/TestHBaseSerDe.java | 2 +-
.../hive/hcatalog/data/TestDefaultHCatRecord.java | 2 +-
.../hive/hcatalog/data/TestHCatRecordSerDe.java | 2 +-
.../hive/hcatalog/mapreduce/HCatMapReduceTest.java | 2 +-
.../mapreduce/TestHCatDynamicPartitioned.java | 2 +-
.../hcatalog/mapreduce/TestHCatInputFormat.java | 2 +-
.../mapreduce/TestHCatInputFormatMethods.java | 2 +-
.../mapreduce/TestHCatPartitionPublish.java | 2 +-
.../hive/hcatalog/mapreduce/TestInputJobInfo.java | 2 +-
.../apache/hive/hcatalog/pig/TestPigHCatUtil.java | 2 +-
.../streaming/TestDelimitedInputWriter.java | 2 +-
.../hive/hcatalog/templeton/TestWebHCatE2e.java | 2 +-
.../hcatalog/templeton/tool/TestJobIDParser.java | 2 +-
.../mapreduce/TestHCatHiveCompatibility.java | 2 +-
.../mapreduce/TestHCatHiveThriftCompatibility.java | 2 +-
.../java/org/apache/hive/jdbc/TestNoSaslAuth.java | 2 +-
.../service/auth/TestCustomAuthentication.java | 2 +-
.../hadoop/hive/ql/hooks/ShowMapredStatsHook.java | 2 +-
.../ql/hooks/VerifyContentSummaryCacheHook.java | 2 +-
.../hooks/VerifyHiveSortedInputFormatUsedHook.java | 2 +-
.../hive/ql/hooks/VerifyHooksRunInOrder.java | 2 +-
.../hive/ql/hooks/VerifyIsLocalModeHook.java | 2 +-
.../hive/ql/hooks/VerifyNumReducersHook.java | 2 +-
...erifyPartitionIsNotSubdirectoryOfTableHook.java | 2 +-
.../VerifyPartitionIsSubdirectoryOfTableHook.java | 2 +-
.../org/apache/hadoop/hive/ql/TestErrorMsg.java | 2 +-
.../TestMapJoinEqualityTableContainer.java | 2 +-
.../hive/ql/exec/persistence/TestMapJoinKey.java | 2 +-
.../exec/persistence/TestMapJoinRowContainer.java | 2 +-
.../persistence/TestMapJoinTableContainer.java | 2 +-
.../hadoop/hive/ql/exec/persistence/Utilities.java | 2 +-
.../ql/exec/vector/TestVectorFilterOperator.java | 2 +-
.../ql/exec/vector/TestVectorLimitOperator.java | 2 +-
.../ql/exec/vector/TestVectorizedRowBatch.java | 2 +-
.../exec/vector/aggregation/AggregationBase.java | 2 +-
.../vector/aggregation/TestVectorAggregation.java | 2 +-
.../exec/vector/expressions/TestDecimalUtil.java | 2 +-
.../vector/expressions/TestVectorArithmetic.java | 2 +-
.../TestVectorArithmeticExpressions.java | 2 +-
.../vector/expressions/TestVectorBetweenIn.java | 2 +-
.../expressions/TestVectorCastStatement.java | 2 +-
.../vector/expressions/TestVectorCoalesceElt.java | 2 +-
.../vector/expressions/TestVectorDateAddSub.java | 2 +-
.../vector/expressions/TestVectorDateDiff.java | 2 +-
.../expressions/TestVectorExpressionWriters.java | 2 +-
.../expressions/TestVectorFilterCompare.java | 2 +-
.../vector/expressions/TestVectorIfStatement.java | 2 +-
.../exec/vector/expressions/TestVectorIndex.java | 2 +-
.../expressions/TestVectorMathFunctions.java | 64 +++++++++++-----------
.../vector/expressions/TestVectorNegative.java | 2 +-
.../ql/exec/vector/expressions/TestVectorNull.java | 2 +-
.../expressions/TestVectorScalarColArithmetic.java | 2 +-
.../vector/expressions/TestVectorStringConcat.java | 2 +-
.../expressions/TestVectorStringExpressions.java | 2 +-
.../vector/expressions/TestVectorStringUnary.java | 2 +-
.../vector/expressions/TestVectorStructField.java | 2 +-
.../exec/vector/expressions/TestVectorSubStr.java | 2 +-
.../TestVectorTimestampExpressions.java | 2 +-
.../expressions/TestVectorTimestampExtract.java | 2 +-
.../vector/expressions/TestVectorTypeCasts.java | 10 ++--
.../exec/vector/mapjoin/TestMapJoinOperator.java | 2 +-
.../ql/io/TestHiveBinarySearchRecordReader.java | 2 +-
.../hive/ql/io/TestStorageFormatDescriptor.java | 2 +-
.../hive/ql/io/orc/TestVectorizedORCReader.java | 2 +-
.../parquet/serde/TestParquetTimestampUtils.java | 2 +-
.../hadoop/hive/ql/lockmgr/TestHiveLockObject.java | 2 +-
.../TestListBucketingPrunner.java | 2 +-
.../hive/ql/parse/TestMacroSemanticAnalyzer.java | 2 +-
.../apache/hadoop/hive/ql/parse/TestQBCompact.java | 2 +-
.../ql/parse/TestQBJoinTreeApplyPredicate.java | 2 +-
.../hive/ql/parse/TestSemanticAnalyzerFactory.java | 2 +-
.../parse/authorization/AuthorizationTestUtil.java | 2 +-
.../ql/parse/authorization/ListSizeMatcher.java | 2 +-
.../ql/parse/authorization/PrivilegesTestBase.java | 2 +-
.../parse/authorization/TestSessionUserName.java | 2 +-
.../ql/plan/TestConditionalResolverCommonJoin.java | 2 +-
.../hadoop/hive/ql/plan/TestCreateMacroDesc.java | 2 +-
.../hadoop/hive/ql/plan/TestDropMacroDesc.java | 2 +-
.../apache/hadoop/hive/ql/plan/TestTezWork.java | 2 +-
.../hive/ql/processors/TestCompileProcessor.java | 2 +-
.../hadoop/hive/ql/testutil/OperatorTestUtils.java | 2 +-
.../hadoop/hive/ql/udaf/TestStreamingSum.java | 2 +-
.../hive/ql/udf/generic/TestGenericUDFMacro.java | 2 +-
.../hive/ql/udf/generic/TestGenericUDFRound.java | 2 +-
.../columnar/TestLazyBinaryColumnarSerDe.java | 2 +-
.../hive/service/cli/TestHiveSQLException.java | 2 +-
.../hive/service/cli/session/TestSessionHooks.java | 2 +-
.../hadoop/hive/common/TestValidReadTxnList.java | 2 +-
.../hive/ptest/api/server/TestTestExecutor.java | 2 +-
.../hive/ptest/api/server/TestTestLogger.java | 2 +-
.../hive/ptest/execution/AbstractTestPhase.java | 2 +-
.../hive/ptest/execution/TestHostExecutor.java | 2 +-
.../hive/ptest/execution/TestJIRAService.java | 2 +-
.../hive/ptest/execution/TestLocalCommand.java | 2 +-
.../ptest/execution/TestLogDirectoryCleaner.java | 2 +-
.../org/apache/hive/ptest/execution/TestPhase.java | 2 +-
.../hive/ptest/execution/TestReportParser.java | 2 +-
.../ptest/execution/conf/TestQFileTestBatch.java | 2 +-
.../execution/conf/TestTestConfiguration.java | 2 +-
.../hive/ptest/execution/conf/TestTestParser.java | 2 +-
.../context/TestCloudExecutionContextProvider.java | 2 +-
.../execution/ssh/TestRSyncCommandExecutor.java | 2 +-
.../execution/ssh/TestSSHCommandExecutor.java | 2 +-
107 files changed, 142 insertions(+), 142 deletions(-)
diff --git a/beeline/src/test/org/apache/hive/beeline/TestBeeLineExceptionHandling.java b/beeline/src/test/org/apache/hive/beeline/TestBeeLineExceptionHandling.java
index 65fafc4..14124b0 100644
--- a/beeline/src/test/org/apache/hive/beeline/TestBeeLineExceptionHandling.java
+++ b/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 a/beeline/src/test/org/apache/hive/beeline/TestBeeLineOpts.java b/beeline/src/test/org/apache/hive/beeline/TestBeeLineOpts.java
index 80d79d8..5c0c970 100644
--- a/beeline/src/test/org/apache/hive/beeline/TestBeeLineOpts.java
+++ b/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 a/beeline/src/test/org/apache/hive/beeline/TestClientCommandHookFactory.java b/beeline/src/test/org/apache/hive/beeline/TestClientCommandHookFactory.java
index f4f9efb..34f628e 100644
--- a/beeline/src/test/org/apache/hive/beeline/TestClientCommandHookFactory.java
+++ b/beeline/src/test/org/apache/hive/beeline/TestClientCommandHookFactory.java
@@ -22,7 +22,7 @@ import static org.mockito.Mockito.when;
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 a/common/src/test/org/apache/hadoop/hive/conf/TestVariableSubstitution.java b/common/src/test/org/apache/hadoop/hive/conf/TestVariableSubstitution.java
index 683736f..e13e5d4 100644
--- a/common/src/test/org/apache/hadoop/hive/conf/TestVariableSubstitution.java
+++ b/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 a/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java b/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java
index de1e858..59468fe 100644
--- a/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java
+++ b/hbase-handler/src/test/org/apache/hadoop/hive/hbase/TestHBaseSerDe.java
@@ -27,7 +27,7 @@ import java.util.List;
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 a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestDefaultHCatRecord.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestDefaultHCatRecord.java
index b9d3f64..4c34211 100644
--- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestDefaultHCatRecord.java
+++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestDefaultHCatRecord.java
@@ -44,7 +44,7 @@ import org.apache.hive.hcatalog.common.HCatException;
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 a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestHCatRecordSerDe.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestHCatRecordSerDe.java
index 5971590..e235b2e 100644
--- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestHCatRecordSerDe.java
+++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/data/TestHCatRecordSerDe.java
@@ -25,7 +25,7 @@ import java.util.Map;
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 a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java
index e16674d..983a66a 100644
--- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java
+++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java
@@ -63,7 +63,7 @@ import org.apache.hive.hcatalog.data.HCatRecord;
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 a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatDynamicPartitioned.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatDynamicPartitioned.java
index 34ae5fb..fbb11f2 100644
--- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatDynamicPartitioned.java
+++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatDynamicPartitioned.java
@@ -23,7 +23,7 @@ import java.io.IOException;
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 a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatInputFormat.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatInputFormat.java
index 2fa43d7..6f61dd3 100644
--- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatInputFormat.java
+++ b/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 a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatInputFormatMethods.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatInputFormatMethods.java
index 4f23110..f43cc51 100644
--- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatInputFormatMethods.java
+++ b/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 a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java
index 2717093..22a0d3f 100644
--- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java
+++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatPartitionPublish.java
@@ -28,7 +28,7 @@ import java.util.Map;
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 a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestInputJobInfo.java b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestInputJobInfo.java
index 6ac5307..a566496 100644
--- a/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestInputJobInfo.java
+++ b/hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/TestInputJobInfo.java
@@ -20,7 +20,7 @@ package org.apache.hive.hcatalog.mapreduce;
import java.util.Properties;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Test;
diff --git a/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestPigHCatUtil.java b/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestPigHCatUtil.java
index 4bfd814..487d5c9 100644
--- a/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestPigHCatUtil.java
+++ b/hcatalog/hcatalog-pig-adapter/src/test/java/org/apache/hive/hcatalog/pig/TestPigHCatUtil.java
@@ -21,7 +21,7 @@ package org.apache.hive.hcatalog.pig;
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 a/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestDelimitedInputWriter.java b/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestDelimitedInputWriter.java
index 1aa257f..32eead4 100644
--- a/hcatalog/streaming/src/test/org/apache/hive/hcatalog/streaming/TestDelimitedInputWriter.java
+++ b/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 a/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java b/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java
index 78598a7..31df4bb 100644
--- a/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java
+++ b/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java
@@ -43,7 +43,7 @@ import java.util.HashMap;
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 a/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/tool/TestJobIDParser.java b/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/tool/TestJobIDParser.java
index 37b5481..fcdf7eb 100644
--- a/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/tool/TestJobIDParser.java
+++ b/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/tool/TestJobIDParser.java
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.junit.Test;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestJobIDParser {
@Test
diff --git a/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatHiveCompatibility.java b/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatHiveCompatibility.java
index dac6218..424c2f8 100644
--- a/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatHiveCompatibility.java
+++ b/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatHiveCompatibility.java
@@ -24,7 +24,7 @@ import java.io.FileWriter;
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 a/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatHiveThriftCompatibility.java b/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatHiveThriftCompatibility.java
index 1c14865..6ac24d0 100644
--- a/itests/hcatalog-unit/src/test/java/org/apache/hive/hcatalog/mapreduce/TestHCatHiveThriftCompatibility.java
+++ b/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 a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestNoSaslAuth.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestNoSaslAuth.java
index f40dff8..4ec86c0 100644
--- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestNoSaslAuth.java
+++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestNoSaslAuth.java
@@ -23,7 +23,7 @@ import java.sql.DriverManager;
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 a/itests/hive-unit/src/test/java/org/apache/hive/service/auth/TestCustomAuthentication.java b/itests/hive-unit/src/test/java/org/apache/hive/service/auth/TestCustomAuthentication.java
index d9c6e77..9705c65 100644
--- a/itests/hive-unit/src/test/java/org/apache/hive/service/auth/TestCustomAuthentication.java
+++ b/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 a/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/ShowMapredStatsHook.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/ShowMapredStatsHook.java
index d30b55a..a20206a 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/ShowMapredStatsHook.java
+++ b/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 a/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyContentSummaryCacheHook.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyContentSummaryCacheHook.java
index 14e1e57..60dda48 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyContentSummaryCacheHook.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyContentSummaryCacheHook.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.hive.ql.hooks;
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 a/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyHiveSortedInputFormatUsedHook.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyHiveSortedInputFormatUsedHook.java
index cba1fc2..b1c5521 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyHiveSortedInputFormatUsedHook.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyHiveSortedInputFormatUsedHook.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hive.ql.hooks;
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 a/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyHooksRunInOrder.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyHooksRunInOrder.java
index 5af5049..623d845 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyHooksRunInOrder.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyHooksRunInOrder.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hive.ql.hooks;
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 a/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyIsLocalModeHook.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyIsLocalModeHook.java
index 1c45596..a9f88a5 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyIsLocalModeHook.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyIsLocalModeHook.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.hive.ql.hooks;
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 a/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyNumReducersHook.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyNumReducersHook.java
index a9a25f8..ef8d584 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyNumReducersHook.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyNumReducersHook.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.hive.ql.hooks;
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 a/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyPartitionIsNotSubdirectoryOfTableHook.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyPartitionIsNotSubdirectoryOfTableHook.java
index 495ce6d..7155588 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyPartitionIsNotSubdirectoryOfTableHook.java
+++ b/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 a/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyPartitionIsSubdirectoryOfTableHook.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyPartitionIsSubdirectoryOfTableHook.java
index 0f1569b..b8c4cd2 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/hooks/VerifyPartitionIsSubdirectoryOfTableHook.java
+++ b/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 a/ql/src/test/org/apache/hadoop/hive/ql/TestErrorMsg.java b/ql/src/test/org/apache/hadoop/hive/ql/TestErrorMsg.java
index 90707e1..8774cca 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/TestErrorMsg.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/TestErrorMsg.java
@@ -21,7 +21,7 @@ package org.apache.hadoop.hive.ql;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinEqualityTableContainer.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinEqualityTableContainer.java
index 05797be..3f4a468 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinEqualityTableContainer.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinEqualityTableContainer.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinKey.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinKey.java
index 0239020..ede355d 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinKey.java
+++ b/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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinRowContainer.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinRowContainer.java
index 9e8e7db..93293bc 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinRowContainer.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinRowContainer.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.hive.ql.exec.persistence;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinTableContainer.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinTableContainer.java
index 429abd9..381d720 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinTableContainer.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/TestMapJoinTableContainer.java
@@ -23,7 +23,7 @@ import java.io.ObjectInputStream;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/Utilities.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/Utilities.java
index 2100da1..538a348 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/Utilities.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/persistence/Utilities.java
@@ -24,7 +24,7 @@ import java.io.ObjectOutputStream;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorFilterOperator.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorFilterOperator.java
index c427f1f..2e601d6 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorFilterOperator.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorFilterOperator.java
@@ -21,7 +21,7 @@ package org.apache.hadoop.hive.ql.exec.vector;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorLimitOperator.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorLimitOperator.java
index d515437..7231217 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorLimitOperator.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorLimitOperator.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hive.ql.exec.vector;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorizedRowBatch.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorizedRowBatch.java
index 9b132c4..258b47b 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorizedRowBatch.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/TestVectorizedRowBatch.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hive.ql.exec.vector;
import java.util.Random;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Test;
/**
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/aggregation/AggregationBase.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/aggregation/AggregationBase.java
index f75ab37..aa6e127 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/aggregation/AggregationBase.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/aggregation/AggregationBase.java
@@ -54,7 +54,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/aggregation/TestVectorAggregation.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/aggregation/TestVectorAggregation.java
index 211eaa2..65ecc70 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/aggregation/TestVectorAggregation.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/aggregation/TestVectorAggregation.java
@@ -51,7 +51,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.VarcharTypeInfo;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestDecimalUtil.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestDecimalUtil.java
index 100f159..5404d6c 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestDecimalUtil.java
+++ b/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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmetic.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmetic.java
index 1329d79..f44c5f3 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmetic.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmetic.java
@@ -68,7 +68,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmeticExpressions.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmeticExpressions.java
index a716224..703b1dc 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmeticExpressions.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorArithmeticExpressions.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorBetweenIn.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorBetweenIn.java
index 3f09cb1..6b521bf 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorBetweenIn.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorBetweenIn.java
@@ -81,7 +81,7 @@ import org.apache.hadoop.io.Text;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorCastStatement.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorCastStatement.java
index 8a68506..a8ffe1f 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorCastStatement.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorCastStatement.java
@@ -58,7 +58,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorCoalesceElt.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorCoalesceElt.java
index d367fb9..86c0fb3 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorCoalesceElt.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorCoalesceElt.java
@@ -56,7 +56,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateAddSub.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateAddSub.java
index b0e4b26..2c439bf 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateAddSub.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateAddSub.java
@@ -57,7 +57,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateDiff.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateDiff.java
index d89299c..32c5649 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateDiff.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorDateDiff.java
@@ -59,7 +59,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorExpressionWriters.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorExpressionWriters.java
index aa91344..da58055 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorExpressionWriters.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorExpressionWriters.java
@@ -25,7 +25,7 @@ import java.util.List;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorFilterCompare.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorFilterCompare.java
index abdbc1c..d5824a6 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorFilterCompare.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorFilterCompare.java
@@ -73,7 +73,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIfStatement.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIfStatement.java
index ce66e2b..cbee1ee 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIfStatement.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIfStatement.java
@@ -54,7 +54,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIndex.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIndex.java
index 9a49088..d18d8fb 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIndex.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorIndex.java
@@ -62,7 +62,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorMathFunctions.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorMathFunctions.java
index e127d42..6632377 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorMathFunctions.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorMathFunctions.java
@@ -22,7 +22,7 @@ import java.nio.charset.StandardCharsets;
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;
@@ -74,13 +74,13 @@ public class TestVectorMathFunctions {
DoubleColumnVector resultV = (DoubleColumnVector) b.cols[1];
b.cols[0].noNulls = true;
expr.evaluate(b);
- Assert.assertEquals(-2d, resultV.vector[0]);
- Assert.assertEquals(-1d, resultV.vector[1]);
- Assert.assertEquals(0d, resultV.vector[2]);
- Assert.assertEquals(0d, resultV.vector[3]);
- Assert.assertEquals(1d, resultV.vector[4]);
- Assert.assertEquals(1d, resultV.vector[5]);
- Assert.assertEquals(2d, resultV.vector[6]);
+ Assert.assertEquals(-2d, resultV.vector[0], Double.MIN_VALUE);
+ Assert.assertEquals(-1d, resultV.vector[1], Double.MIN_VALUE);
+ Assert.assertEquals(0d, resultV.vector[2], Double.MIN_VALUE);
+ Assert.assertEquals(0d, resultV.vector[3], Double.MIN_VALUE);
+ Assert.assertEquals(1d, resultV.vector[4], Double.MIN_VALUE);
+ Assert.assertEquals(1d, resultV.vector[5], Double.MIN_VALUE);
+ Assert.assertEquals(2d, resultV.vector[6], Double.MIN_VALUE);
// spot check null propagation
b.cols[0].noNulls = false;
@@ -94,13 +94,13 @@ public class TestVectorMathFunctions {
b.cols[0].isRepeating = true;
resultV.isRepeating = false;
expr.evaluate(b);
- Assert.assertEquals(-2d, resultV.vector[0]);
+ Assert.assertEquals(-2d, resultV.vector[0], Double.MIN_VALUE);
Assert.assertEquals(true, resultV.isRepeating);
resultV.isRepeating = false;
b.cols[0].noNulls = true;
expr.evaluate(b);
- Assert.assertEquals(-2d, resultV.vector[0]);
+ Assert.assertEquals(-2d, resultV.vector[0], Double.MIN_VALUE);
Assert.assertEquals(true, resultV.isRepeating);
}
@@ -112,7 +112,7 @@ public class TestVectorMathFunctions {
DoubleColumnVector resultV = (DoubleColumnVector) b.cols[1];
// Verify result is rounded to 4 digits
- Assert.assertEquals(1.2346d, resultV.vector[7]);
+ Assert.assertEquals(1.2346d, resultV.vector[7], Double.MIN_VALUE);
}
static int DAYS_LIMIT = 365 * 9999;
@@ -359,7 +359,7 @@ public class TestVectorMathFunctions {
b.cols[0].noNulls = true;
VectorExpression expr = new FuncSinDoubleToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(Math.sin(0.5d), resultV.vector[4]);
+ Assert.assertEquals(Math.sin(0.5d), resultV.vector[4], Double.MIN_VALUE);
}
@Test
@@ -369,7 +369,7 @@ public class TestVectorMathFunctions {
b.cols[0].noNulls = true;
VectorExpression expr = new FuncCosDoubleToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(Math.cos(0.5d), resultV.vector[4]);
+ Assert.assertEquals(Math.cos(0.5d), resultV.vector[4], Double.MIN_VALUE);
}
@Test
@@ -379,7 +379,7 @@ public class TestVectorMathFunctions {
b.cols[0].noNulls = true;
VectorExpression expr = new FuncTanDoubleToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(Math.tan(0.5d), resultV.vector[4]);
+ Assert.assertEquals(Math.tan(0.5d), resultV.vector[4], Double.MIN_VALUE);
}
@Test
@@ -389,7 +389,7 @@ public class TestVectorMathFunctions {
b.cols[0].noNulls = true;
VectorExpression expr = new FuncASinDoubleToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(Math.asin(0.5d), resultV.vector[4]);
+ Assert.assertEquals(Math.asin(0.5d), resultV.vector[4], Double.MIN_VALUE);
}
@Test
@@ -399,7 +399,7 @@ public class TestVectorMathFunctions {
b.cols[0].noNulls = true;
VectorExpression expr = new FuncACosDoubleToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(Math.acos(0.5d), resultV.vector[4]);
+ Assert.assertEquals(Math.acos(0.5d), resultV.vector[4], Double.MIN_VALUE);
}
@Test
@@ -409,7 +409,7 @@ public class TestVectorMathFunctions {
b.cols[0].noNulls = true;
VectorExpression expr = new FuncATanDoubleToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(Math.atan(0.5d), resultV.vector[4]);
+ Assert.assertEquals(Math.atan(0.5d), resultV.vector[4], Double.MIN_VALUE);
}
@Test
@@ -419,7 +419,7 @@ public class TestVectorMathFunctions {
b.cols[0].noNulls = true;
VectorExpression expr = new FuncDegreesDoubleToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(Math.toDegrees(0.5d), resultV.vector[4]);
+ Assert.assertEquals(Math.toDegrees(0.5d), resultV.vector[4], Double.MIN_VALUE);
}
@Test
@@ -429,7 +429,7 @@ public class TestVectorMathFunctions {
b.cols[0].noNulls = true;
VectorExpression expr = new FuncRadiansDoubleToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(Math.toRadians(0.5d), resultV.vector[4]);
+ Assert.assertEquals(Math.toRadians(0.5d), resultV.vector[4], Double.MIN_VALUE);
}
@Test
@@ -461,7 +461,7 @@ public class TestVectorMathFunctions {
b.cols[0].noNulls = true;
VectorExpression expr = new FuncExpDoubleToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(Math.exp(0.5d), resultV.vector[4]);
+ Assert.assertEquals(Math.exp(0.5d), resultV.vector[4], Double.MIN_VALUE);
}
@Test
@@ -473,7 +473,7 @@ public class TestVectorMathFunctions {
b.cols[0].noNulls = true;
VectorExpression expr = new FuncLnDoubleToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(Math.log(0.5), resultV.vector[4]);
+ Assert.assertEquals(Math.log(0.5), resultV.vector[4], Double.MIN_VALUE);
// test long->double version
b = getVectorizedRowBatchLongInDoubleOut();
@@ -481,7 +481,7 @@ public class TestVectorMathFunctions {
b.cols[0].noNulls = true;
expr = new FuncLnLongToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(Math.log(2), resultV.vector[4]);
+ Assert.assertEquals(Math.log(2), resultV.vector[4], Double.MIN_VALUE);
}
@Test
@@ -493,7 +493,7 @@ public class TestVectorMathFunctions {
b.cols[0].noNulls = true;
VectorExpression expr = new FuncLog2DoubleToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(Math.log(0.5d) / Math.log(2), resultV.vector[4]);
+ Assert.assertEquals(Math.log(0.5d) / Math.log(2), resultV.vector[4], Double.MIN_VALUE);
// test long->double version
b = getVectorizedRowBatchLongInDoubleOut();
@@ -501,7 +501,7 @@ public class TestVectorMathFunctions {
b.cols[0].noNulls = true;
expr = new FuncLog2LongToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(Math.log(1) / Math.log(2), resultV.vector[3]);
+ Assert.assertEquals(Math.log(1) / Math.log(2), resultV.vector[3], Double.MIN_VALUE);
}
@Test
@@ -521,7 +521,7 @@ public class TestVectorMathFunctions {
b.cols[0].noNulls = true;
expr = new FuncLog10LongToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(Math.log(1) / Math.log(10), resultV.vector[3]);
+ Assert.assertEquals(Math.log(1) / Math.log(10), resultV.vector[3], Double.MIN_VALUE);
}
@Test
@@ -656,7 +656,7 @@ public class TestVectorMathFunctions {
b.cols[0].noNulls = true;
VectorExpression expr = new FuncSqrtDoubleToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(Math.sqrt(0.5d), resultV.vector[4]);
+ Assert.assertEquals(Math.sqrt(0.5d), resultV.vector[4], Double.MIN_VALUE);
}
@Test
@@ -668,8 +668,8 @@ public class TestVectorMathFunctions {
b.cols[0].noNulls = true;
VectorExpression expr = new FuncAbsDoubleToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(1.5, resultV.vector[0]);
- Assert.assertEquals(0.5, resultV.vector[4]);
+ Assert.assertEquals(1.5, resultV.vector[0], Double.MIN_VALUE);
+ Assert.assertEquals(0.5, resultV.vector[4], Double.MIN_VALUE);
// test long->long version
b = getVectorizedRowBatchLongInLongOut();
@@ -690,8 +690,8 @@ public class TestVectorMathFunctions {
b.cols[0].noNulls = true;
VectorExpression expr = new FuncSignDoubleToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(-1.0d, resultV.vector[0]);
- Assert.assertEquals(1.0d, resultV.vector[4]);
+ Assert.assertEquals(-1.0d, resultV.vector[0], Double.MIN_VALUE);
+ Assert.assertEquals(1.0d, resultV.vector[4], Double.MIN_VALUE);
// test long->double version
b = getVectorizedRowBatchLongInDoubleOut();
@@ -699,8 +699,8 @@ public class TestVectorMathFunctions {
b.cols[0].noNulls = true;
expr = new FuncSignLongToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(-1.0d, resultV.vector[0]);
- Assert.assertEquals(1.0d, resultV.vector[4]);
+ Assert.assertEquals(-1.0d, resultV.vector[0], Double.MIN_VALUE);
+ Assert.assertEquals(1.0d, resultV.vector[4], Double.MIN_VALUE);
}
@Test
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNegative.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNegative.java
index a3f665b..af5887c 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNegative.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNegative.java
@@ -62,7 +62,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNull.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNull.java
index 06d8fc8..daa76fd 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNull.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorNull.java
@@ -62,7 +62,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorScalarColArithmetic.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorScalarColArithmetic.java
index a246a45..59df777 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorScalarColArithmetic.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorScalarColArithmetic.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hive.ql.exec.vector.expressions;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringConcat.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringConcat.java
index bb41c4f..bcedf9b 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringConcat.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringConcat.java
@@ -67,7 +67,7 @@ import org.apache.hadoop.hive.serde2.io.ShortWritable;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java
index 407ce04..c16bea5 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringExpressions.java
@@ -25,7 +25,7 @@ import java.util.Arrays;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringUnary.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringUnary.java
index 4099b45..cb88d87 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringUnary.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStringUnary.java
@@ -58,7 +58,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStructField.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStructField.java
index 5062997..00f7868 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStructField.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorStructField.java
@@ -65,7 +65,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorSubStr.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorSubStr.java
index 2997dcd..291cb2b 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorSubStr.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorSubStr.java
@@ -59,7 +59,7 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExpressions.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExpressions.java
index 650bac4..74f4ad9 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExpressions.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExpressions.java
@@ -29,7 +29,7 @@ import java.util.Date;
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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExtract.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExtract.java
index 21109f3..c3c5cb2 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTimestampExtract.java
+++ b/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 a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java
index e9be8c1..58fd7b0 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/expressions/TestVectorTypeCasts.java
@@ -27,7 +27,7 @@ import java.sql.Timestamp;
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;
@@ -59,7 +59,7 @@ public class TestVectorTypeCasts {
b.cols[0].noNulls = true;
VectorExpression expr = new CastLongToDouble(0, 1);
expr.evaluate(b);
- Assert.assertEquals(2.0, resultV.vector[4]);
+ Assert.assertEquals(2.0, resultV.vector[4], Double.MIN_VALUE);
}
@Test
@@ -105,8 +105,8 @@ public class TestVectorTypeCasts {
b.cols[0].noNulls = true;
VectorExpression expr = new CastDoubleToTimestamp(0, 1);
expr.evaluate(b);
- Assert.assertEquals(0.0, TimestampUtils.getDouble(resultV.asScratchTimestamp(3)));
- Assert.assertEquals(0.5d, TimestampUtils.getDouble(resultV.asScratchTimestamp(4)));
+ Assert.assertEquals(0.0, TimestampUtils.getDouble(resultV.asScratchTimestamp(3)), Double.MIN_VALUE);
+ Assert.assertEquals(0.5d, TimestampUtils.getDouble(resultV.asScratchTimestamp(4)), Double.MIN_VALUE);
}
@Test
@@ -663,7 +663,7 @@ public class TestVectorTypeCasts {
HiveDecimal[] hiveDecimalValues = new HiveDecimal[500];
VectorizedRowBatch b = getBatchTimestampDecimal(hiveDecimalValues);
VectorExpression expr = new CastTimestampToDecimal(0, 1);
- TimestampColumnVector inT = (TimestampColumnVector) b.cols[0];
+
expr.evaluate(b);
DecimalColumnVector r = (DecimalColumnVector) b.cols[1];
for (int i = 0; i < hiveDecimalValues.length; i++) {
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/mapjoin/TestMapJoinOperator.java b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/mapjoin/TestMapJoinOperator.java
index a37b5a0..c4dc547 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/mapjoin/TestMapJoinOperator.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/exec/vector/mapjoin/TestMapJoinOperator.java
@@ -118,7 +118,7 @@ import java.util.Random;
import java.util.SortedMap;
import java.util.TreeMap;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestMapJoinOperator {
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/io/TestHiveBinarySearchRecordReader.java b/ql/src/test/org/apache/hadoop/hive/ql/io/TestHiveBinarySearchRecordReader.java
index 2a47abf..1e46c60 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/io/TestHiveBinarySearchRecordReader.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/io/TestHiveBinarySearchRecordReader.java
@@ -28,7 +28,7 @@ import java.io.ByteArrayOutputStream;
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 a/ql/src/test/org/apache/hadoop/hive/ql/io/TestStorageFormatDescriptor.java b/ql/src/test/org/apache/hadoop/hive/ql/io/TestStorageFormatDescriptor.java
index 86d3703..b9fc7ea 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/io/TestStorageFormatDescriptor.java
+++ b/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 a/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestVectorizedORCReader.java b/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestVectorizedORCReader.java
index aa99e57..913090f 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestVectorizedORCReader.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/io/orc/TestVectorizedORCReader.java
@@ -22,7 +22,7 @@ import java.io.File;
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 a/ql/src/test/org/apache/hadoop/hive/ql/io/parquet/serde/TestParquetTimestampUtils.java b/ql/src/test/org/apache/hadoop/hive/ql/io/parquet/serde/TestParquetTimestampUtils.java
index 52b8401..e745af9 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/io/parquet/serde/TestParquetTimestampUtils.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/io/parquet/serde/TestParquetTimestampUtils.java
@@ -23,7 +23,7 @@ import org.apache.hadoop.hive.common.type.TimestampTZUtil;
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 a/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestHiveLockObject.java b/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestHiveLockObject.java
index 305ee7b..52f86bb 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/lockmgr/TestHiveLockObject.java
+++ b/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 a/ql/src/test/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/TestListBucketingPrunner.java b/ql/src/test/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/TestListBucketingPrunner.java
index af219df..de65ec4 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/optimizer/listbucketingpruner/TestListBucketingPrunner.java
+++ b/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 a/ql/src/test/org/apache/hadoop/hive/ql/parse/TestMacroSemanticAnalyzer.java b/ql/src/test/org/apache/hadoop/hive/ql/parse/TestMacroSemanticAnalyzer.java
index 0334cf2..2189ad6 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/parse/TestMacroSemanticAnalyzer.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/parse/TestMacroSemanticAnalyzer.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.hive.ql.udf.generic.GenericUDFMacro;
import org.junit.Before;
import org.junit.Test;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestMacroSemanticAnalyzer {
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBCompact.java b/ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBCompact.java
index 9a45ccb..90df85c 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBCompact.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBCompact.java
@@ -38,7 +38,7 @@ import org.junit.AfterClass;
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 a/ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBJoinTreeApplyPredicate.java b/ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBJoinTreeApplyPredicate.java
index 5e4455c..cd246de 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBJoinTreeApplyPredicate.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/parse/TestQBJoinTreeApplyPredicate.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hive.ql.parse;
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 a/ql/src/test/org/apache/hadoop/hive/ql/parse/TestSemanticAnalyzerFactory.java b/ql/src/test/org/apache/hadoop/hive/ql/parse/TestSemanticAnalyzerFactory.java
index 8338201..1db5a00 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/parse/TestSemanticAnalyzerFactory.java
+++ b/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 a/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/AuthorizationTestUtil.java b/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/AuthorizationTestUtil.java
index 40753b6..fed0d01 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/AuthorizationTestUtil.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/AuthorizationTestUtil.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.hive.ql.parse.ParseUtils;
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 a/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/ListSizeMatcher.java b/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/ListSizeMatcher.java
index 08ab741..c8879dc 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/ListSizeMatcher.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/ListSizeMatcher.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.hive.ql.parse.authorization;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
public class ListSizeMatcher<E> {
private final List<E> list;
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/PrivilegesTestBase.java b/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/PrivilegesTestBase.java
index ff41919..a15fd5d 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/PrivilegesTestBase.java
+++ b/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 a/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/TestSessionUserName.java b/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/TestSessionUserName.java
index 2c8c45e..61d755d 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/parse/authorization/TestSessionUserName.java
+++ b/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 a/ql/src/test/org/apache/hadoop/hive/ql/plan/TestConditionalResolverCommonJoin.java b/ql/src/test/org/apache/hadoop/hive/ql/plan/TestConditionalResolverCommonJoin.java
index ab42f61..6ee74ca 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/plan/TestConditionalResolverCommonJoin.java
+++ b/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 a/ql/src/test/org/apache/hadoop/hive/ql/plan/TestCreateMacroDesc.java b/ql/src/test/org/apache/hadoop/hive/ql/plan/TestCreateMacroDesc.java
index 8fa31fd..48906f7 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/plan/TestCreateMacroDesc.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/plan/TestCreateMacroDesc.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hive.ql.plan;
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 a/ql/src/test/org/apache/hadoop/hive/ql/plan/TestDropMacroDesc.java b/ql/src/test/org/apache/hadoop/hive/ql/plan/TestDropMacroDesc.java
index 929a141..2ee27dc 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/plan/TestDropMacroDesc.java
+++ b/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 a/ql/src/test/org/apache/hadoop/hive/ql/plan/TestTezWork.java b/ql/src/test/org/apache/hadoop/hive/ql/plan/TestTezWork.java
index 66d7227..91b1dec 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/plan/TestTezWork.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/plan/TestTezWork.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hive.ql.plan;
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 a/ql/src/test/org/apache/hadoop/hive/ql/processors/TestCompileProcessor.java b/ql/src/test/org/apache/hadoop/hive/ql/processors/TestCompileProcessor.java
index 14f02b2..d1ffc1b 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/processors/TestCompileProcessor.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/processors/TestCompileProcessor.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hive.ql.processors;
import java.io.File;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.Test;
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/testutil/OperatorTestUtils.java b/ql/src/test/org/apache/hadoop/hive/ql/testutil/OperatorTestUtils.java
index 6676791..4de9f19 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/testutil/OperatorTestUtils.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/testutil/OperatorTestUtils.java
@@ -21,7 +21,7 @@ package org.apache.hadoop.hive.ql.testutil;
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 a/ql/src/test/org/apache/hadoop/hive/ql/udaf/TestStreamingSum.java b/ql/src/test/org/apache/hadoop/hive/ql/udaf/TestStreamingSum.java
index 8e2254d..1eda6c3 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/udaf/TestStreamingSum.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/udaf/TestStreamingSum.java
@@ -22,7 +22,7 @@ import java.util.Arrays;
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 a/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFMacro.java b/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFMacro.java
index 73672e3..9347c49 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFMacro.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFMacro.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hive.ql.udf.generic;
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 a/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFRound.java b/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFRound.java
index cc4f7bd..c1beed6 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFRound.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/udf/generic/TestGenericUDFRound.java
@@ -21,7 +21,7 @@ package org.apache.hadoop.hive.ql.udf.generic;
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 a/serde/src/test/org/apache/hadoop/hive/serde2/columnar/TestLazyBinaryColumnarSerDe.java b/serde/src/test/org/apache/hadoop/hive/serde2/columnar/TestLazyBinaryColumnarSerDe.java
index 08c7977..6838138 100644
--- a/serde/src/test/org/apache/hadoop/hive/serde2/columnar/TestLazyBinaryColumnarSerDe.java
+++ b/serde/src/test/org/apache/hadoop/hive/serde2/columnar/TestLazyBinaryColumnarSerDe.java
@@ -25,7 +25,7 @@ import java.util.Map;
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 a/service/src/test/org/apache/hive/service/cli/TestHiveSQLException.java b/service/src/test/org/apache/hive/service/cli/TestHiveSQLException.java
index ac7fec0..39a71b0 100644
--- a/service/src/test/org/apache/hive/service/cli/TestHiveSQLException.java
+++ b/service/src/test/org/apache/hive/service/cli/TestHiveSQLException.java
@@ -20,7 +20,7 @@ package org.apache.hive.service.cli;
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 a/service/src/test/org/apache/hive/service/cli/session/TestSessionHooks.java b/service/src/test/org/apache/hive/service/cli/session/TestSessionHooks.java
index 5cbb0bf..6daf757 100644
--- a/service/src/test/org/apache/hive/service/cli/session/TestSessionHooks.java
+++ b/service/src/test/org/apache/hive/service/cli/session/TestSessionHooks.java
@@ -23,7 +23,7 @@ import java.util.HashMap;
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 a/storage-api/src/test/org/apache/hadoop/hive/common/TestValidReadTxnList.java b/storage-api/src/test/org/apache/hadoop/hive/common/TestValidReadTxnList.java
index f270eb8..1a28afc 100644
--- a/storage-api/src/test/org/apache/hadoop/hive/common/TestValidReadTxnList.java
+++ b/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 a/testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestExecutor.java b/testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestExecutor.java
index a4a789b..70b3ea2 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestExecutor.java
+++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestExecutor.java
@@ -29,7 +29,7 @@ import java.util.concurrent.ArrayBlockingQueue;
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 a/testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestLogger.java b/testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestLogger.java
index 5f6ae72..e24d34e 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestLogger.java
+++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/api/server/TestTestLogger.java
@@ -24,7 +24,7 @@ import java.io.IOException;
import java.io.PrintStream;
import java.io.StringReader;
-import junit.framework.Assert;
+import org.junit.Assert;
import com.google.common.base.Charsets;
diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/AbstractTestPhase.java b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/AbstractTestPhase.java
index 71e1a64..00ad4d4 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/AbstractTestPhase.java
+++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/AbstractTestPhase.java
@@ -27,7 +27,7 @@ import java.util.Collections;
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 a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.java b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.java
index 8964453..e7ced3d 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.java
+++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestHostExecutor.java
@@ -31,7 +31,7 @@ import java.util.concurrent.Executors;
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 a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestJIRAService.java b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestJIRAService.java
index 0ea51b7..2dab3ab 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestJIRAService.java
+++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestJIRAService.java
@@ -28,7 +28,7 @@ import java.util.SortedSet;
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 a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLocalCommand.java b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLocalCommand.java
index 94f5a74..c3f81f8 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLocalCommand.java
+++ b/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 a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLogDirectoryCleaner.java b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLogDirectoryCleaner.java
index 3023398..6ea940d 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLogDirectoryCleaner.java
+++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestLogDirectoryCleaner.java
@@ -22,7 +22,7 @@ import java.io.File;
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 a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPhase.java b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPhase.java
index 169e032..ea1b3a2 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPhase.java
+++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestPhase.java
@@ -22,7 +22,7 @@ import static org.mockito.Mockito.when;
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 a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestReportParser.java b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestReportParser.java
index d6a7515..0af8aec 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestReportParser.java
+++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestReportParser.java
@@ -20,7 +20,7 @@ package org.apache.hive.ptest.execution;
import java.io.File;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.io.FileUtils;
import org.junit.After;
diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestQFileTestBatch.java b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestQFileTestBatch.java
index c419a82..e7cdf14 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestQFileTestBatch.java
+++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestQFileTestBatch.java
@@ -21,7 +21,7 @@ package org.apache.hive.ptest.execution.conf;
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 a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestConfiguration.java b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestConfiguration.java
index 360f868..6ca3042 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestConfiguration.java
+++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestConfiguration.java
@@ -21,7 +21,7 @@ package org.apache.hive.ptest.execution.conf;
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 a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestParser.java b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestParser.java
index bbf3226..f52a9cd 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestParser.java
+++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/conf/TestTestParser.java
@@ -25,7 +25,7 @@ import java.util.List;
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 a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/TestCloudExecutionContextProvider.java b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/TestCloudExecutionContextProvider.java
index 35a669f..4985b7d 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/TestCloudExecutionContextProvider.java
+++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/context/TestCloudExecutionContextProvider.java
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.when;
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 a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestRSyncCommandExecutor.java b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestRSyncCommandExecutor.java
index cad1577..450ace2 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestRSyncCommandExecutor.java
+++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestRSyncCommandExecutor.java
@@ -23,7 +23,7 @@ import static org.mockito.Mockito.never;
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 a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestSSHCommandExecutor.java b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestSSHCommandExecutor.java
index 9499797..39907cd 100644
--- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestSSHCommandExecutor.java
+++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/ssh/TestSSHCommandExecutor.java
@@ -23,7 +23,7 @@ import static org.mockito.Mockito.never;
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;