sqoop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hshreedha...@apache.org
Subject [3/3] sqoop git commit: SQOOP-1950. Sqoop2: Use TestNG
Date Fri, 09 Jan 2015 00:42:17 GMT
SQOOP-1950. Sqoop2: Use TestNG

(Abraham Elmahrek via Hari Shreedharan)


Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/471e534e
Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/471e534e
Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/471e534e

Branch: refs/heads/sqoop2
Commit: 471e534ef648f3af8897b58efb25fa7fa237bafe
Parents: f073cf6
Author: Hari Shreedharan <hshreedharan@apache.org>
Authored: Thu Jan 8 16:41:18 2015 -0800
Committer: Hari Shreedharan <hshreedharan@apache.org>
Committed: Thu Jan 8 16:41:18 2015 -0800

----------------------------------------------------------------------
 client/pom.xml                                  |  4 +-
 .../apache/sqoop/client/TestSqoopClient.java    | 12 +++---
 common-test/pom.xml                             |  4 +-
 .../common/test/asserts/ProviderAsserts.java    |  4 +-
 .../sqoop/common/test/categories/SlowTests.java | 27 --------------
 common/pom.xml                                  |  4 +-
 .../org/apache/sqoop/common/TestMapContext.java |  4 +-
 .../sqoop/common/TestSqoopResponseCode.java     |  4 +-
 .../sqoop/common/TestSupportedDirections.java   |  4 +-
 .../apache/sqoop/common/TestVersionInfo.java    |  4 +-
 .../apache/sqoop/json/TestConnectorBean.java    |  6 +--
 .../apache/sqoop/json/TestConnectorsBean.java   |  6 +--
 .../org/apache/sqoop/json/TestDriverBean.java   |  4 +-
 .../org/apache/sqoop/json/TestJSONUtils.java    | 12 +++---
 .../java/org/apache/sqoop/json/TestJobBean.java |  4 +-
 .../org/apache/sqoop/json/TestJobsBean.java     |  4 +-
 .../org/apache/sqoop/json/TestLinkBean.java     |  8 ++--
 .../org/apache/sqoop/json/TestLinksBean.java    |  6 +--
 .../apache/sqoop/json/TestSubmissionBean.java   |  6 +--
 .../apache/sqoop/json/TestThrowableBean.java    |  8 ++--
 .../sqoop/json/TestValidationResultBean.java    | 10 ++---
 .../json/util/TestConfigSerialization.java      | 10 ++---
 .../json/util/TestSchemaSerialization.java      | 12 +++---
 .../sqoop/model/TestMAccountableEntity.java     |  4 +-
 .../apache/sqoop/model/TestMBooleanInput.java   | 14 +++----
 .../org/apache/sqoop/model/TestMConfig.java     |  4 +-
 .../org/apache/sqoop/model/TestMConfigList.java |  4 +-
 .../org/apache/sqoop/model/TestMConnector.java  | 14 +++----
 .../org/apache/sqoop/model/TestMDriver.java     |  4 +-
 .../org/apache/sqoop/model/TestMEnumInput.java  |  4 +-
 .../apache/sqoop/model/TestMIntegerInput.java   | 10 ++---
 .../java/org/apache/sqoop/model/TestMJob.java   |  6 +--
 .../org/apache/sqoop/model/TestMJobConfig.java  |  4 +-
 .../java/org/apache/sqoop/model/TestMLink.java  |  4 +-
 .../org/apache/sqoop/model/TestMLinkConfig.java |  4 +-
 .../org/apache/sqoop/model/TestMMapInput.java   | 12 +++---
 .../apache/sqoop/model/TestMNamedElement.java   |  4 +-
 .../sqoop/model/TestMPersistableEntity.java     |  4 +-
 .../apache/sqoop/model/TestMStringInput.java    |  4 +-
 .../sqoop/model/TestMValidatedElement.java      |  4 +-
 .../org/apache/sqoop/schema/type/TestArray.java |  4 +-
 .../org/apache/sqoop/schema/type/TestEnum.java  |  4 +-
 .../org/apache/sqoop/schema/type/TestMap.java   |  4 +-
 .../org/apache/sqoop/schema/type/TestSet.java   |  4 +-
 .../sqoop/submission/TestSubmissionStatus.java  |  6 +--
 .../sqoop/submission/counter/TestCounter.java   |  4 +-
 .../submission/counter/TestCounterGroup.java    |  4 +-
 .../sqoop/submission/counter/TestCounters.java  |  4 +-
 .../org/apache/sqoop/utils/TestClassUtils.java  | 10 ++---
 .../sqoop/utils/TestMapResourceBundle.java      |  4 +-
 .../org/apache/sqoop/validation/TestStatus.java |  4 +-
 .../sqoop/validation/TestValidationRunner.java  |  6 +--
 .../validators/TestCSVURIValidator.java         |  4 +-
 .../validators/TestClassAvailable.java          |  4 +-
 .../validation/validators/TestContains.java     |  4 +-
 .../validators/TestHostAndPortValidator.java    |  8 ++--
 .../validation/validators/TestNotEmpty.java     |  4 +-
 .../validation/validators/TestNotNull.java      |  4 +-
 .../validators/TestNullOrContains.java          |  4 +-
 .../validation/validators/TestStartsWith.java   |  4 +-
 .../validation/validators/TestValidator.java    |  4 +-
 connector/connector-generic-jdbc/pom.xml        |  4 +-
 .../connector/jdbc/GenericJdbcExecutorTest.java |  8 ++--
 .../sqoop/connector/jdbc/TestExtractor.java     | 17 ++++-----
 .../connector/jdbc/TestFromInitializer.java     | 12 +++---
 .../jdbc/TestGenericJdbcConnectorUpgrader.java  |  8 ++--
 .../apache/sqoop/connector/jdbc/TestLoader.java | 31 +++++++---------
 .../sqoop/connector/jdbc/TestPartitioner.java   |  6 +--
 .../sqoop/connector/jdbc/TestToInitializer.java | 16 ++++----
 connector/connector-hdfs/pom.xml                |  4 +-
 .../sqoop/connector/hdfs/TestExtractor.java     | 31 ++++++++--------
 .../sqoop/connector/hdfs/TestHdfsUtils.java     |  8 +++-
 .../sqoop/connector/hdfs/TestLinkConfig.java    |  6 +--
 .../apache/sqoop/connector/hdfs/TestLoader.java | 26 ++++++-------
 .../sqoop/connector/hdfs/TestPartitioner.java   | 25 ++++++-------
 connector/connector-kafka/pom.xml               |  6 +++
 .../sqoop/connector/kafka/KafkaToDestroyer.java |  2 +-
 .../connector/kafka/TestConfiguration.java      |  4 +-
 .../sqoop/connector/kafka/TestKafkaLoader.java  | 12 +++---
 connector/connector-kite/pom.xml                |  6 +--
 .../sqoop/connector/kite/TestKiteExecutor.java  | 33 ++++++++++-------
 .../sqoop/connector/kite/TestKiteExtractor.java |  6 +--
 .../connector/kite/TestKiteFromInitializer.java | 16 ++++----
 .../sqoop/connector/kite/TestKiteLoader.java    |  6 +--
 .../connector/kite/TestKiteToDestroyer.java     | 14 +++----
 .../connector/kite/TestKiteToInitializer.java   | 22 +++++------
 .../kite/configuration/TestConfigUtil.java      |  4 +-
 connector/connector-sdk/pom.xml                 |  4 +-
 .../connector/common/TestSqoopIDFUtils.java     |  4 +-
 .../idf/TestAVROIntermediateDataFormat.java     |  8 ++--
 .../idf/TestCSVIntermediateDataFormat.java      | 32 ++++++++--------
 .../idf/TestJSONIntermediateDataFormat.java     |  8 ++--
 .../connector/matcher/TestLocationMatcher.java  | 10 ++---
 .../connector/matcher/TestNameMatcher.java      | 10 ++---
 core/pom.xml                                    |  4 +-
 .../sqoop/core/TestSqoopConfiguration.java      |  8 ++--
 .../sqoop/driver/TestDriverConfigUpgrader.java  | 10 ++---
 .../org/apache/sqoop/driver/TestJobManager.java | 10 ++---
 .../org/apache/sqoop/driver/TestJobRequest.java | 10 ++---
 .../sqoop/repository/TestJdbcRepository.java    | 10 ++---
 .../sqoop/repository/TestRepositoryManager.java |  4 +-
 docs/pom.xml                                    |  4 +-
 execution/mapreduce/pom.xml                     |  4 +-
 .../org/apache/sqoop/job/TestMapReduce.java     |  9 ++---
 .../java/org/apache/sqoop/job/TestMatching.java | 39 +++++++++-----------
 .../apache/sqoop/job/io/TestSqoopWritable.java  |  8 ++--
 .../sqoop/job/mr/TestMRConfigurationUtils.java  |  8 ++--
 .../mr/TestSqoopOutputFormatLoadExecutor.java   | 14 +++----
 pom.xml                                         | 27 +++++++++-----
 repository/repository-common/pom.xml            |  4 +-
 repository/repository-derby/pom.xml             |  4 +-
 .../sqoop/repository/derby/DerbyTestCase.java   | 10 ++---
 .../repository/derby/TestConnectorHandling.java | 12 +++---
 .../repository/derby/TestDriverHandling.java    | 12 +++---
 .../sqoop/repository/derby/TestInputTypes.java  | 12 +++---
 .../sqoop/repository/derby/TestJobHandling.java | 20 +++++-----
 .../repository/derby/TestLinkHandling.java      | 20 +++++-----
 .../repository/derby/TestRepositoryUpgrade.java | 20 +++++-----
 .../derby/TestSubmissionHandling.java           | 12 +++---
 repository/repository-postgresql/pom.xml        |  6 +--
 .../postgresql/PostgresqlTestCase.java          | 16 ++++----
 .../repository/postgresql/TestStructure.java    |  2 +-
 submission/mapreduce/pom.xml                    |  4 +-
 test/pom.xml                                    |  4 +-
 .../apache/sqoop/test/asserts/HdfsAsserts.java  |  4 +-
 .../sqoop/test/testcases/ConnectorTestCase.java |  8 ++--
 .../test/testcases/KafkaConnectorTestCase.java  |  6 +--
 .../sqoop/test/testcases/TomcatTestCase.java    | 26 +++++++------
 .../jdbc/generic/FromHDFSToRDBMSTest.java       |  4 +-
 .../jdbc/generic/FromRDBMSToHDFSTest.java       |  4 +-
 .../connector/jdbc/generic/PartitionerTest.java | 27 +++++++++-----
 .../jdbc/generic/TableStagedRDBMSTest.java      |  4 +-
 .../connector/kafka/FromHDFSToKafkaTest.java    |  2 +-
 .../connector/kafka/FromRDBMSToKafkaTest.java   |  2 +-
 .../upgrade/DerbyRepositoryUpgradeTest.java     |  8 ++--
 .../SubmissionWithDisabledModelObjectsTest.java | 36 +++++++++---------
 .../sqoop/integration/server/VersionTest.java   |  4 +-
 tomcat/pom.xml                                  |  4 +-
 tools/pom.xml                                   |  4 +-
 139 files changed, 620 insertions(+), 628 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index d424e8d..a86516b 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -33,8 +33,8 @@ limitations under the License.
 
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/client/src/test/java/org/apache/sqoop/client/TestSqoopClient.java
----------------------------------------------------------------------
diff --git a/client/src/test/java/org/apache/sqoop/client/TestSqoopClient.java b/client/src/test/java/org/apache/sqoop/client/TestSqoopClient.java
index 18b6132..91e34c1 100644
--- a/client/src/test/java/org/apache/sqoop/client/TestSqoopClient.java
+++ b/client/src/test/java/org/apache/sqoop/client/TestSqoopClient.java
@@ -17,8 +17,8 @@
  */
 package org.apache.sqoop.client;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -45,15 +45,15 @@ import org.apache.sqoop.model.MFromConfig;
 import org.apache.sqoop.model.MLinkConfig;
 import org.apache.sqoop.model.MToConfig;
 import org.apache.sqoop.utils.MapResourceBundle;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 public class TestSqoopClient {
 
   SqoopResourceRequests resourceRequests;
   SqoopClient client;
 
-  @Before
+  @BeforeMethod
   public void setUp() {
     resourceRequests = mock(SqoopResourceRequests.class);
     client = new SqoopClient("my-cool-server");
@@ -199,7 +199,7 @@ public class TestSqoopClient {
   /**
    * Link for non-existing connector can't be created.
    */
-  @Test(expected = SqoopException.class)
+  @Test(expectedExceptions = SqoopException.class)
   public void testCreateLink() {
     when(resourceRequests.readConnector(null)).thenReturn(connectorBean(connector(1)));
     client.createLink("non existing connector");

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common-test/pom.xml
----------------------------------------------------------------------
diff --git a/common-test/pom.xml b/common-test/pom.xml
index 2d63f72..d08951b 100644
--- a/common-test/pom.xml
+++ b/common-test/pom.xml
@@ -36,8 +36,8 @@ limitations under the License.
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
     </dependency>
 
     <dependency>

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common-test/src/main/java/org/apache/sqoop/common/test/asserts/ProviderAsserts.java
----------------------------------------------------------------------
diff --git a/common-test/src/main/java/org/apache/sqoop/common/test/asserts/ProviderAsserts.java b/common-test/src/main/java/org/apache/sqoop/common/test/asserts/ProviderAsserts.java
index 8196fe2..fb4e7af 100644
--- a/common-test/src/main/java/org/apache/sqoop/common/test/asserts/ProviderAsserts.java
+++ b/common-test/src/main/java/org/apache/sqoop/common/test/asserts/ProviderAsserts.java
@@ -23,8 +23,8 @@ import org.apache.log4j.Logger;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.fail;
 
 /**
  * Database provider related asserts.

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common-test/src/main/java/org/apache/sqoop/common/test/categories/SlowTests.java
----------------------------------------------------------------------
diff --git a/common-test/src/main/java/org/apache/sqoop/common/test/categories/SlowTests.java b/common-test/src/main/java/org/apache/sqoop/common/test/categories/SlowTests.java
deleted file mode 100644
index f8ce474..0000000
--- a/common-test/src/main/java/org/apache/sqoop/common/test/categories/SlowTests.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.sqoop.common.test.categories;
-
-/**
- * Slow tests interface for JUnit categories.
- * This should  be used if your unit tests rely on
- * some piece of infrastructure that takes time to start.
- * For example, using a MySQL database takes time to setup
- * and start because it is in a separate process.
- */
-public interface SlowTests {}

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index e8a8010..af0a404 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -41,8 +41,8 @@ limitations under the License.
       <artifactId>json-simple</artifactId>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/common/TestMapContext.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/common/TestMapContext.java b/common/src/test/java/org/apache/sqoop/common/TestMapContext.java
index 7ce1ccd..f9ed37b 100644
--- a/common/src/test/java/org/apache/sqoop/common/TestMapContext.java
+++ b/common/src/test/java/org/apache/sqoop/common/TestMapContext.java
@@ -20,8 +20,8 @@ package org.apache.sqoop.common;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 /**
  * Test class for org.apache.sqoop.common.MapContext

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/common/TestSqoopResponseCode.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/common/TestSqoopResponseCode.java b/common/src/test/java/org/apache/sqoop/common/TestSqoopResponseCode.java
index f556c1c..8dc2604 100644
--- a/common/src/test/java/org/apache/sqoop/common/TestSqoopResponseCode.java
+++ b/common/src/test/java/org/apache/sqoop/common/TestSqoopResponseCode.java
@@ -17,8 +17,8 @@
  */
 package org.apache.sqoop.common;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 /**
  * Test class for org.apache.sqoop.common.SqoopResponseCode

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/common/TestSupportedDirections.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/common/TestSupportedDirections.java b/common/src/test/java/org/apache/sqoop/common/TestSupportedDirections.java
index 4f0cdd6..7fe0c08 100644
--- a/common/src/test/java/org/apache/sqoop/common/TestSupportedDirections.java
+++ b/common/src/test/java/org/apache/sqoop/common/TestSupportedDirections.java
@@ -17,8 +17,8 @@
  */
 package org.apache.sqoop.common;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 public class TestSupportedDirections {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/common/TestVersionInfo.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/common/TestVersionInfo.java b/common/src/test/java/org/apache/sqoop/common/TestVersionInfo.java
index 43575da..89d1dcc 100644
--- a/common/src/test/java/org/apache/sqoop/common/TestVersionInfo.java
+++ b/common/src/test/java/org/apache/sqoop/common/TestVersionInfo.java
@@ -17,8 +17,8 @@
  */
 package org.apache.sqoop.common;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 public class TestVersionInfo {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/json/TestConnectorBean.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/json/TestConnectorBean.java b/common/src/test/java/org/apache/sqoop/json/TestConnectorBean.java
index 44d7dd9..f328e93 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestConnectorBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestConnectorBean.java
@@ -17,8 +17,8 @@
  */
 package org.apache.sqoop.json;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertNotNull;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -30,7 +30,7 @@ import org.apache.sqoop.json.util.BeanTestUtil;
 import org.apache.sqoop.json.util.ConfigTestUtil;
 import org.apache.sqoop.model.MConnector;
 import org.json.simple.JSONObject;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class TestConnectorBean {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/json/TestConnectorsBean.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/json/TestConnectorsBean.java b/common/src/test/java/org/apache/sqoop/json/TestConnectorsBean.java
index b4370e6..77b8f52 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestConnectorsBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestConnectorsBean.java
@@ -17,8 +17,8 @@
  */
 package org.apache.sqoop.json;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertNotNull;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -30,7 +30,7 @@ import org.apache.sqoop.json.util.BeanTestUtil;
 import org.apache.sqoop.json.util.ConfigTestUtil;
 import org.apache.sqoop.model.MConnector;
 import org.json.simple.JSONObject;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class TestConnectorsBean {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/json/TestDriverBean.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/json/TestDriverBean.java b/common/src/test/java/org/apache/sqoop/json/TestDriverBean.java
index b72c432..9297533 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestDriverBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestDriverBean.java
@@ -17,14 +17,14 @@
  */
 package org.apache.sqoop.json;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 import java.util.ResourceBundle;
 
 import org.apache.sqoop.json.util.ConfigTestUtil;
 import org.apache.sqoop.model.MDriver;
 import org.json.simple.JSONObject;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/json/TestJSONUtils.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/json/TestJSONUtils.java b/common/src/test/java/org/apache/sqoop/json/TestJSONUtils.java
index 7efee21..4e80ec7 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestJSONUtils.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestJSONUtils.java
@@ -19,12 +19,12 @@ package org.apache.sqoop.json;
 
 import org.apache.sqoop.common.SqoopException;
 import org.json.simple.JSONObject;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 import java.io.Reader;
 import java.io.StringReader;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 /**
  */
@@ -36,12 +36,12 @@ public class TestJSONUtils {
     assertEquals((long)3, object.get("id"));
   }
 
-  @Test(expected = SqoopException.class)
+  @Test(expectedExceptions = SqoopException.class)
   public void testStringInvalid() {
     JSONUtils.parse("{");
   }
 
-  @Test(expected = NullPointerException.class)
+  @Test(expectedExceptions = NullPointerException.class)
   public void testStringNull() {
     JSONUtils.parse((String)null);
   }
@@ -52,12 +52,12 @@ public class TestJSONUtils {
     assertEquals((long)3, object.get("id"));
   }
 
-  @Test(expected = SqoopException.class)
+  @Test(expectedExceptions = SqoopException.class)
   public void testReaderInvalid() {
     JSONUtils.parse(new StringReader("{"));
   }
 
-  @Test(expected = NullPointerException.class)
+  @Test(expectedExceptions = NullPointerException.class)
   public void testReaderNull() {
     JSONUtils.parse((Reader)null);
   }

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/json/TestJobBean.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/json/TestJobBean.java b/common/src/test/java/org/apache/sqoop/json/TestJobBean.java
index 98cfee8..68a4ca7 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestJobBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestJobBean.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.json;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 import java.util.Date;
 
@@ -27,7 +27,7 @@ import org.apache.sqoop.model.MJob;
 import org.apache.sqoop.model.MStringInput;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.ParseException;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class TestJobBean {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/json/TestJobsBean.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/json/TestJobsBean.java b/common/src/test/java/org/apache/sqoop/json/TestJobsBean.java
index 42fbf9d..2dffb06 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestJobsBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestJobsBean.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.json;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -29,7 +29,7 @@ import org.apache.sqoop.model.MJob;
 import org.apache.sqoop.model.MStringInput;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.ParseException;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class TestJobsBean {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/json/TestLinkBean.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/json/TestLinkBean.java b/common/src/test/java/org/apache/sqoop/json/TestLinkBean.java
index 704e4da..ac2c824 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestLinkBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestLinkBean.java
@@ -17,9 +17,9 @@
  */
 package org.apache.sqoop.json;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
 
 import java.util.Date;
 
@@ -29,7 +29,7 @@ import org.apache.sqoop.model.MLink;
 import org.apache.sqoop.model.MStringInput;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class TestLinkBean {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/json/TestLinksBean.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/json/TestLinksBean.java b/common/src/test/java/org/apache/sqoop/json/TestLinksBean.java
index 9633c5e..c6b1007 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestLinksBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestLinksBean.java
@@ -17,8 +17,8 @@
  */
 package org.apache.sqoop.json;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -30,7 +30,7 @@ import org.apache.sqoop.model.MLink;
 import org.apache.sqoop.model.MStringInput;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class TestLinksBean {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/json/TestSubmissionBean.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/json/TestSubmissionBean.java b/common/src/test/java/org/apache/sqoop/json/TestSubmissionBean.java
index 24c0b34..abbfbb4 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestSubmissionBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestSubmissionBean.java
@@ -27,14 +27,14 @@ import org.apache.sqoop.submission.counter.Counter;
 import org.apache.sqoop.submission.counter.CounterGroup;
 import org.apache.sqoop.submission.counter.Counters;
 import org.json.simple.JSONObject;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertNotNull;
 
 // NOTE: This tests both the submission and submissions list bean
 public class TestSubmissionBean {

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/json/TestThrowableBean.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/json/TestThrowableBean.java b/common/src/test/java/org/apache/sqoop/json/TestThrowableBean.java
index a67283c..d7ebf54 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestThrowableBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestThrowableBean.java
@@ -20,11 +20,11 @@ package org.apache.sqoop.json;
 import org.apache.sqoop.common.SqoopException;
 import org.apache.sqoop.json.util.SerializationError;
 import org.json.simple.JSONObject;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/json/TestValidationResultBean.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/json/TestValidationResultBean.java b/common/src/test/java/org/apache/sqoop/json/TestValidationResultBean.java
index c119e02..1ba78c8 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestValidationResultBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestValidationResultBean.java
@@ -21,16 +21,16 @@ import org.apache.sqoop.validation.Message;
 import org.apache.sqoop.validation.Status;
 import org.apache.sqoop.validation.ConfigValidationResult;
 import org.json.simple.JSONObject;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertNotNull;
 
 /**
  */

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/json/util/TestConfigSerialization.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/json/util/TestConfigSerialization.java b/common/src/test/java/org/apache/sqoop/json/util/TestConfigSerialization.java
index 9ae764a..10ac3cf 100644
--- a/common/src/test/java/org/apache/sqoop/json/util/TestConfigSerialization.java
+++ b/common/src/test/java/org/apache/sqoop/json/util/TestConfigSerialization.java
@@ -17,8 +17,8 @@
  */
 package org.apache.sqoop.json.util;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertNotNull;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -36,7 +36,7 @@ import org.apache.sqoop.model.MIntegerInput;
 import org.apache.sqoop.model.MMapInput;
 import org.apache.sqoop.model.MStringInput;
 import org.json.simple.JSONObject;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 /**
  *
@@ -72,7 +72,7 @@ public class TestConfigSerialization {
     assertEquals("A", retrieved.getStringInput("String").getValue());
     assertEquals(map, retrieved.getMapInput("Map").getValue());
     assertEquals(1, (int)retrieved.getIntegerInput("Integer").getValue());
-    assertEquals(true, retrieved.getBooleanInput("Boolean").getValue());
+    assertEquals(true, retrieved.getBooleanInput("Boolean").getValue().booleanValue());
     assertEquals("YES", retrieved.getEnumInput("Enum").getValue());
   }
 
@@ -95,7 +95,7 @@ public class TestConfigSerialization {
     assertEquals(map, retrieved.getMapInput("Map").getValue());
   }
 
-  @Test(expected=SqoopException.class)
+  @Test(expectedExceptions=SqoopException.class)
   public void testMapDataTypeException() {
     MConfig config = getMapConfig();
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/json/util/TestSchemaSerialization.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/json/util/TestSchemaSerialization.java b/common/src/test/java/org/apache/sqoop/json/util/TestSchemaSerialization.java
index 9031c99..0cb7175 100644
--- a/common/src/test/java/org/apache/sqoop/json/util/TestSchemaSerialization.java
+++ b/common/src/test/java/org/apache/sqoop/json/util/TestSchemaSerialization.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.json.util;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -43,7 +43,7 @@ import org.apache.sqoop.schema.type.Text;
 import org.apache.sqoop.schema.type.Time;
 import org.apache.sqoop.schema.type.Unknown;
 import org.json.simple.JSONObject;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 /**
  *
@@ -64,25 +64,25 @@ public class TestSchemaSerialization {
   }
 
   @SuppressWarnings("unused")
-  @Test(expected = SqoopException.class)
+  @Test(expectedExceptions = SqoopException.class)
   public void testEmptySchemaName() {
     Schema schema = new Schema("");
   }
 
   @SuppressWarnings("unused")
-  @Test(expected = SqoopException.class)
+  @Test(expectedExceptions = SqoopException.class)
   public void testNullSchemaName() {
     Schema schema = new Schema(null);
   }
 
   @SuppressWarnings("unused")
-  @Test(expected = SqoopException.class)
+  @Test(expectedExceptions = SqoopException.class)
   public void testSchemaWithNullColumnName() {
     Schema schema = new Schema("test").addColumn(new Text(null));
   }
 
   @SuppressWarnings("unused")
-  @Test(expected = SqoopException.class)
+  @Test(expectedExceptions = SqoopException.class)
   public void testSchemaWithEmptyColumnName() {
     Schema schema = new Schema("test").addColumn(new Text(""));
   }

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/model/TestMAccountableEntity.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestMAccountableEntity.java b/common/src/test/java/org/apache/sqoop/model/TestMAccountableEntity.java
index ba53739..c0644e7 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMAccountableEntity.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMAccountableEntity.java
@@ -21,9 +21,9 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 /**
  * Test class for org.apache.sqoop.model.MAccountableEntity

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/model/TestMBooleanInput.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestMBooleanInput.java b/common/src/test/java/org/apache/sqoop/model/TestMBooleanInput.java
index 433c160..57d2da2 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMBooleanInput.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMBooleanInput.java
@@ -17,12 +17,12 @@
  */
 package org.apache.sqoop.model;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
 
 /**
  * Test class for org.apache.sqoop.model.MBooleanInput
@@ -67,7 +67,7 @@ public class TestMBooleanInput {
   public void testValue() {
     MBooleanInput input1 = new MBooleanInput("sqoopsqoop", true);
     input1.setValue(true);
-    assertEquals(true, input1.getValue());
+    assertEquals(true, input1.getValue().booleanValue());
     input1.setEmpty();
     assertNull(input1.getValue());
   }
@@ -83,7 +83,7 @@ public class TestMBooleanInput {
     String tmp = input1.getUrlSafeValueString();
     // Restore to actual value
     input1.restoreFromUrlSafeValueString(tmp);
-    assertEquals(true, input1.getValue());
+    assertEquals(true, input1.getValue().booleanValue());
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/model/TestMConfig.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestMConfig.java b/common/src/test/java/org/apache/sqoop/model/TestMConfig.java
index c5a07a0..908348d 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMConfig.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMConfig.java
@@ -20,9 +20,9 @@ package org.apache.sqoop.model;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.*;
+import static org.testng.Assert.*;
 
 public class TestMConfig {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/model/TestMConfigList.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestMConfigList.java b/common/src/test/java/org/apache/sqoop/model/TestMConfigList.java
index 46f4f81..4f8261c 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMConfigList.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMConfigList.java
@@ -17,13 +17,13 @@
  */
 package org.apache.sqoop.model;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 public class TestMConfigList {
   @Test

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/model/TestMConnector.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestMConnector.java b/common/src/test/java/org/apache/sqoop/model/TestMConnector.java
index 89ae440..e1c02aa 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMConnector.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMConnector.java
@@ -17,19 +17,19 @@
  */
 package org.apache.sqoop.model;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 import org.apache.sqoop.common.Direction;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class TestMConnector {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/model/TestMDriver.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestMDriver.java b/common/src/test/java/org/apache/sqoop/model/TestMDriver.java
index aa1ee34..3acb27e 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMDriver.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMDriver.java
@@ -17,13 +17,13 @@
  */
 package org.apache.sqoop.model;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.sqoop.json.DriverBean;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class TestMDriver {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/model/TestMEnumInput.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestMEnumInput.java b/common/src/test/java/org/apache/sqoop/model/TestMEnumInput.java
index c76d031..39f09ce 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMEnumInput.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMEnumInput.java
@@ -17,9 +17,9 @@
  */
 package org.apache.sqoop.model;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.*;
+import static org.testng.AssertJUnit.*;
 
 /**
  * Test class for org.apache.sqoop.model.MEnumInput

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/model/TestMIntegerInput.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestMIntegerInput.java b/common/src/test/java/org/apache/sqoop/model/TestMIntegerInput.java
index dd9227e..69e511f 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMIntegerInput.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMIntegerInput.java
@@ -17,12 +17,12 @@
  */
 package org.apache.sqoop.model;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
 
 /**
  * Test class for org.apache.sqoop.model.MInputInput

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/model/TestMJob.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestMJob.java b/common/src/test/java/org/apache/sqoop/model/TestMJob.java
index 848c2cc..605f429 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMJob.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMJob.java
@@ -17,14 +17,14 @@
  */
 package org.apache.sqoop.model;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertNull;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.sqoop.common.Direction;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class TestMJob {
   /**

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/model/TestMJobConfig.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestMJobConfig.java b/common/src/test/java/org/apache/sqoop/model/TestMJobConfig.java
index 7d0641e..bc69c6c 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMJobConfig.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMJobConfig.java
@@ -20,9 +20,9 @@ package org.apache.sqoop.model;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.*;
+import static org.testng.Assert.*;
 
 public class TestMJobConfig {
   /**

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/model/TestMLink.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestMLink.java b/common/src/test/java/org/apache/sqoop/model/TestMLink.java
index 9ad8954..e985c17 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMLink.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMLink.java
@@ -20,9 +20,9 @@ package org.apache.sqoop.model;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.*;
+import static org.testng.Assert.*;
 
 public class TestMLink {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/model/TestMLinkConfig.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestMLinkConfig.java b/common/src/test/java/org/apache/sqoop/model/TestMLinkConfig.java
index 62f61a6..7056f49 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMLinkConfig.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMLinkConfig.java
@@ -20,9 +20,9 @@ package org.apache.sqoop.model;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.*;
+import static org.testng.Assert.*;
 
 public class TestMLinkConfig {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/model/TestMMapInput.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestMMapInput.java b/common/src/test/java/org/apache/sqoop/model/TestMMapInput.java
index fbc08c7..c9b786b 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMMapInput.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMMapInput.java
@@ -20,13 +20,13 @@ package org.apache.sqoop.model;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
 
 /**
  * Test class for org.apache.sqoop.model.MMapInput

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/model/TestMNamedElement.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestMNamedElement.java b/common/src/test/java/org/apache/sqoop/model/TestMNamedElement.java
index 6610784..f851cbd 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMNamedElement.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMNamedElement.java
@@ -17,9 +17,9 @@
  */
 package org.apache.sqoop.model;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.*;
+import static org.testng.Assert.*;
 
 /**
  * Test class for org.apache.sqoop.model.MNamedElement

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/model/TestMPersistableEntity.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestMPersistableEntity.java b/common/src/test/java/org/apache/sqoop/model/TestMPersistableEntity.java
index 8e1e5bd..8710eb2 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMPersistableEntity.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMPersistableEntity.java
@@ -17,9 +17,9 @@
  */
 package org.apache.sqoop.model;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.*;
+import static org.testng.Assert.*;
 
 public class TestMPersistableEntity {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/model/TestMStringInput.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestMStringInput.java b/common/src/test/java/org/apache/sqoop/model/TestMStringInput.java
index 76e625e..a4faf95 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMStringInput.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMStringInput.java
@@ -17,9 +17,9 @@
  */
 package org.apache.sqoop.model;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.*;
+import static org.testng.Assert.*;
 
 /**
  * Test class for org.apache.sqoop.model.MStringInput

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/model/TestMValidatedElement.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestMValidatedElement.java b/common/src/test/java/org/apache/sqoop/model/TestMValidatedElement.java
index 3db261a..f0bdda4 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMValidatedElement.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMValidatedElement.java
@@ -19,9 +19,9 @@ package org.apache.sqoop.model;
 
 import org.apache.sqoop.validation.Message;
 import org.apache.sqoop.validation.Status;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.*;
+import static org.testng.Assert.*;
 
 /**
  * Test class for org.apache.sqoop.model.MValidatedElement

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/schema/type/TestArray.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/schema/type/TestArray.java b/common/src/test/java/org/apache/sqoop/schema/type/TestArray.java
index 82a7d8e..49a8ab1 100644
--- a/common/src/test/java/org/apache/sqoop/schema/type/TestArray.java
+++ b/common/src/test/java/org/apache/sqoop/schema/type/TestArray.java
@@ -17,9 +17,9 @@
  */
 package org.apache.sqoop.schema.type;
 
-import static org.junit.Assert.*;
+import static org.testng.Assert.*;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class TestArray {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/schema/type/TestEnum.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/schema/type/TestEnum.java b/common/src/test/java/org/apache/sqoop/schema/type/TestEnum.java
index f97ebf4..6266e36 100644
--- a/common/src/test/java/org/apache/sqoop/schema/type/TestEnum.java
+++ b/common/src/test/java/org/apache/sqoop/schema/type/TestEnum.java
@@ -17,13 +17,13 @@
  */
 package org.apache.sqoop.schema.type;
 
-import static org.junit.Assert.*;
+import static org.testng.Assert.*;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class TestEnum {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/schema/type/TestMap.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/schema/type/TestMap.java b/common/src/test/java/org/apache/sqoop/schema/type/TestMap.java
index 1f3abfb..962fa56 100644
--- a/common/src/test/java/org/apache/sqoop/schema/type/TestMap.java
+++ b/common/src/test/java/org/apache/sqoop/schema/type/TestMap.java
@@ -17,9 +17,9 @@
  */
 package org.apache.sqoop.schema.type;
 
-import static org.junit.Assert.*;
+import static org.testng.Assert.*;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class TestMap {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/schema/type/TestSet.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/schema/type/TestSet.java b/common/src/test/java/org/apache/sqoop/schema/type/TestSet.java
index daca037..bf23655 100644
--- a/common/src/test/java/org/apache/sqoop/schema/type/TestSet.java
+++ b/common/src/test/java/org/apache/sqoop/schema/type/TestSet.java
@@ -17,9 +17,9 @@
  */
 package org.apache.sqoop.schema.type;
 
-import static org.junit.Assert.*;
+import static org.testng.Assert.*;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class TestSet {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/submission/TestSubmissionStatus.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/submission/TestSubmissionStatus.java b/common/src/test/java/org/apache/sqoop/submission/TestSubmissionStatus.java
index 948c0a6..131f1a3 100644
--- a/common/src/test/java/org/apache/sqoop/submission/TestSubmissionStatus.java
+++ b/common/src/test/java/org/apache/sqoop/submission/TestSubmissionStatus.java
@@ -17,13 +17,13 @@
  */
 package org.apache.sqoop.submission;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 import java.util.Arrays;
 import java.util.List;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
 
 /**
  * Test class for org.apache.sqoop.submission.SubmissionStatus

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/submission/counter/TestCounter.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/submission/counter/TestCounter.java b/common/src/test/java/org/apache/sqoop/submission/counter/TestCounter.java
index 0cf5d2b..fed943c 100644
--- a/common/src/test/java/org/apache/sqoop/submission/counter/TestCounter.java
+++ b/common/src/test/java/org/apache/sqoop/submission/counter/TestCounter.java
@@ -17,8 +17,8 @@
  */
 package org.apache.sqoop.submission.counter;
 
-import org.junit.Assert;
-import org.junit.Test;
+import org.testng.Assert;
+import org.testng.annotations.Test;
 
 /**
  * Test class for org.apache.sqoop.submission.counter.Counter

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/submission/counter/TestCounterGroup.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/submission/counter/TestCounterGroup.java b/common/src/test/java/org/apache/sqoop/submission/counter/TestCounterGroup.java
index ae7aaf0..0fd7398 100644
--- a/common/src/test/java/org/apache/sqoop/submission/counter/TestCounterGroup.java
+++ b/common/src/test/java/org/apache/sqoop/submission/counter/TestCounterGroup.java
@@ -17,9 +17,9 @@
  */
 package org.apache.sqoop.submission.counter;
 
-import org.junit.Assert;
+import org.testng.Assert;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 /**
  * Test class for org.apache.sqoop.submission.counter.CounterGroup

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/submission/counter/TestCounters.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/submission/counter/TestCounters.java b/common/src/test/java/org/apache/sqoop/submission/counter/TestCounters.java
index 90a35c3..4d0a2d9 100644
--- a/common/src/test/java/org/apache/sqoop/submission/counter/TestCounters.java
+++ b/common/src/test/java/org/apache/sqoop/submission/counter/TestCounters.java
@@ -17,9 +17,9 @@
  */
 package org.apache.sqoop.submission.counter;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import org.junit.Assert;
+import org.testng.Assert;
 
 /**
  * Test Class for org.apache.sqoop.submission.counter.TestCounters

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/utils/TestClassUtils.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/utils/TestClassUtils.java b/common/src/test/java/org/apache/sqoop/utils/TestClassUtils.java
index 53ece87..161a1fa 100644
--- a/common/src/test/java/org/apache/sqoop/utils/TestClassUtils.java
+++ b/common/src/test/java/org/apache/sqoop/utils/TestClassUtils.java
@@ -17,12 +17,12 @@
  */
 package org.apache.sqoop.utils;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.testng.AssertJUnit.assertArrayEquals;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/utils/TestMapResourceBundle.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/utils/TestMapResourceBundle.java b/common/src/test/java/org/apache/sqoop/utils/TestMapResourceBundle.java
index 1edc404..5995667 100644
--- a/common/src/test/java/org/apache/sqoop/utils/TestMapResourceBundle.java
+++ b/common/src/test/java/org/apache/sqoop/utils/TestMapResourceBundle.java
@@ -17,12 +17,12 @@
  */
 package org.apache.sqoop.utils;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import static org.junit.Assert.*;
+import static org.testng.Assert.*;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/validation/TestStatus.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/TestStatus.java b/common/src/test/java/org/apache/sqoop/validation/TestStatus.java
index 813969e..2fd11aa 100644
--- a/common/src/test/java/org/apache/sqoop/validation/TestStatus.java
+++ b/common/src/test/java/org/apache/sqoop/validation/TestStatus.java
@@ -17,9 +17,9 @@
  */
 package org.apache.sqoop.validation;
 
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.*;
+import static org.testng.Assert.*;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/validation/TestValidationRunner.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/TestValidationRunner.java b/common/src/test/java/org/apache/sqoop/validation/TestValidationRunner.java
index 6825435..e2d4299 100644
--- a/common/src/test/java/org/apache/sqoop/validation/TestValidationRunner.java
+++ b/common/src/test/java/org/apache/sqoop/validation/TestValidationRunner.java
@@ -26,10 +26,10 @@ import org.apache.sqoop.validation.validators.Contains;
 import org.apache.sqoop.validation.validators.NotEmpty;
 import org.apache.sqoop.validation.validators.NotNull;
 import org.apache.sqoop.validation.validators.AbstractValidator;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertTrue;
 
 /**
  */

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/validation/validators/TestCSVURIValidator.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/validators/TestCSVURIValidator.java b/common/src/test/java/org/apache/sqoop/validation/validators/TestCSVURIValidator.java
index dfb6fdd..ecbe08c 100644
--- a/common/src/test/java/org/apache/sqoop/validation/validators/TestCSVURIValidator.java
+++ b/common/src/test/java/org/apache/sqoop/validation/validators/TestCSVURIValidator.java
@@ -18,9 +18,9 @@
 package org.apache.sqoop.validation.validators;
 
 import org.apache.sqoop.validation.Status;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 /**
  */

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/validation/validators/TestClassAvailable.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/validators/TestClassAvailable.java b/common/src/test/java/org/apache/sqoop/validation/validators/TestClassAvailable.java
index cdfa2a9..3b6e2fe 100644
--- a/common/src/test/java/org/apache/sqoop/validation/validators/TestClassAvailable.java
+++ b/common/src/test/java/org/apache/sqoop/validation/validators/TestClassAvailable.java
@@ -17,13 +17,13 @@
  */
 package org.apache.sqoop.validation.validators;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 import java.util.List;
 
 import org.apache.sqoop.validation.Message;
 import org.apache.sqoop.validation.Status;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 public class TestClassAvailable {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/validation/validators/TestContains.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/validators/TestContains.java b/common/src/test/java/org/apache/sqoop/validation/validators/TestContains.java
index 485efdd..3b5add5 100644
--- a/common/src/test/java/org/apache/sqoop/validation/validators/TestContains.java
+++ b/common/src/test/java/org/apache/sqoop/validation/validators/TestContains.java
@@ -18,9 +18,9 @@
 package org.apache.sqoop.validation.validators;
 
 import org.apache.sqoop.validation.Status;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 /**
  */

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/validation/validators/TestHostAndPortValidator.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/validators/TestHostAndPortValidator.java b/common/src/test/java/org/apache/sqoop/validation/validators/TestHostAndPortValidator.java
index 4ca3048..401d60c 100644
--- a/common/src/test/java/org/apache/sqoop/validation/validators/TestHostAndPortValidator.java
+++ b/common/src/test/java/org/apache/sqoop/validation/validators/TestHostAndPortValidator.java
@@ -18,16 +18,16 @@
 package org.apache.sqoop.validation.validators;
 
 import org.apache.sqoop.validation.Status;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 public class TestHostAndPortValidator {
 
   AbstractValidator<String> validator = new HostAndPortValidator();
 
-  @Before
+  @BeforeMethod
   public void setUp() {
     validator.reset();
     assertEquals(0, validator.getMessages().size());

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/validation/validators/TestNotEmpty.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/validators/TestNotEmpty.java b/common/src/test/java/org/apache/sqoop/validation/validators/TestNotEmpty.java
index 1e53e0f..7018448 100644
--- a/common/src/test/java/org/apache/sqoop/validation/validators/TestNotEmpty.java
+++ b/common/src/test/java/org/apache/sqoop/validation/validators/TestNotEmpty.java
@@ -19,11 +19,11 @@ package org.apache.sqoop.validation.validators;
 
 import org.apache.sqoop.validation.Message;
 import org.apache.sqoop.validation.Status;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 /**
  */

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/validation/validators/TestNotNull.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/validators/TestNotNull.java b/common/src/test/java/org/apache/sqoop/validation/validators/TestNotNull.java
index 0a0b5dc..ee81e09 100644
--- a/common/src/test/java/org/apache/sqoop/validation/validators/TestNotNull.java
+++ b/common/src/test/java/org/apache/sqoop/validation/validators/TestNotNull.java
@@ -19,11 +19,11 @@ package org.apache.sqoop.validation.validators;
 
 import org.apache.sqoop.validation.Message;
 import org.apache.sqoop.validation.Status;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 /**
  */

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/validation/validators/TestNullOrContains.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/validators/TestNullOrContains.java b/common/src/test/java/org/apache/sqoop/validation/validators/TestNullOrContains.java
index 60eafff..a23b504 100644
--- a/common/src/test/java/org/apache/sqoop/validation/validators/TestNullOrContains.java
+++ b/common/src/test/java/org/apache/sqoop/validation/validators/TestNullOrContains.java
@@ -18,9 +18,9 @@
 package org.apache.sqoop.validation.validators;
 
 import org.apache.sqoop.validation.Status;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 /**
  */

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/validation/validators/TestStartsWith.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/validators/TestStartsWith.java b/common/src/test/java/org/apache/sqoop/validation/validators/TestStartsWith.java
index 0fd464c..89b9671 100644
--- a/common/src/test/java/org/apache/sqoop/validation/validators/TestStartsWith.java
+++ b/common/src/test/java/org/apache/sqoop/validation/validators/TestStartsWith.java
@@ -18,9 +18,9 @@
 package org.apache.sqoop.validation.validators;
 
 import org.apache.sqoop.validation.Status;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 /**
  */

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/common/src/test/java/org/apache/sqoop/validation/validators/TestValidator.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/validation/validators/TestValidator.java b/common/src/test/java/org/apache/sqoop/validation/validators/TestValidator.java
index 49b7609..9b92480 100644
--- a/common/src/test/java/org/apache/sqoop/validation/validators/TestValidator.java
+++ b/common/src/test/java/org/apache/sqoop/validation/validators/TestValidator.java
@@ -19,9 +19,9 @@ package org.apache.sqoop.validation.validators;
 
 import org.apache.sqoop.validation.Message;
 import org.apache.sqoop.validation.Status;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/connector/connector-generic-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/pom.xml b/connector/connector-generic-jdbc/pom.xml
index a96b348..7bdeddb 100644
--- a/connector/connector-generic-jdbc/pom.xml
+++ b/connector/connector-generic-jdbc/pom.xml
@@ -49,8 +49,8 @@ limitations under the License.
     </dependency>
 
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
       <scope>test</scope>
     </dependency>
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutorTest.java
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutorTest.java b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutorTest.java
index 61846b7..1734a16 100644
--- a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutorTest.java
+++ b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/GenericJdbcExecutorTest.java
@@ -17,10 +17,10 @@
  */
 package org.apache.sqoop.connector.jdbc;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 public class GenericJdbcExecutorTest {
   private final String table;
@@ -37,7 +37,7 @@ public class GenericJdbcExecutorTest {
       GenericJdbcTestConstants.URL, null, null);
   }
 
-  @Before
+  @BeforeMethod
   public void setUp() {
     if(executor.existTable(emptyTable)) {
       executor.executeUpdate("DROP TABLE " + emptyTable);

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestExtractor.java
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestExtractor.java b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestExtractor.java
index 8e1ce5b..3014ed8 100644
--- a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestExtractor.java
+++ b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestExtractor.java
@@ -17,7 +17,6 @@
  */
 package org.apache.sqoop.connector.jdbc;
 
-
 import org.apache.sqoop.common.MutableContext;
 import org.apache.sqoop.common.MutableMapContext;
 import org.apache.sqoop.common.SqoopException;
@@ -32,12 +31,12 @@ import org.apache.sqoop.schema.type.Decimal;
 import org.apache.sqoop.schema.type.FixedPoint;
 import org.apache.sqoop.schema.type.Text;
 import org.joda.time.LocalDate;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.fail;
 
 
 public class TestExtractor {
@@ -55,7 +54,7 @@ public class TestExtractor {
     tableName = getClass().getSimpleName().toUpperCase();
   }
 
-  @Before
+  @BeforeMethod
   public void setUp() {
     executor = new GenericJdbcExecutor(GenericJdbcTestConstants.DRIVER,
         GenericJdbcTestConstants.URL, null, null);
@@ -74,7 +73,7 @@ public class TestExtractor {
     }
   }
 
-  @After
+  @AfterMethod
   public void tearDown() {
     executor.close();
   }
@@ -159,7 +158,7 @@ public class TestExtractor {
   }
 
   @SuppressWarnings({ "rawtypes", "unchecked" })
-  @Test(expected = SqoopException.class)
+  @Test(expectedExceptions = SqoopException.class)
   public void testIncorrectSchemaColumnSize() throws Exception {
     MutableContext context = new MutableMapContext();
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestFromInitializer.java
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestFromInitializer.java b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestFromInitializer.java
index 345fe9b..e8c0f0b 100644
--- a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestFromInitializer.java
+++ b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestFromInitializer.java
@@ -30,11 +30,11 @@ import org.apache.sqoop.schema.Schema;
 import org.apache.sqoop.schema.type.FixedPoint;
 import org.apache.sqoop.schema.type.FloatingPoint;
 import org.apache.sqoop.schema.type.Text;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 public class TestFromInitializer {
 
@@ -59,7 +59,7 @@ public class TestFromInitializer {
     tableColumns = "ICOL,VCOL";
   }
 
-  @Before
+  @BeforeMethod
   public void setUp() {
     executor = new GenericJdbcExecutor(GenericJdbcTestConstants.DRIVER,
         GenericJdbcTestConstants.URL, null, null);
@@ -108,7 +108,7 @@ public class TestFromInitializer {
     ;
   }
 
-  @After
+  @AfterMethod
   public void tearDown() {
     executor.close();
   }

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestGenericJdbcConnectorUpgrader.java
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestGenericJdbcConnectorUpgrader.java b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestGenericJdbcConnectorUpgrader.java
index d6fe504..febb90f 100644
--- a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestGenericJdbcConnectorUpgrader.java
+++ b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestGenericJdbcConnectorUpgrader.java
@@ -28,12 +28,12 @@ import org.apache.sqoop.model.MInput;
 import org.apache.sqoop.model.MLinkConfig;
 import org.apache.sqoop.model.MStringInput;
 import org.apache.sqoop.model.MToConfig;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 import java.util.LinkedList;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 /**
  * Test upgrader.
@@ -42,7 +42,7 @@ public class TestGenericJdbcConnectorUpgrader {
 
   private GenericJdbcConnectorUpgrader upgrader;
 
-  @Before
+  @BeforeMethod
   public void setUp() {
     upgrader = new GenericJdbcConnectorUpgrader();
   }

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestLoader.java
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestLoader.java b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestLoader.java
index 538b033..d299f1d 100644
--- a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestLoader.java
+++ b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestLoader.java
@@ -18,8 +18,6 @@
 package org.apache.sqoop.connector.jdbc;
 
 import java.sql.ResultSet;
-import java.util.Arrays;
-import java.util.Collection;
 
 import org.apache.sqoop.common.MutableContext;
 import org.apache.sqoop.common.MutableMapContext;
@@ -28,17 +26,15 @@ import org.apache.sqoop.connector.jdbc.configuration.ToJobConfiguration;
 import org.apache.sqoop.etl.io.DataReader;
 import org.apache.sqoop.job.etl.Loader;
 import org.apache.sqoop.job.etl.LoaderContext;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Factory;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.fail;
 
-@RunWith(Parameterized.class)
 public class TestLoader {
 
   private final String tableName;
@@ -49,17 +45,18 @@ public class TestLoader {
 
   private int numberOfRows;
 
-  @Parameters
-  public static Collection<Object[]> data() {
-    return Arrays.asList(new Object[][] {{50}, {100}, {101}, {150}, {200}});
+  @DataProvider(name="test-jdbc-loader")
+  public static Object[][] data() {
+    return new Object[][] {{50}, {100}, {101}, {150}, {200}};
   }
 
+  @Factory(dataProvider="test-jdbc-loader")
   public TestLoader(int numberOfRows) {
     this.numberOfRows = numberOfRows;
-    tableName = getClass().getSimpleName().toUpperCase();
+    this.tableName = getClass().getSimpleName().toUpperCase();
   }
 
-  @Before
+  @BeforeMethod
   public void setUp() {
     executor = new GenericJdbcExecutor(GenericJdbcTestConstants.DRIVER,
         GenericJdbcTestConstants.URL, null, null);
@@ -73,7 +70,7 @@ public class TestLoader {
     }
   }
 
-  @After
+  @AfterMethod
   public void tearDown() {
     executor.close();
   }

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestPartitioner.java
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestPartitioner.java b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestPartitioner.java
index d62e494..e0bbf3f 100644
--- a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestPartitioner.java
+++ b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestPartitioner.java
@@ -32,10 +32,10 @@ import org.apache.sqoop.connector.jdbc.configuration.FromJobConfiguration;
 import org.apache.sqoop.job.etl.Partition;
 import org.apache.sqoop.job.etl.Partitioner;
 import org.apache.sqoop.job.etl.PartitionerContext;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertTrue;
 
 public class TestPartitioner {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestToInitializer.java
----------------------------------------------------------------------
diff --git a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestToInitializer.java b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestToInitializer.java
index 2d7ec3a..01dfab3 100644
--- a/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestToInitializer.java
+++ b/connector/connector-generic-jdbc/src/test/java/org/apache/sqoop/connector/jdbc/TestToInitializer.java
@@ -17,9 +17,9 @@
  */
 package org.apache.sqoop.connector.jdbc;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.fail;
 
 import org.apache.sqoop.common.MutableContext;
 import org.apache.sqoop.common.MutableMapContext;
@@ -31,9 +31,9 @@ import org.apache.sqoop.job.etl.InitializerContext;
 import org.apache.sqoop.validation.ConfigValidationResult;
 import org.apache.sqoop.validation.ConfigValidationRunner;
 import org.apache.sqoop.validation.Status;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 
 public class TestToInitializer {
   private final String schemaName;
@@ -57,7 +57,7 @@ public class TestToInitializer {
     tableColumns = "ICOL,VCOL";
   }
 
-  @Before
+  @BeforeMethod
   public void setUp() {
     executor = new GenericJdbcExecutor(GenericJdbcTestConstants.DRIVER,
         GenericJdbcTestConstants.URL, null, null);
@@ -74,7 +74,7 @@ public class TestToInitializer {
     }
   }
 
-  @After
+  @AfterMethod
   public void tearDown() {
     executor.close();
   }

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/connector/connector-hdfs/pom.xml
----------------------------------------------------------------------
diff --git a/connector/connector-hdfs/pom.xml b/connector/connector-hdfs/pom.xml
index b06275a..dff6f5f 100644
--- a/connector/connector-hdfs/pom.xml
+++ b/connector/connector-hdfs/pom.xml
@@ -33,8 +33,8 @@ limitations under the License.
 
   <dependencies>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>org.testng</groupId>
+      <artifactId>testng</artifactId>
     </dependency>
 
     <dependency>

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestExtractor.java
----------------------------------------------------------------------
diff --git a/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestExtractor.java b/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestExtractor.java
index e5b7b2a..d761b6d 100644
--- a/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestExtractor.java
+++ b/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestExtractor.java
@@ -19,6 +19,7 @@ package org.apache.sqoop.connector.hdfs;
 
 import static org.apache.sqoop.connector.hdfs.configuration.ToFormat.SEQUENCE_FILE;
 import static org.apache.sqoop.connector.hdfs.configuration.ToFormat.TEXT_FILE;
+import static org.testng.AssertJUnit.assertTrue;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -36,14 +37,13 @@ import org.apache.sqoop.connector.hdfs.configuration.ToFormat;
 import org.apache.sqoop.etl.io.DataWriter;
 import org.apache.sqoop.job.etl.Extractor;
 import org.apache.sqoop.job.etl.ExtractorContext;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-@RunWith(Parameterized.class)
+import org.testng.annotations.AfterMethod;
+import org.testng.Assert;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Factory;
+import org.testng.annotations.Test;
+
 public class TestExtractor extends TestHdfsBase {
   private static final String INPUT_ROOT = System.getProperty("maven.build.directory", "/tmp") + "/sqoop/warehouse/";
   private static final int NUMBER_OF_FILES = 5;
@@ -54,6 +54,7 @@ public class TestExtractor extends TestHdfsBase {
   private final String inputDirectory;
   private Extractor<LinkConfiguration, FromJobConfiguration, HdfsPartition> extractor;
 
+  @Factory(dataProvider="test-hdfs-extractor")
   public TestExtractor(ToFormat outputFileType,
                        Class<? extends CompressionCodec> compressionClass)
       throws Exception {
@@ -63,18 +64,18 @@ public class TestExtractor extends TestHdfsBase {
     this.extractor = new HdfsExtractor();
   }
 
-  @Parameterized.Parameters
-  public static Collection<Object[]> data() {
+  @DataProvider(name="test-hdfs-extractor")
+  public static Object[][] data() {
     List<Object[]> parameters = new ArrayList<Object[]>();
     for (Class<?> compressionClass : new Class<?>[]{null, DefaultCodec.class, BZip2Codec.class}) {
       for (Object outputFileType : new Object[]{TEXT_FILE, SEQUENCE_FILE}) {
         parameters.add(new Object[]{outputFileType, compressionClass});
       }
     }
-    return parameters;
+    return parameters.toArray(new Object[0][]);
   }
 
-  @Before
+  @BeforeMethod
   public void setUp() throws Exception {
     FileUtils.mkdirs(inputDirectory);
     switch (this.outputFileType) {
@@ -88,7 +89,7 @@ public class TestExtractor extends TestHdfsBase {
     }
   }
 
-  @After
+  @AfterMethod
   public void tearDown() throws IOException {
     FileUtils.delete(inputDirectory);
   }
@@ -140,7 +141,7 @@ public class TestExtractor extends TestHdfsBase {
     extractor.extract(context, emptyLinkConfig, emptyJobConfig, partition);
 
     for (int index = 0; index < NUMBER_OF_FILES * NUMBER_OF_ROWS_PER_FILE; ++index) {
-      Assert.assertTrue("Index " + (index + 1) + " was not visited", visited[index]);
+      assertTrue("Index " + (index + 1) + " was not visited", visited[index]);
     }
   }
 
@@ -193,7 +194,7 @@ public class TestExtractor extends TestHdfsBase {
     extractor.extract(context, emptyLinkConfig, fromJobConfiguration, partition);
 
     for (int index = 0; index < NUMBER_OF_FILES * NUMBER_OF_ROWS_PER_FILE; ++index) {
-      Assert.assertTrue("Index " + (index + 1) + " was not visited", visited[index]);
+      assertTrue("Index " + (index + 1) + " was not visited", visited[index]);
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/sqoop/blob/471e534e/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestHdfsUtils.java
----------------------------------------------------------------------
diff --git a/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestHdfsUtils.java b/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestHdfsUtils.java
index bba6502..8eefe05 100644
--- a/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestHdfsUtils.java
+++ b/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestHdfsUtils.java
@@ -21,9 +21,13 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.sqoop.connector.hdfs.configuration.FromJobConfiguration;
 import org.apache.sqoop.connector.hdfs.configuration.LinkConfiguration;
 import org.apache.sqoop.connector.hdfs.configuration.ToJobConfiguration;
-import org.junit.Test;
+import org.testng.annotations.Test;
 
-import static org.junit.Assert.*;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals;
 
 public class TestHdfsUtils {
 


Mime
View raw message