sqoop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jar...@apache.org
Subject [2/2] sqoop git commit: SQOOP-2414: Sqoop2: Change JUnit Assert class to TestNG Assert class
Date Mon, 13 Jul 2015 14:42:28 GMT
SQOOP-2414: Sqoop2: Change JUnit Assert class to TestNG Assert class

(Richard via Jarek Jarcec Cecho)


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

Branch: refs/heads/sqoop2
Commit: 3dc19d6f0f3da595a724aef89a81dd10c62193da
Parents: 81b42fe
Author: Jarek Jarcec Cecho <jarcec@apache.org>
Authored: Mon Jul 13 07:41:54 2015 -0700
Committer: Jarek Jarcec Cecho <jarcec@apache.org>
Committed: Mon Jul 13 07:41:54 2015 -0700

----------------------------------------------------------------------
 .../apache/sqoop/client/TestSqoopClient.java    |  2 +-
 .../common/test/asserts/ProviderAsserts.java    |  5 +-
 .../apache/sqoop/json/TestConnectorBean.java    |  2 +-
 .../apache/sqoop/json/TestConnectorsBean.java   |  2 +-
 .../org/apache/sqoop/json/TestDriverBean.java   |  2 +-
 .../org/apache/sqoop/json/TestJSONUtils.java    |  2 +-
 .../java/org/apache/sqoop/json/TestJobBean.java |  2 +-
 .../org/apache/sqoop/json/TestJobsBean.java     |  2 +-
 .../org/apache/sqoop/json/TestLinkBean.java     |  2 +-
 .../org/apache/sqoop/json/TestLinksBean.java    |  2 +-
 .../apache/sqoop/json/TestSubmissionBean.java   |  2 +-
 .../apache/sqoop/json/TestThrowableBean.java    |  2 +-
 .../sqoop/json/TestValidationResultBean.java    |  2 +-
 .../json/util/TestConfigSerialization.java      |  2 +-
 .../json/util/TestSchemaSerialization.java      |  2 +-
 .../org/apache/sqoop/model/TestConfigUtils.java | 53 ++++++++++----------
 .../sqoop/model/TestMAccountableEntity.java     |  2 +-
 .../apache/sqoop/model/TestMBooleanInput.java   |  2 +-
 .../org/apache/sqoop/model/TestMConfigList.java |  2 +-
 .../org/apache/sqoop/model/TestMConnector.java  |  2 +-
 .../org/apache/sqoop/model/TestMDriver.java     |  2 +-
 .../org/apache/sqoop/model/TestMEnumInput.java  |  6 ++-
 .../apache/sqoop/model/TestMIntegerInput.java   |  2 +-
 .../java/org/apache/sqoop/model/TestMJob.java   |  2 +-
 .../org/apache/sqoop/model/TestMMapInput.java   |  2 +-
 .../org/apache/sqoop/utils/TestClassUtils.java  | 15 +++---
 .../sqoop/validation/TestValidationRunner.java  |  2 +-
 .../validators/TestCSVURIValidator.java         |  2 +-
 .../validators/TestClassAvailable.java          |  2 +-
 .../validation/validators/TestContains.java     |  2 +-
 .../validators/TestHostAndPortValidator.java    |  2 +-
 .../validation/validators/TestNotEmpty.java     |  2 +-
 .../validation/validators/TestNotNull.java      |  2 +-
 .../validators/TestNullOrContains.java          |  2 +-
 .../validation/validators/TestStartsWith.java   |  2 +-
 .../validation/validators/TestValidator.java    |  2 +-
 .../connector/jdbc/GenericJdbcExecutorTest.java | 28 +++++------
 .../sqoop/connector/jdbc/TestExtractor.java     |  4 +-
 .../connector/jdbc/TestFromInitializer.java     |  2 +-
 .../jdbc/TestGenericJdbcConnectorUpgrader.java  |  2 +-
 .../apache/sqoop/connector/jdbc/TestLoader.java |  2 +-
 .../sqoop/connector/jdbc/TestPartitioner.java   |  2 +-
 .../sqoop/connector/jdbc/TestToInitializer.java | 27 +++++-----
 .../sqoop/connector/hdfs/TestExtractor.java     |  6 +--
 .../sqoop/connector/hdfs/TestHdfsUtils.java     |  7 ++-
 .../sqoop/connector/hdfs/TestLinkConfig.java    |  8 +--
 .../sqoop/connector/hdfs/TestPartitioner.java   |  2 +-
 .../connector/kafka/TestConfiguration.java      |  2 +-
 .../kite/TestKiteConnectorUpgrader.java         |  2 +-
 .../sqoop/connector/kite/TestKiteExecutor.java  | 15 +++---
 .../kite/configuration/TestConfigUtil.java      |  2 +-
 .../idf/TestAVROIntermediateDataFormat.java     |  2 +-
 .../idf/TestCSVIntermediateDataFormat.java      |  2 +-
 .../idf/TestJSONIntermediateDataFormat.java     |  2 +-
 .../connector/matcher/TestLocationMatcher.java  |  8 +--
 .../connector/matcher/TestNameMatcher.java      |  8 +--
 .../connector/TestConnectorManagerUtils.java    |  4 +-
 .../sqoop/driver/TestDriverConfigUpgrader.java  |  2 +-
 .../org/apache/sqoop/driver/TestJobManager.java |  2 +-
 .../org/apache/sqoop/driver/TestJobRequest.java |  2 +-
 .../sqoop/repository/TestJdbcRepository.java    |  2 +-
 .../org/apache/sqoop/job/TestMapReduce.java     |  6 +--
 .../java/org/apache/sqoop/job/TestMatching.java | 17 +++----
 .../sqoop/job/mr/TestMRConfigurationUtils.java  |  2 +-
 .../sqoop/repository/derby/DerbyTestCase.java   |  2 +-
 .../repository/derby/TestConnectorHandling.java |  2 +-
 .../repository/derby/TestDriverHandling.java    |  2 +-
 .../sqoop/repository/derby/TestInputTypes.java  |  2 +-
 .../sqoop/repository/derby/TestJobHandling.java |  2 +-
 .../repository/derby/TestLinkHandling.java      |  2 +-
 .../postgresql/TestConnectorHandling.java       |  4 +-
 .../postgresql/TestDriverHandling.java          |  2 +-
 .../repository/postgresql/TestJobHandling.java  |  8 +--
 .../repository/postgresql/TestLinkHandling.java |  8 +--
 .../postgresql/TestSubmissionHandling.java      |  8 +--
 .../apache/sqoop/test/asserts/HdfsAsserts.java  |  2 +-
 .../sqoop/test/testcases/ConnectorTestCase.java |  5 +-
 .../jdbc/generic/FromHDFSToRDBMSTest.java       |  2 +-
 .../jdbc/generic/TableStagedRDBMSTest.java      |  2 +-
 .../derby/upgrade/Derby1_99_3UpgradeTest.java   |  2 +-
 .../upgrade/DerbyRepositoryUpgradeTest.java     |  2 +-
 .../SubmissionWithDisabledModelObjectsTest.java |  2 +-
 .../sqoop/integration/server/VersionTest.java   |  2 +-
 83 files changed, 189 insertions(+), 185 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 0c6fa62..ed0badc 100644
--- a/client/src/test/java/org/apache/sqoop/client/TestSqoopClient.java
+++ b/client/src/test/java/org/apache/sqoop/client/TestSqoopClient.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.client;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 505e084..4d6c8ec 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
@@ -24,7 +24,7 @@ import org.apache.sqoop.common.test.db.TableName;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
 
 /**
@@ -67,7 +67,8 @@ public class ProviderAsserts {
       int i = 1;
       for(Object expectedValue : values) {
         Object actualValue = rs.getObject(i);
-        assertEquals("Columns do not match on position: " + i, expectedValue.toString(), actualValue.toString());
+        assertEquals(expectedValue.toString(), actualValue.toString(),
+                "Columns do not match on position: " + i);
         i++;
       }
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 f328e93..a978d62 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestConnectorBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestConnectorBean.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.json;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 77b8f52..15377c9 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestConnectorsBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestConnectorsBean.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.json;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 9297533..9f6516a 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestDriverBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestDriverBean.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.json;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.util.ResourceBundle;
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 4e80ec7..67ab412 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestJSONUtils.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestJSONUtils.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
 import java.io.Reader;
 import java.io.StringReader;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 /**
  */

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 4009029..5b5aa91 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.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.util.Date;
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 b73ad21..2a9570f 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.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.Date;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 ac2c824..59d900f 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestLinkBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestLinkBean.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.json;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 c6b1007..7faab88 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestLinksBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestLinksBean.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.json;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 74081ae..1fc2ae2 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestSubmissionBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestSubmissionBean.java
@@ -33,7 +33,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
 // NOTE: This tests both the submission and submissions list bean

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 d7ebf54..e557519 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestThrowableBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestThrowableBean.java
@@ -22,7 +22,7 @@ import org.apache.sqoop.json.util.SerializationError;
 import org.json.simple.JSONObject;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 1ba78c8..0381c7d 100644
--- a/common/src/test/java/org/apache/sqoop/json/TestValidationResultBean.java
+++ b/common/src/test/java/org/apache/sqoop/json/TestValidationResultBean.java
@@ -29,7 +29,7 @@ import java.util.Map;
 
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
 /**

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 368502f..d2989d3 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
@@ -18,7 +18,7 @@
 package org.apache.sqoop.json.util;
 
 import static org.testng.Assert.assertFalse;
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 45b34a9..7a1911b 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.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.util.Arrays;
 import java.util.Collections;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/common/src/test/java/org/apache/sqoop/model/TestConfigUtils.java
----------------------------------------------------------------------
diff --git a/common/src/test/java/org/apache/sqoop/model/TestConfigUtils.java b/common/src/test/java/org/apache/sqoop/model/TestConfigUtils.java
index 472bbce..61599d5 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestConfigUtils.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestConfigUtils.java
@@ -17,11 +17,12 @@
  */
 package org.apache.sqoop.model;
 
-import org.testng.annotations.Test;
 import org.testng.Assert;
-import org.testng.AssertJUnit;
+import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertNull;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -42,17 +43,17 @@ public class TestConfigUtils {
     config.cConfig.enumeration = Enumeration.X;
 
     List<MConfig> configsByInstance = ConfigUtils.toConfigs(config);
-    AssertJUnit.assertEquals(getConfigs(), configsByInstance);
-    AssertJUnit.assertEquals("value", configsByInstance.get(0).getInputs().get(0).getValue());
-    AssertJUnit.assertEquals("X", configsByInstance.get(2).getInput("cConfig.enumeration").getValue());
+    assertEquals(getConfigs(), configsByInstance);
+    assertEquals("value", configsByInstance.get(0).getInputs().get(0).getValue());
+    assertEquals("X", configsByInstance.get(2).getInput("cConfig.enumeration").getValue());
 
     List<MConfig> configsByClass = ConfigUtils.toConfigs(TestConfiguration.class);
-    AssertJUnit.assertEquals(getConfigs(), configsByClass);
+    assertEquals(getConfigs(), configsByClass);
 
     List<MConfig> configsByBoth = ConfigUtils.toConfigs(TestConfiguration.class, config);
-    AssertJUnit.assertEquals(getConfigs(), configsByBoth);
-    AssertJUnit.assertEquals("value", configsByBoth.get(0).getInputs().get(0).getValue());
-    AssertJUnit.assertEquals("X", configsByBoth.get(2).getInput("cConfig.enumeration").getValue());
+    assertEquals(getConfigs(), configsByBoth);
+    assertEquals("value", configsByBoth.get(0).getInputs().get(0).getValue());
+    assertEquals("X", configsByBoth.get(2).getInput("cConfig.enumeration").getValue());
   }
 
   @Test(expectedExceptions = SqoopException.class)
@@ -81,7 +82,7 @@ public class TestConfigUtils {
     try {
       ConfigUtils.toConfigs(ConfigWithoutAnnotation.class);
     } catch (SqoopException ex) {
-      AssertJUnit.assertEquals(ModelError.MODEL_003, ex.getErrorCode());
+      assertEquals(ModelError.MODEL_003, ex.getErrorCode());
       return;
     }
 
@@ -93,7 +94,7 @@ public class TestConfigUtils {
     try {
       ConfigUtils.toConfigs(ConfigurationWithNonUniqueConfigNameAttribute.class);
     } catch (SqoopException ex) {
-      AssertJUnit.assertEquals(ModelError.MODEL_012, ex.getErrorCode());
+      assertEquals(ModelError.MODEL_012, ex.getErrorCode());
       return;
     }
 
@@ -105,7 +106,7 @@ public class TestConfigUtils {
     try {
       ConfigUtils.toConfigs(ConfigurationWithInvalidConfigNameAttribute.class);
     } catch (SqoopException ex) {
-      AssertJUnit.assertEquals(ModelError.MODEL_013, ex.getErrorCode());
+      assertEquals(ModelError.MODEL_013, ex.getErrorCode());
       return;
     }
     Assert.fail("Correct exception wasn't thrown");
@@ -116,7 +117,7 @@ public class TestConfigUtils {
     try {
       ConfigUtils.toConfigs(ConfigurationWithInvalidConfigNameAttributeLength.class);
     } catch (SqoopException ex) {
-      AssertJUnit.assertEquals(ModelError.MODEL_014, ex.getErrorCode());
+      assertEquals(ModelError.MODEL_014, ex.getErrorCode());
       return;
     }
     Assert.fail("Correct exception wasn't thrown");
@@ -130,7 +131,7 @@ public class TestConfigUtils {
       ConfigUtils.toConfigs(config);
       Assert.fail("We were expecting exception for unsupported type.");
     } catch (SqoopException ex) {
-      AssertJUnit.assertEquals(ModelError.MODEL_007, ex.getErrorCode());
+      assertEquals(ModelError.MODEL_007, ex.getErrorCode());
     }
   }
 
@@ -143,7 +144,7 @@ public class TestConfigUtils {
     TestConfiguration config = new TestConfiguration();
 
     ConfigUtils.fromConfigs(configs, config);
-    AssertJUnit.assertEquals("value", config.aConfig.a1);
+    assertEquals("value", config.aConfig.a1);
   }
 
   @Test
@@ -153,8 +154,8 @@ public class TestConfigUtils {
     ((MStringInput) configs.get(0).getInputs().get(0)).setValue("value");
 
     TestConfiguration config = (TestConfiguration) ConfigUtils.fromConfigs(configs,
-        TestConfiguration.class);
-    AssertJUnit.assertEquals("value", config.aConfig.a1);
+            TestConfiguration.class);
+    assertEquals("value", config.aConfig.a1);
   }
 
   @Test
@@ -168,7 +169,7 @@ public class TestConfigUtils {
     config.bConfig.b1 = "y";
 
     ConfigUtils.fromConfigs(configs, config);
-    AssertJUnit.assertEquals("value", config.aConfig.a1);
+    assertEquals("value", config.aConfig.a1);
     assertNull(config.aConfig.a2);
     assertNull(config.bConfig.b2);
     assertNull(config.bConfig.b2);
@@ -195,17 +196,17 @@ public class TestConfigUtils {
 
     ConfigUtils.fillValues(json, targetConfig);
 
-    AssertJUnit.assertEquals("A", targetConfig.aConfig.a1);
+    assertEquals("A", targetConfig.aConfig.a1);
     assertNull(targetConfig.aConfig.a2);
 
     assertNull(targetConfig.bConfig.b1);
-    AssertJUnit.assertEquals("B", targetConfig.bConfig.b2);
+    assertEquals("B", targetConfig.bConfig.b2);
 
-    AssertJUnit.assertEquals((Long) 4L, targetConfig.cConfig.longValue);
-    AssertJUnit.assertEquals(1, targetConfig.cConfig.map.size());
-    AssertJUnit.assertTrue(targetConfig.cConfig.map.containsKey("C"));
-    AssertJUnit.assertEquals("D", targetConfig.cConfig.map.get("C"));
-    AssertJUnit.assertEquals(Enumeration.X, targetConfig.cConfig.enumeration);
+    assertEquals((Long) 4L, targetConfig.cConfig.longValue);
+    assertEquals(1, targetConfig.cConfig.map.size());
+    assertTrue(targetConfig.cConfig.map.containsKey("C"));
+    assertEquals("D", targetConfig.cConfig.map.get("C"));
+    assertEquals(Enumeration.X, targetConfig.cConfig.enumeration);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 b05e778..4113b50 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMAccountableEntity.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMAccountableEntity.java
@@ -24,7 +24,7 @@ import java.util.List;
 import org.apache.commons.lang.StringUtils;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 /**
  * Test class for org.apache.sqoop.model.MAccountableEntity

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 3e863fa..d659c9e 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMBooleanInput.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMBooleanInput.java
@@ -20,7 +20,7 @@ package org.apache.sqoop.model;
 import org.apache.commons.lang.StringUtils;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 6550dde..3dfc33a 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMConfigList.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMConfigList.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 public class TestMConfigList {
   @Test

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 57afee6..d996692 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMConnector.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMConnector.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.model;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotEquals;
 import static org.testng.Assert.assertNotNull;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 3acb27e..f947a60 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMDriver.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMDriver.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.model;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 744ac50..6f588ef 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMEnumInput.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMEnumInput.java
@@ -20,7 +20,9 @@ package org.apache.sqoop.model;
 import org.apache.commons.lang.StringUtils;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
 
 /**
  * Test class for org.apache.sqoop.model.MEnumInput
@@ -36,7 +38,7 @@ public class TestMEnumInput {
     String[] values = { "value1", "value2" };
     MEnumInput input = new MEnumInput("NAME", false, InputEditable.ANY, StringUtils.EMPTY, values);
     assertEquals("NAME", input.getName());
-    assertArrayEquals(values, input.getValues());
+    assertEquals(values, input.getValues());
     assertEquals(MInputType.ENUM, input.getType());
 
     MEnumInput input1 = new MEnumInput("NAME", false, InputEditable.ANY, StringUtils.EMPTY, values);

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 2c3decf..aa5bdef 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMIntegerInput.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMIntegerInput.java
@@ -20,7 +20,7 @@ package org.apache.sqoop.model;
 import org.apache.commons.lang.StringUtils;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 4f36b4b..e0ffdc2 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMJob.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMJob.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.model;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 53a3549..c4e098d 100644
--- a/common/src/test/java/org/apache/sqoop/model/TestMMapInput.java
+++ b/common/src/test/java/org/apache/sqoop/model/TestMMapInput.java
@@ -23,7 +23,7 @@ import java.util.Map;
 import org.apache.commons.lang.StringUtils;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 161a1fa..986b878 100644
--- a/common/src/test/java/org/apache/sqoop/utils/TestClassUtils.java
+++ b/common/src/test/java/org/apache/sqoop/utils/TestClassUtils.java
@@ -19,8 +19,7 @@ package org.apache.sqoop.utils;
 
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertArrayEquals;
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 
@@ -117,13 +116,13 @@ public class TestClassUtils {
   public void testGetEnumStrings() {
     assertNull(ClassUtils.getEnumStrings(A.class));
 
-    assertArrayEquals(
-      new String[]{"A", "B", "C"},
-      ClassUtils.getEnumStrings(EnumA.class)
+    assertEquals(
+            new String[]{"A", "B", "C"},
+            ClassUtils.getEnumStrings(EnumA.class)
     );
-    assertArrayEquals(
-      new String[]{"X", "Y"},
-      ClassUtils.getEnumStrings(EnumX.class)
+    assertEquals(
+            new String[]{"X", "Y"},
+            ClassUtils.getEnumStrings(EnumX.class)
     );
   }
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 e2d4299..7dd9ce1 100644
--- a/common/src/test/java/org/apache/sqoop/validation/TestValidationRunner.java
+++ b/common/src/test/java/org/apache/sqoop/validation/TestValidationRunner.java
@@ -28,7 +28,7 @@ import org.apache.sqoop.validation.validators.NotNull;
 import org.apache.sqoop.validation.validators.AbstractValidator;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
 /**

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 ecbe08c..ffbdbe0 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
@@ -20,7 +20,7 @@ package org.apache.sqoop.validation.validators;
 import org.apache.sqoop.validation.Status;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 /**
  */

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 3b6e2fe..343f92c 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,7 +17,7 @@
  */
 package org.apache.sqoop.validation.validators;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.util.List;
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 3b5add5..1afc6f9 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
@@ -20,7 +20,7 @@ package org.apache.sqoop.validation.validators;
 import org.apache.sqoop.validation.Status;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 /**
  */

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 1c726ac..143743a 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
@@ -21,7 +21,7 @@ import org.apache.sqoop.validation.Status;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 public class TestHostAndPortValidator {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 7018448..1f61aaf 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
@@ -23,7 +23,7 @@ import org.testng.annotations.Test;
 
 import java.util.List;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 /**
  */

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 ee81e09..8e0ce7a 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
@@ -23,7 +23,7 @@ import org.testng.annotations.Test;
 
 import java.util.List;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 /**
  */

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 a23b504..729668f 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
@@ -20,7 +20,7 @@ package org.apache.sqoop.validation.validators;
 import org.apache.sqoop.validation.Status;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 /**
  */

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 89b9671..709de11 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
@@ -20,7 +20,7 @@ package org.apache.sqoop.validation.validators;
 import org.apache.sqoop.validation.Status;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 /**
  */

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 9b92480..c25431b 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
@@ -21,7 +21,7 @@ import org.apache.sqoop.validation.Message;
 import org.apache.sqoop.validation.Status;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 91f97f1..22c9e15 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
@@ -23,7 +23,7 @@ import org.apache.sqoop.connector.jdbc.configuration.LinkConfiguration;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 public class GenericJdbcExecutorTest {
   private final String table;
@@ -73,30 +73,28 @@ public class GenericJdbcExecutorTest {
   @Test
   public void testDeleteTableData() throws Exception {
     executor.deleteTableData(table);
-    assertEquals("Table " + table + " is expected to be empty.",
-      0, executor.getTableRowCount(table));
+    assertEquals(0, executor.getTableRowCount(table),
+            "Table " + table + " is expected to be empty.");
   }
 
   @Test
   public void testMigrateData() throws Exception {
-    assertEquals("Table " + emptyTable + " is expected to be empty.",
-      0, executor.getTableRowCount(emptyTable));
-    assertEquals("Table " + table + " is expected to have " +
-      NUMBER_OF_ROWS + " rows.", NUMBER_OF_ROWS,
-      executor.getTableRowCount(table));
+    assertEquals(0, executor.getTableRowCount(emptyTable),
+            "Table " + emptyTable + " is expected to be empty.");
+    assertEquals(NUMBER_OF_ROWS, executor.getTableRowCount(table),
+            "Table " + table + " is expected to have " + NUMBER_OF_ROWS + " rows.");
 
     executor.migrateData(table, emptyTable);
 
-    assertEquals("Table " + table + " is expected to be empty.", 0,
-      executor.getTableRowCount(table));
-    assertEquals("Table " + emptyTable + " is expected to have " +
-      NUMBER_OF_ROWS + " rows.", NUMBER_OF_ROWS,
-      executor.getTableRowCount(emptyTable));
+    assertEquals(0, executor.getTableRowCount(table),
+            "Table " + table + " is expected to be empty.");
+    assertEquals(NUMBER_OF_ROWS, executor.getTableRowCount(emptyTable),
+            "Table " + emptyTable + " is expected to have " + NUMBER_OF_ROWS + " rows.");
   }
 
   @Test
   public void testGetTableRowCount() throws Exception {
-    assertEquals("Table " + table + " is expected to be empty.",
-      NUMBER_OF_ROWS, executor.getTableRowCount(table));
+    assertEquals(NUMBER_OF_ROWS, executor.getTableRowCount(table),
+            "Table " + table + " is expected to be empty.");
   }
 }

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 9acc5c3..77ac9c3 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,7 @@
  */
 package org.apache.sqoop.connector.jdbc;
 
-import static org.testng.AssertJUnit.assertNull;
+import static org.testng.Assert.assertNull;
 import org.apache.sqoop.common.MutableContext;
 import org.apache.sqoop.common.MutableMapContext;
 import org.apache.sqoop.common.SqoopException;
@@ -36,7 +36,7 @@ import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
 
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 5fc2a4a..6ae6f90 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
@@ -34,7 +34,7 @@ import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 public class TestFromInitializer {
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 2a3ab9b..c39aabc 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
@@ -35,7 +35,7 @@ import org.testng.annotations.Test;
 
 import java.util.LinkedList;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 /**
  * Test upgrader.

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 d423a6a..f192c22 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
@@ -43,7 +43,7 @@ import org.testng.annotations.DataProvider;
 import org.testng.annotations.Factory;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
 
 public class TestLoader {

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 e0bbf3f..bec6478 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
@@ -34,7 +34,7 @@ import org.apache.sqoop.job.etl.Partitioner;
 import org.apache.sqoop.job.etl.PartitionerContext;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
 public class TestPartitioner {

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 04c5437..1c65fc3 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,7 +17,7 @@
  */
 package org.apache.sqoop.connector.jdbc;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.fail;
 
@@ -290,19 +290,19 @@ public class TestToInitializer {
     jobConfig.toJobConfig.shouldClearStageTable = false;
     ConfigValidationRunner validationRunner = new ConfigValidationRunner();
     ConfigValidationResult result = validationRunner.validate(jobConfig);
-    assertEquals("User should not specify clear stage table flag without " +
-      "specifying name of the stage table",
-      Status.ERROR,
-        result.getStatus());
+    assertEquals(Status.ERROR,
+        result.getStatus(),
+        "User should not specify clear stage table flag without " +
+        "specifying name of the stage table");
     assertTrue(result.getMessages().containsKey(
       "toJobConfig"));
 
     jobConfig.toJobConfig.shouldClearStageTable = true;
     result = validationRunner.validate(jobConfig);
-    assertEquals("User should not specify clear stage table flag without " +
-      "specifying name of the stage table",
-      Status.ERROR,
-        result.getStatus());
+    assertEquals(Status.ERROR,
+        result.getStatus(),
+        "User should not specify clear stage table flag without " +
+        "specifying name of the stage table");
     assertTrue(result.getMessages().containsKey(
       "toJobConfig"));
   }
@@ -320,8 +320,9 @@ public class TestToInitializer {
 
     ConfigValidationRunner validationRunner = new ConfigValidationRunner();
     ConfigValidationResult result = validationRunner.validate(jobConfig);
-    assertEquals("Stage table name cannot be specified without specifying " +
-      "table name", Status.ERROR, result.getStatus());
+    assertEquals(Status.ERROR, result.getStatus(),
+            "Stage table name cannot be specified without specifying " +
+            "table name");
     assertTrue(result.getMessages().containsKey(
       "toJobConfig"));
   }
@@ -348,8 +349,8 @@ public class TestToInitializer {
     @SuppressWarnings("rawtypes")
     Initializer initializer = new GenericJdbcToInitializer();
     initializer.initialize(initializerContext, linkConfig, jobConfig);
-    assertEquals("Stage table should have been cleared", 0,
-      executor.getTableRowCount(stageTableName));
+    assertEquals(0, executor.getTableRowCount(stageTableName),
+            "Stage table should have been cleared");
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 03b13bd..6f9986d 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,7 +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 static org.testng.Assert.assertTrue;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -148,7 +148,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) {
-      assertTrue("Index " + (index + 1) + " was not visited", visited[index]);
+      assertTrue(visited[index], "Index " + (index + 1) + " was not visited");
     }
   }
 
@@ -205,7 +205,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) {
-      assertTrue("Index " + (index + 1) + " was not visited", visited[index]);
+      assertTrue(visited[index], "Index " + (index + 1) + " was not visited");
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/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 c560c08..179e8b7 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
@@ -26,8 +26,7 @@ import org.testng.annotations.Test;
 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;
+import static org.testng.Assert.assertEquals;
 
 public class TestHdfsUtils {
 
@@ -87,7 +86,7 @@ public class TestHdfsUtils {
     };
 
     // No transformations
-    assertArrayEquals(toRecord, HdfsUtils.formatRecord(linkConfiguration, fromJobConfiguration, fromRecord));
-    assertArrayEquals(fromRecord, HdfsUtils.formatRecord(linkConfiguration, toJobConfiguration, toRecord));
+    assertEquals(toRecord, HdfsUtils.formatRecord(linkConfiguration, fromJobConfiguration, fromRecord));
+    assertEquals(fromRecord, HdfsUtils.formatRecord(linkConfiguration, toJobConfiguration, toRecord));
   }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestLinkConfig.java
----------------------------------------------------------------------
diff --git a/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestLinkConfig.java b/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestLinkConfig.java
index 27a94c6..05178ac 100644
--- a/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestLinkConfig.java
+++ b/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestLinkConfig.java
@@ -20,8 +20,8 @@ package org.apache.sqoop.connector.hdfs;
 import org.apache.sqoop.connector.hdfs.configuration.LinkConfig;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertFalse;
-import static org.testng.AssertJUnit.assertTrue;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
 
 public class TestLinkConfig {
   @Test
@@ -45,7 +45,7 @@ public class TestLinkConfig {
       LinkConfig.ConfigValidator validator = new LinkConfig.ConfigValidator();
       config.uri = uri;
       validator.validate(config);
-      assertTrue(uri, validator.getStatus().canProceed());
+      assertTrue(validator.getStatus().canProceed(), uri);
     }
   }
 
@@ -65,7 +65,7 @@ public class TestLinkConfig {
       LinkConfig.ConfigValidator validator = new LinkConfig.ConfigValidator();
       config.uri = uri;
       validator.validate(config);
-      assertFalse(uri, validator.getStatus().canProceed());
+      assertFalse(validator.getStatus().canProceed(), uri);
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestPartitioner.java
----------------------------------------------------------------------
diff --git a/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestPartitioner.java b/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestPartitioner.java
index ff71128..9a6bfff 100644
--- a/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestPartitioner.java
+++ b/connector/connector-hdfs/src/test/java/org/apache/sqoop/connector/hdfs/TestPartitioner.java
@@ -19,7 +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.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.io.IOException;
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/connector/connector-kafka/src/test/java/org/apache/sqoop/connector/kafka/TestConfiguration.java
----------------------------------------------------------------------
diff --git a/connector/connector-kafka/src/test/java/org/apache/sqoop/connector/kafka/TestConfiguration.java b/connector/connector-kafka/src/test/java/org/apache/sqoop/connector/kafka/TestConfiguration.java
index ecdbdca..56f0dd3 100644
--- a/connector/connector-kafka/src/test/java/org/apache/sqoop/connector/kafka/TestConfiguration.java
+++ b/connector/connector-kafka/src/test/java/org/apache/sqoop/connector/kafka/TestConfiguration.java
@@ -23,7 +23,7 @@ import org.apache.sqoop.validation.ConfigValidationRunner;
 import org.apache.sqoop.validation.Status;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 public class TestConfiguration {
   @Test

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/connector/connector-kite/src/test/java/org/apache/sqoop/connector/kite/TestKiteConnectorUpgrader.java
----------------------------------------------------------------------
diff --git a/connector/connector-kite/src/test/java/org/apache/sqoop/connector/kite/TestKiteConnectorUpgrader.java b/connector/connector-kite/src/test/java/org/apache/sqoop/connector/kite/TestKiteConnectorUpgrader.java
index 741c81e..a6943f4 100644
--- a/connector/connector-kite/src/test/java/org/apache/sqoop/connector/kite/TestKiteConnectorUpgrader.java
+++ b/connector/connector-kite/src/test/java/org/apache/sqoop/connector/kite/TestKiteConnectorUpgrader.java
@@ -31,7 +31,7 @@ import org.testng.annotations.Test;
 
 import java.util.LinkedList;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 public class TestKiteConnectorUpgrader {
   private KiteConnectorUpgrader upgrader;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/connector/connector-kite/src/test/java/org/apache/sqoop/connector/kite/TestKiteExecutor.java
----------------------------------------------------------------------
diff --git a/connector/connector-kite/src/test/java/org/apache/sqoop/connector/kite/TestKiteExecutor.java b/connector/connector-kite/src/test/java/org/apache/sqoop/connector/kite/TestKiteExecutor.java
index 0e797f8..f2b88f0 100644
--- a/connector/connector-kite/src/test/java/org/apache/sqoop/connector/kite/TestKiteExecutor.java
+++ b/connector/connector-kite/src/test/java/org/apache/sqoop/connector/kite/TestKiteExecutor.java
@@ -25,7 +25,7 @@ import org.kitesdk.data.Dataset;
 import org.kitesdk.data.DatasetDescriptor;
 import org.kitesdk.data.DatasetReader;
 import org.kitesdk.data.DatasetWriter;
-import org.testng.AssertJUnit;
+import org.testng.Assert;
 import org.testng.IObjectFactory;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -40,6 +40,9 @@ import static org.mockito.Mockito.when;
 import static org.mockito.MockitoAnnotations.initMocks;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
 
 public class TestKiteExecutor {
 
@@ -124,14 +127,14 @@ public class TestKiteExecutor {
     // exercise & verify
     for (int i = 0; i < NUMBER_OF_ROWS; i++) {
       Object[] actual = executor.readRecord();
-      AssertJUnit.assertNotNull(actual);
-      AssertJUnit.assertEquals(2, actual.length);
-      AssertJUnit.assertEquals(1, actual[0]);
-      AssertJUnit.assertEquals("foo", actual[1]);
+      assertNotNull(actual);
+      assertEquals(2, actual.length);
+      assertEquals(1, actual[0]);
+      assertEquals("foo", actual[1]);
     }
     when(readerMock.hasNext()).thenReturn(false);
     Object[] actual = executor.readRecord();
-    AssertJUnit.assertNull(actual);
+    assertNull(actual);
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/connector/connector-kite/src/test/java/org/apache/sqoop/connector/kite/configuration/TestConfigUtil.java
----------------------------------------------------------------------
diff --git a/connector/connector-kite/src/test/java/org/apache/sqoop/connector/kite/configuration/TestConfigUtil.java b/connector/connector-kite/src/test/java/org/apache/sqoop/connector/kite/configuration/TestConfigUtil.java
index 827024b..5a1e794 100644
--- a/connector/connector-kite/src/test/java/org/apache/sqoop/connector/kite/configuration/TestConfigUtil.java
+++ b/connector/connector-kite/src/test/java/org/apache/sqoop/connector/kite/configuration/TestConfigUtil.java
@@ -19,7 +19,7 @@ package org.apache.sqoop.connector.kite.configuration;
 
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 /**
  * Test configuration objects.

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/idf/TestAVROIntermediateDataFormat.java
----------------------------------------------------------------------
diff --git a/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/idf/TestAVROIntermediateDataFormat.java b/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/idf/TestAVROIntermediateDataFormat.java
index b9a5ea1..703ed0a 100644
--- a/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/idf/TestAVROIntermediateDataFormat.java
+++ b/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/idf/TestAVROIntermediateDataFormat.java
@@ -22,7 +22,7 @@ import static org.apache.sqoop.connector.common.SqoopAvroUtils.createEnumSchema;
 import static org.apache.sqoop.connector.common.SqoopIDFUtils.NULL_VALUE;
 import static org.apache.sqoop.connector.common.TestSqoopIDFUtils.getByteFieldString;
 import static org.testng.Assert.assertNull;
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import org.apache.avro.generic.GenericData;
 import org.apache.avro.generic.GenericRecord;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/idf/TestCSVIntermediateDataFormat.java
----------------------------------------------------------------------
diff --git a/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/idf/TestCSVIntermediateDataFormat.java b/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/idf/TestCSVIntermediateDataFormat.java
index 9229639..040dbfc 100644
--- a/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/idf/TestCSVIntermediateDataFormat.java
+++ b/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/idf/TestCSVIntermediateDataFormat.java
@@ -18,7 +18,7 @@
  */
 package org.apache.sqoop.connector.idf;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNull;
 import static org.testng.Assert.assertTrue;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/idf/TestJSONIntermediateDataFormat.java
----------------------------------------------------------------------
diff --git a/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/idf/TestJSONIntermediateDataFormat.java b/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/idf/TestJSONIntermediateDataFormat.java
index 0d9a1cf..e2768e2 100644
--- a/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/idf/TestJSONIntermediateDataFormat.java
+++ b/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/idf/TestJSONIntermediateDataFormat.java
@@ -21,7 +21,7 @@ package org.apache.sqoop.connector.idf;
 import static org.apache.sqoop.connector.common.SqoopIDFUtils.NULL_VALUE;
 import static org.apache.sqoop.connector.common.TestSqoopIDFUtils.getByteFieldString;
 import static org.testng.Assert.assertNull;
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.sqoop.common.SqoopException;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/matcher/TestLocationMatcher.java
----------------------------------------------------------------------
diff --git a/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/matcher/TestLocationMatcher.java b/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/matcher/TestLocationMatcher.java
index 71b35a9..fcda3d8 100644
--- a/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/matcher/TestLocationMatcher.java
+++ b/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/matcher/TestLocationMatcher.java
@@ -23,7 +23,7 @@ import org.apache.sqoop.schema.Schema;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals;
+import static org.testng.Assert.assertEquals;
 
 public class TestLocationMatcher {
 
@@ -45,7 +45,7 @@ public class TestLocationMatcher {
     Object[] fields = SchemaFixture.createNotNullRecordForSchema1();
 
     Object[] actual = matcher.getMatchingData(fields);
-    assertArrayEquals(fields, actual);
+    assertEquals(fields, actual);
   }
 
   /**
@@ -59,7 +59,7 @@ public class TestLocationMatcher {
     Object[] fields = SchemaFixture.createNotNullRecordForSchema1();
 
     Object[] actual = matcher.getMatchingData(fields);
-    assertArrayEquals(fields, actual);
+    assertEquals(fields, actual);
   }
 
   /**
@@ -74,7 +74,7 @@ public class TestLocationMatcher {
     Object[] fields = new Object[] {"t1", "t2"};
 
     Object[] actual = matcher.getMatchingData(fields);
-    assertArrayEquals(new Object[] {"t1", "t2", null}, actual);
+    assertEquals(new Object[] {"t1", "t2", null}, actual);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/matcher/TestNameMatcher.java
----------------------------------------------------------------------
diff --git a/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/matcher/TestNameMatcher.java b/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/matcher/TestNameMatcher.java
index 9c4b1ba..80c0819 100644
--- a/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/matcher/TestNameMatcher.java
+++ b/connector/connector-sdk/src/test/java/org/apache/sqoop/connector/matcher/TestNameMatcher.java
@@ -23,7 +23,7 @@ import org.apache.sqoop.schema.Schema;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals;
+import static org.testng.Assert.assertEquals;
 
 public class TestNameMatcher {
 
@@ -45,7 +45,7 @@ public class TestNameMatcher {
     Object[] fields = SchemaFixture.createNotNullRecordForSchema1();
 
     Object[] actual = matcher.getMatchingData(fields);
-    assertArrayEquals(fields, actual);
+    assertEquals(fields, actual);
   }
 
   /**
@@ -59,7 +59,7 @@ public class TestNameMatcher {
     Object[] fields = SchemaFixture.createNotNullRecordForSchema1();
 
     Object[] actual = matcher.getMatchingData(fields);
-    assertArrayEquals(fields, actual);
+    assertEquals(fields, actual);
   }
 
   /**
@@ -76,7 +76,7 @@ public class TestNameMatcher {
     Object[] fields = new Object[] {"t1", "t2"};
 
     Object[] actual = matcher.getMatchingData(fields);
-    assertArrayEquals(new Object[] {null, "t1", "t2"}, actual);
+    assertEquals(new Object[] {null, "t1", "t2"}, actual);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/core/src/test/java/org/apache/sqoop/connector/TestConnectorManagerUtils.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/sqoop/connector/TestConnectorManagerUtils.java b/core/src/test/java/org/apache/sqoop/connector/TestConnectorManagerUtils.java
index 258b5f9..fd2d1b4 100644
--- a/core/src/test/java/org/apache/sqoop/connector/TestConnectorManagerUtils.java
+++ b/core/src/test/java/org/apache/sqoop/connector/TestConnectorManagerUtils.java
@@ -18,8 +18,8 @@
  */
 package org.apache.sqoop.connector;
 
-import static org.testng.AssertJUnit.assertFalse;
-import static org.testng.AssertJUnit.assertTrue;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/core/src/test/java/org/apache/sqoop/driver/TestDriverConfigUpgrader.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/sqoop/driver/TestDriverConfigUpgrader.java b/core/src/test/java/org/apache/sqoop/driver/TestDriverConfigUpgrader.java
index 819a7d0..84020d6 100644
--- a/core/src/test/java/org/apache/sqoop/driver/TestDriverConfigUpgrader.java
+++ b/core/src/test/java/org/apache/sqoop/driver/TestDriverConfigUpgrader.java
@@ -18,7 +18,7 @@
  */
 package org.apache.sqoop.driver;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 
 import java.util.LinkedList;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/core/src/test/java/org/apache/sqoop/driver/TestJobManager.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/sqoop/driver/TestJobManager.java b/core/src/test/java/org/apache/sqoop/driver/TestJobManager.java
index 2a14ff2..203d8b0 100644
--- a/core/src/test/java/org/apache/sqoop/driver/TestJobManager.java
+++ b/core/src/test/java/org/apache/sqoop/driver/TestJobManager.java
@@ -20,7 +20,7 @@ package org.apache.sqoop.driver;
 import java.util.Arrays;
 import java.util.List;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/core/src/test/java/org/apache/sqoop/driver/TestJobRequest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/sqoop/driver/TestJobRequest.java b/core/src/test/java/org/apache/sqoop/driver/TestJobRequest.java
index 4381b97..0a86112 100644
--- a/core/src/test/java/org/apache/sqoop/driver/TestJobRequest.java
+++ b/core/src/test/java/org/apache/sqoop/driver/TestJobRequest.java
@@ -26,7 +26,7 @@ import org.apache.sqoop.utils.ClassUtils;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertTrue;
 
 public class TestJobRequest {

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java b/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java
index f571c80..4999159 100644
--- a/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java
+++ b/core/src/test/java/org/apache/sqoop/repository/TestJdbcRepository.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.repository;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyLong;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/execution/mapreduce/src/test/java/org/apache/sqoop/job/TestMapReduce.java
----------------------------------------------------------------------
diff --git a/execution/mapreduce/src/test/java/org/apache/sqoop/job/TestMapReduce.java b/execution/mapreduce/src/test/java/org/apache/sqoop/job/TestMapReduce.java
index 10ed33c..2463643 100644
--- a/execution/mapreduce/src/test/java/org/apache/sqoop/job/TestMapReduce.java
+++ b/execution/mapreduce/src/test/java/org/apache/sqoop/job/TestMapReduce.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.job;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -98,7 +98,7 @@ public class TestMapReduce {
                                       SqoopInputFormat.class,
                                       SqoopMapper.class,
                                       DummyOutputFormat.class);
-    assertEquals("Job failed!", true, success);
+    assertEquals(true, success, "Job failed!");
   }
 
   @Test
@@ -120,7 +120,7 @@ public class TestMapReduce {
                                      SqoopInputFormat.class,
                                      SqoopMapper.class,
                                      SqoopNullOutputFormat.class);
-    assertEquals("Job failed!", true, success);
+    assertEquals(true, success, "Job failed!");
 
     // Make sure both destroyers get called.
     assertEquals(1, DummyFromDestroyer.count);

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/execution/mapreduce/src/test/java/org/apache/sqoop/job/TestMatching.java
----------------------------------------------------------------------
diff --git a/execution/mapreduce/src/test/java/org/apache/sqoop/job/TestMatching.java b/execution/mapreduce/src/test/java/org/apache/sqoop/job/TestMatching.java
index f658d09..d0b41d1 100644
--- a/execution/mapreduce/src/test/java/org/apache/sqoop/job/TestMatching.java
+++ b/execution/mapreduce/src/test/java/org/apache/sqoop/job/TestMatching.java
@@ -19,8 +19,7 @@ package org.apache.sqoop.job;
 
 import static org.apache.sqoop.connector.common.SqoopIDFUtils.BYTE_FIELD_CHARSET;
 import static org.apache.sqoop.connector.common.SqoopIDFUtils.toText;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.internal.junit.ArrayAsserts.assertArrayEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -142,17 +141,17 @@ public class TestMatching {
         DummyOutputFormat.class);
     if (from.getName().split("-")[1].equals("EMPTY")) {
       if (to.getName().split("-")[1].equals("EMPTY")) {
-        assertEquals("Job succeeded!", false, success);
+        assertEquals(false, success, "Job succeeded!");
       } else {
-        assertEquals("Job failed!", true, success);
+        assertEquals(true, success, "Job failed!");
       }
     } else {
       if (to.getName().split("-")[1].equals("EMPTY")) {
-        assertEquals("Job failed!", true, success);
+        assertEquals(true, success, "Job failed!");
       } else if (from.getName().split("-")[1].equals(to.getName().split("-")[1])) {
-        assertEquals("Job failed!", true, success);
+        assertEquals(true, success, "Job failed!");
       } else {
-        assertEquals("Job succeeded!", false, success);
+        assertEquals(false, success, "Job succeeded!");
       }
     }
   }
@@ -176,7 +175,7 @@ public class TestMatching {
     Object[] validateObj = dataFormat.getObjectData();
 
     assertEquals(testData, validateCSV);
-    assertArrayEquals(testObject, validateObj);
+    assertEquals(testObject, validateObj);
 
     // Setting data as Object
     dataFormat.setObjectData(testObject);
@@ -185,7 +184,7 @@ public class TestMatching {
     validateObj = dataFormat.getObjectData();
 
     assertEquals(testData, validateCSV);
-    assertArrayEquals(testObjectCopy, validateObj);
+    assertEquals(testObjectCopy, validateObj);
   }
 
   public static class DummyPartition extends Partition {

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/execution/mapreduce/src/test/java/org/apache/sqoop/job/mr/TestMRConfigurationUtils.java
----------------------------------------------------------------------
diff --git a/execution/mapreduce/src/test/java/org/apache/sqoop/job/mr/TestMRConfigurationUtils.java b/execution/mapreduce/src/test/java/org/apache/sqoop/job/mr/TestMRConfigurationUtils.java
index b83de3b..6a12d47 100644
--- a/execution/mapreduce/src/test/java/org/apache/sqoop/job/mr/TestMRConfigurationUtils.java
+++ b/execution/mapreduce/src/test/java/org/apache/sqoop/job/mr/TestMRConfigurationUtils.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.job.mr;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.when;
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/DerbyTestCase.java
----------------------------------------------------------------------
diff --git a/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/DerbyTestCase.java b/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/DerbyTestCase.java
index d2e793c..cd4c76c 100644
--- a/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/DerbyTestCase.java
+++ b/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/DerbyTestCase.java
@@ -20,7 +20,7 @@ package org.apache.sqoop.repository.derby;
 import static org.apache.sqoop.repository.derby.DerbySchemaUpgradeQuery.*;
 import static org.apache.sqoop.repository.derby.DerbySchemaCreateQuery.*;
 import static org.apache.sqoop.repository.derby.DerbySchemaInsertUpdateDeleteSelectQuery.*;
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 
 import java.sql.Connection;
 import java.sql.DriverManager;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestConnectorHandling.java
----------------------------------------------------------------------
diff --git a/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestConnectorHandling.java b/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestConnectorHandling.java
index cacba4c..8864d5d 100644
--- a/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestConnectorHandling.java
+++ b/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestConnectorHandling.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
 
 import java.util.List;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestDriverHandling.java
----------------------------------------------------------------------
diff --git a/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestDriverHandling.java b/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestDriverHandling.java
index 4a81827..b34b588 100644
--- a/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestDriverHandling.java
+++ b/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestDriverHandling.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.repository.derby;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestInputTypes.java
----------------------------------------------------------------------
diff --git a/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestInputTypes.java b/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestInputTypes.java
index fe872ca..f53c61a 100644
--- a/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestInputTypes.java
+++ b/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestInputTypes.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.repository.derby;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNotSame;
 

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestJobHandling.java
----------------------------------------------------------------------
diff --git a/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestJobHandling.java b/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestJobHandling.java
index de5e3c8..6c36f02 100644
--- a/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestJobHandling.java
+++ b/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestJobHandling.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.repository.derby;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestLinkHandling.java
----------------------------------------------------------------------
diff --git a/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestLinkHandling.java b/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestLinkHandling.java
index 2a36bd4..4be3641 100644
--- a/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestLinkHandling.java
+++ b/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestLinkHandling.java
@@ -17,7 +17,7 @@
  */
 package org.apache.sqoop.repository.derby;
 
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestConnectorHandling.java
----------------------------------------------------------------------
diff --git a/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestConnectorHandling.java b/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestConnectorHandling.java
index e9b5bcd..2dcab48 100644
--- a/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestConnectorHandling.java
+++ b/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestConnectorHandling.java
@@ -24,8 +24,8 @@ import org.testng.annotations.Test;
 import java.util.List;
 
 import static org.testng.Assert.assertEquals;
-import static org.testng.AssertJUnit.assertNotNull;
-import static org.testng.AssertJUnit.assertNull;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
 
 /**
  * Test connector methods on Derby repository.

http://git-wip-us.apache.org/repos/asf/sqoop/blob/3dc19d6f/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestDriverHandling.java
----------------------------------------------------------------------
diff --git a/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestDriverHandling.java b/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestDriverHandling.java
index d48d49e..f7d95af 100644
--- a/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestDriverHandling.java
+++ b/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestDriverHandling.java
@@ -23,7 +23,7 @@ import org.testng.annotations.Test;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
-import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.Assert.assertNotNull;
 
 /**
  * Test driver methods on Derby repository.


Mime
View raw message