http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/netezza/NetezzaImportManualTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/netezza/NetezzaImportManualTest.java b/src/test/org/apache/sqoop/manager/netezza/NetezzaImportManualTest.java index 4002c64..84fc7fc 100644 --- a/src/test/org/apache/sqoop/manager/netezza/NetezzaImportManualTest.java +++ b/src/test/org/apache/sqoop/manager/netezza/NetezzaImportManualTest.java @@ -35,6 +35,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.IOUtils; import org.apache.sqoop.manager.NetezzaManager; +import org.apache.sqoop.testcategories.sqooptest.ManualTest; +import org.apache.sqoop.testcategories.thirdpartytest.NetezzaTest; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -44,6 +46,7 @@ import org.apache.sqoop.manager.ConnManager; import org.apache.sqoop.testutil.CommonArgs; import org.apache.sqoop.testutil.ImportJobTestCase; import org.apache.sqoop.util.FileListing; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -60,6 +63,7 @@ import static org.junit.Assert.fail; * this manually with -Dtestcase=NetezzaImportManualTest. * */ +@Category({ManualTest.class, NetezzaTest.class}) public class NetezzaImportManualTest extends ImportJobTestCase { public static final Log LOG = LogFactory.
http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/oracle/OraOopDataDrivenDBInputFormatConnectionCloseTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/oracle/OraOopDataDrivenDBInputFormatConnectionCloseTest.java b/src/test/org/apache/sqoop/manager/oracle/OraOopDataDrivenDBInputFormatConnectionCloseTest.java index bb33c35..c20b8b6 100644 --- a/src/test/org/apache/sqoop/manager/oracle/OraOopDataDrivenDBInputFormatConnectionCloseTest.java +++ b/src/test/org/apache/sqoop/manager/oracle/OraOopDataDrivenDBInputFormatConnectionCloseTest.java @@ -21,8 +21,11 @@ package org.apache.sqoop.manager.oracle; import org.apache.sqoop.mapreduce.db.DBConfiguration; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.JobContext; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; +import org.apache.sqoop.testcategories.thirdpartytest.OracleTest; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.io.IOException; import java.sql.Connection; @@ -37,6 +40,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +@Category({UnitTest.class, OracleTest.class}) public class OraOopDataDrivenDBInputFormatConnectionCloseTest { private static final OraOopLog LOG = OraOopLogFactory.getLog( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/oracle/OraOopTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/oracle/OraOopTestCase.java b/src/test/org/apache/sqoop/manager/oracle/OraOopTestCase.java index 1bae71c..1598813 100644 --- a/src/test/org/apache/sqoop/manager/oracle/OraOopTestCase.java +++ b/src/test/org/apache/sqoop/manager/oracle/OraOopTestCase.java @@ -44,12 +44,16 @@ import org.apache.sqoop.manager.oracle.util.OracleData; import org.apache.sqoop.Sqoop; import org.apache.sqoop.manager.oracle.util.OracleUtils; +import org.apache.sqoop.testcategories.sqooptest.IntegrationTest; +import org.apache.sqoop.testcategories.thirdpartytest.OracleTest; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; /** * Base test case for OraOop to handle common functions. */ +@Category({IntegrationTest.class, OracleTest.class}) public abstract class OraOopTestCase { private static final OraOopLog LOG = OraOopLogFactory.getLog( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/oracle/OracleCallExportTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/oracle/OracleCallExportTest.java b/src/test/org/apache/sqoop/manager/oracle/OracleCallExportTest.java index 6d6602a..bc93ebf 100644 --- a/src/test/org/apache/sqoop/manager/oracle/OracleCallExportTest.java +++ b/src/test/org/apache/sqoop/manager/oracle/OracleCallExportTest.java @@ -36,13 +36,16 @@ import org.apache.hadoop.conf.Configuration; import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.manager.oracle.util.OracleUtils; +import org.apache.sqoop.testcategories.thirdpartytest.OracleTest; import org.apache.sqoop.testutil.CommonArgs; import org.apache.sqoop.testutil.ExportJobTestCase; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Test free form query import with the MySQL db. */ +@Category(OracleTest.class) public class OracleCallExportTest extends ExportJobTestCase { public static final Log LOG = LogFactory.getLog( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/oracle/OracleColumnEscapeImportTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/oracle/OracleColumnEscapeImportTest.java b/src/test/org/apache/sqoop/manager/oracle/OracleColumnEscapeImportTest.java index 684586c..6a26a6e 100644 --- a/src/test/org/apache/sqoop/manager/oracle/OracleColumnEscapeImportTest.java +++ b/src/test/org/apache/sqoop/manager/oracle/OracleColumnEscapeImportTest.java @@ -20,6 +20,7 @@ package org.apache.sqoop.manager.oracle; import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.manager.oracle.util.OracleUtils; +import org.apache.sqoop.testcategories.thirdpartytest.OracleTest; import org.apache.sqoop.testutil.CommonArgs; import org.apache.sqoop.testutil.ImportJobTestCase; import com.google.common.base.Charsets; @@ -30,6 +31,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.junit.After; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.io.File; import java.io.IOException; @@ -38,6 +40,7 @@ import java.util.ArrayList; import static org.junit.Assert.assertEquals; +@Category(OracleTest.class) public class OracleColumnEscapeImportTest extends ImportJobTestCase { public static final Log LOG = LogFactory.getLog( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/oracle/OracleCompatTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/oracle/OracleCompatTest.java b/src/test/org/apache/sqoop/manager/oracle/OracleCompatTest.java index 553096a..3878fc8 100644 --- a/src/test/org/apache/sqoop/manager/oracle/OracleCompatTest.java +++ b/src/test/org/apache/sqoop/manager/oracle/OracleCompatTest.java @@ -28,14 +28,17 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.testcategories.thirdpartytest.OracleTest; import org.apache.sqoop.testutil.ManagerCompatTestCase; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.fail; /** * Test the basic Oracle connection manager with the various column types. */ +@Category(OracleTest.class) public class OracleCompatTest extends ManagerCompatTestCase { public static final Log LOG = LogFactory.getLog( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/oracle/OracleExportTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/oracle/OracleExportTest.java b/src/test/org/apache/sqoop/manager/oracle/OracleExportTest.java index a880af3..c096fe4 100644 --- a/src/test/org/apache/sqoop/manager/oracle/OracleExportTest.java +++ b/src/test/org/apache/sqoop/manager/oracle/OracleExportTest.java @@ -27,12 +27,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.util.StringUtils; import org.apache.sqoop.manager.OracleManager; +import org.apache.sqoop.testcategories.thirdpartytest.OracleTest; import org.junit.After; import org.junit.Before; import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.TestExport; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.fail; @@ -41,6 +43,7 @@ import static org.junit.Assert.fail; * This tests the OracleExportOutputFormat (which subclasses * ExportOutputFormat with Oracle-specific SQL statements). */ +@Category(OracleTest.class) public class OracleExportTest extends TestExport { public static final Log LOG = LogFactory.getLog( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/oracle/OracleFreeFormQueryTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/oracle/OracleFreeFormQueryTest.java b/src/test/org/apache/sqoop/manager/oracle/OracleFreeFormQueryTest.java index bb3e7c4..0efcb1b 100644 --- a/src/test/org/apache/sqoop/manager/oracle/OracleFreeFormQueryTest.java +++ b/src/test/org/apache/sqoop/manager/oracle/OracleFreeFormQueryTest.java @@ -27,10 +27,13 @@ import org.apache.hadoop.conf.Configuration; import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.TestFreeFormQueryImport; +import org.apache.sqoop.testcategories.thirdpartytest.OracleTest; +import org.junit.experimental.categories.Category; /** * Test free form query import with the Oracle db. */ +@Category(OracleTest.class) public class OracleFreeFormQueryTest extends TestFreeFormQueryImport { public static final Log LOG = LogFactory.getLog( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/oracle/OracleIncrementalImportTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/oracle/OracleIncrementalImportTest.java b/src/test/org/apache/sqoop/manager/oracle/OracleIncrementalImportTest.java index 8e6ccc9..86505d2 100644 --- a/src/test/org/apache/sqoop/manager/oracle/OracleIncrementalImportTest.java +++ b/src/test/org/apache/sqoop/manager/oracle/OracleIncrementalImportTest.java @@ -20,6 +20,7 @@ package org.apache.sqoop.manager.oracle; import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.manager.oracle.util.OracleUtils; +import org.apache.sqoop.testcategories.thirdpartytest.OracleTest; import org.apache.sqoop.testutil.CommonArgs; import org.apache.sqoop.testutil.ImportJobTestCase; import org.apache.commons.logging.Log; @@ -31,6 +32,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.IOUtils; import org.junit.After; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.io.BufferedReader; import java.io.BufferedWriter; @@ -49,6 +51,7 @@ import static org.junit.Assert.assertEquals; /** * Test free form query import with the Oracle db. */ +@Category(OracleTest.class) public class OracleIncrementalImportTest extends ImportJobTestCase { public static final Log LOG = LogFactory.getLog( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/oracle/OracleLobAvroImportTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/oracle/OracleLobAvroImportTest.java b/src/test/org/apache/sqoop/manager/oracle/OracleLobAvroImportTest.java index 525ccf4..95b2396 100644 --- a/src/test/org/apache/sqoop/manager/oracle/OracleLobAvroImportTest.java +++ b/src/test/org/apache/sqoop/manager/oracle/OracleLobAvroImportTest.java @@ -28,13 +28,16 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.testcategories.thirdpartytest.OracleTest; import org.apache.sqoop.testutil.LobAvroImportTestCase; +import org.junit.experimental.categories.Category; import static org.junit.Assert.fail; /** * Tests BLOB/CLOB import for Avro with Oracle Db. */ +@Category(OracleTest.class) public class OracleLobAvroImportTest extends LobAvroImportTestCase { public static final Log LOG = LogFactory.getLog( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/oracle/OracleManagerTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/oracle/OracleManagerTest.java b/src/test/org/apache/sqoop/manager/oracle/OracleManagerTest.java index 9251f02..8a5b3cc 100644 --- a/src/test/org/apache/sqoop/manager/oracle/OracleManagerTest.java +++ b/src/test/org/apache/sqoop/manager/oracle/OracleManagerTest.java @@ -39,6 +39,7 @@ import java.text.SimpleDateFormat; import org.apache.sqoop.manager.oracle.util.OracleUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.sqoop.testcategories.thirdpartytest.OracleTest; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -52,6 +53,7 @@ import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.testutil.CommonArgs; import org.apache.sqoop.testutil.ImportJobTestCase; import org.apache.sqoop.util.FileListing; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -101,6 +103,7 @@ import static org.junit.Assert.fail; * ALTER SYSTEM SET processes=200 scope=spfile; * ... then restart your database. */ +@Category(OracleTest.class) public class OracleManagerTest extends ImportJobTestCase { public static final Log LOG = LogFactory.getLog( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/oracle/OracleSpecialCharacterTableImportTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/oracle/OracleSpecialCharacterTableImportTest.java b/src/test/org/apache/sqoop/manager/oracle/OracleSpecialCharacterTableImportTest.java index 6539e5a..ef09a2e 100644 --- a/src/test/org/apache/sqoop/manager/oracle/OracleSpecialCharacterTableImportTest.java +++ b/src/test/org/apache/sqoop/manager/oracle/OracleSpecialCharacterTableImportTest.java @@ -20,6 +20,7 @@ package org.apache.sqoop.manager.oracle; import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.manager.oracle.util.OracleUtils; +import org.apache.sqoop.testcategories.thirdpartytest.OracleTest; import org.apache.sqoop.testutil.CommonArgs; import org.apache.sqoop.testutil.ImportJobTestCase; import com.google.common.base.Charsets; @@ -28,8 +29,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; +import org.apache.sqoop.util.BlockJUnit4ClassRunnerWithParametersFactory; import org.junit.After; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -42,6 +45,8 @@ import java.util.Arrays; import static org.junit.Assert.assertEquals; @RunWith(Parameterized.class) +@Category(OracleTest.class) [email protected](BlockJUnit4ClassRunnerWithParametersFactory.class) public class OracleSpecialCharacterTableImportTest extends ImportJobTestCase { @Parameterized.Parameters(name = "tableName = {0}") http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/oracle/OracleSplitterTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/oracle/OracleSplitterTest.java b/src/test/org/apache/sqoop/manager/oracle/OracleSplitterTest.java index c2f9532..6d749d4 100644 --- a/src/test/org/apache/sqoop/manager/oracle/OracleSplitterTest.java +++ b/src/test/org/apache/sqoop/manager/oracle/OracleSplitterTest.java @@ -20,6 +20,7 @@ package org.apache.sqoop.manager.oracle; import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.manager.oracle.util.OracleUtils; +import org.apache.sqoop.testcategories.thirdpartytest.OracleTest; import org.apache.sqoop.testutil.CommonArgs; import org.apache.sqoop.testutil.ImportJobTestCase; import org.apache.commons.logging.Log; @@ -27,6 +28,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.commons.io.FileUtils; import org.apache.hadoop.conf.Configuration; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.io.File; import java.io.IOException; @@ -39,6 +41,7 @@ import static org.junit.Assert.assertEquals; /** * Test various custom splitters for Oracle. */ +@Category(OracleTest.class) public class OracleSplitterTest extends ImportJobTestCase { public static final Log LOG = LogFactory.getLog( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/postgresql/DirectPostgreSQLExportManualTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/postgresql/DirectPostgreSQLExportManualTest.java b/src/test/org/apache/sqoop/manager/postgresql/DirectPostgreSQLExportManualTest.java index 22b202a..7dd6efc 100644 --- a/src/test/org/apache/sqoop/manager/postgresql/DirectPostgreSQLExportManualTest.java +++ b/src/test/org/apache/sqoop/manager/postgresql/DirectPostgreSQLExportManualTest.java @@ -29,8 +29,11 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.mapred.JobConf; import org.apache.sqoop.TestExport; import org.apache.sqoop.mapreduce.db.DBConfiguration; +import org.apache.sqoop.testcategories.sqooptest.ManualTest; +import org.apache.sqoop.testcategories.thirdpartytest.PostgresqlTest; import org.junit.Ignore; import org.junit.Test; +import org.junit.experimental.categories.Category; /** @@ -53,6 +56,7 @@ import org.junit.Test; * $ psql -U sqooptest sqooptest * */ +@Category({ManualTest.class, PostgresqlTest.class}) public class DirectPostgreSQLExportManualTest extends TestExport { public static final Log LOG = http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/postgresql/PGBulkloadManagerManualTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/postgresql/PGBulkloadManagerManualTest.java b/src/test/org/apache/sqoop/manager/postgresql/PGBulkloadManagerManualTest.java index 8855316..1fe2644 100644 --- a/src/test/org/apache/sqoop/manager/postgresql/PGBulkloadManagerManualTest.java +++ b/src/test/org/apache/sqoop/manager/postgresql/PGBulkloadManagerManualTest.java @@ -28,10 +28,13 @@ import java.util.Arrays; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.mapred.JobConf; +import org.apache.sqoop.testcategories.sqooptest.ManualTest; +import org.apache.sqoop.testcategories.thirdpartytest.PostgresqlTest; import org.junit.Test; import org.apache.sqoop.TestExport; import org.apache.sqoop.mapreduce.db.DBConfiguration; +import org.junit.experimental.categories.Category; /** @@ -62,6 +65,7 @@ import org.apache.sqoop.mapreduce.db.DBConfiguration; * sqooptest=# \q * */ +@Category({ManualTest.class, PostgresqlTest.class}) public class PGBulkloadManagerManualTest extends TestExport { public static final Log LOG = http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/postgresql/PostgresqlExportTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/postgresql/PostgresqlExportTest.java b/src/test/org/apache/sqoop/manager/postgresql/PostgresqlExportTest.java index f86b119..eb798fa 100644 --- a/src/test/org/apache/sqoop/manager/postgresql/PostgresqlExportTest.java +++ b/src/test/org/apache/sqoop/manager/postgresql/PostgresqlExportTest.java @@ -18,6 +18,7 @@ package org.apache.sqoop.manager.postgresql; import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.testcategories.thirdpartytest.PostgresqlTest; import org.apache.sqoop.testutil.CommonArgs; import org.apache.sqoop.testutil.ExportJobTestCase; import org.apache.commons.logging.Log; @@ -26,6 +27,7 @@ import org.apache.sqoop.manager.ConnManager; import org.apache.sqoop.manager.PostgresqlManager; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.io.BufferedWriter; import java.io.File; @@ -45,6 +47,7 @@ import static org.junit.Assert.fail; /** * */ +@Category(PostgresqlTest.class) public class PostgresqlExportTest extends ExportJobTestCase { public static final Log LOG = LogFactory.getLog( PostgresqlExportTest.class.getName()); http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/postgresql/PostgresqlExternalTableImportTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/postgresql/PostgresqlExternalTableImportTest.java b/src/test/org/apache/sqoop/manager/postgresql/PostgresqlExternalTableImportTest.java index dd4cfb4..8c3d2fd 100644 --- a/src/test/org/apache/sqoop/manager/postgresql/PostgresqlExternalTableImportTest.java +++ b/src/test/org/apache/sqoop/manager/postgresql/PostgresqlExternalTableImportTest.java @@ -38,6 +38,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.IOUtils; import org.apache.sqoop.manager.ConnManager; import org.apache.sqoop.manager.PostgresqlManager; +import org.apache.sqoop.testcategories.thirdpartytest.PostgresqlTest; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -46,7 +47,9 @@ import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.testutil.CommonArgs; import org.apache.sqoop.testutil.ImportJobTestCase; import org.apache.sqoop.util.FileListing; +import org.junit.experimental.categories.Category; +@Category(PostgresqlTest.class) public class PostgresqlExternalTableImportTest extends ImportJobTestCase { public static final Log LOG = LogFactory http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/postgresql/PostgresqlImportTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/postgresql/PostgresqlImportTest.java b/src/test/org/apache/sqoop/manager/postgresql/PostgresqlImportTest.java index b8aa17b..64d4089 100644 --- a/src/test/org/apache/sqoop/manager/postgresql/PostgresqlImportTest.java +++ b/src/test/org/apache/sqoop/manager/postgresql/PostgresqlImportTest.java @@ -31,6 +31,7 @@ import java.util.Arrays; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.sqoop.testcategories.thirdpartytest.PostgresqlTest; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -44,6 +45,7 @@ import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.testutil.CommonArgs; import org.apache.sqoop.testutil.ImportJobTestCase; import org.apache.sqoop.util.FileListing; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -87,6 +89,7 @@ import static org.junit.Assert.fail; * template1=> \q * */ +@Category(PostgresqlTest.class) public class PostgresqlImportTest extends ImportJobTestCase { public static final Log LOG = LogFactory.getLog( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportDelimitedFileTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportDelimitedFileTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportDelimitedFileTest.java index 9b70af1..e1a91e6 100644 --- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportDelimitedFileTest.java +++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportDelimitedFileTest.java @@ -23,6 +23,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.sqoop.manager.sqlserver.MSSQLTestDataFileParser.DATATYPES; +import org.apache.sqoop.testcategories.thirdpartytest.SqlServerTest; +import org.junit.experimental.categories.Category; import java.io.OutputStream; import java.io.OutputStreamWriter; @@ -50,6 +52,7 @@ import java.io.BufferedWriter; * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and * -Dms.sqlserver.password */ +@Category(SqlServerTest.class) public class SQLServerDatatypeExportDelimitedFileTest extends ManagerCompatExport { http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportSequenceFileTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportSequenceFileTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportSequenceFileTest.java index 293da00..9820346 100644 --- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportSequenceFileTest.java +++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportSequenceFileTest.java @@ -34,8 +34,10 @@ import org.apache.sqoop.manager.sqlserver.MSSQLTestDataFileParser.DATATYPES; import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.lib.RecordParser; import org.apache.sqoop.lib.SqoopRecord; +import org.apache.sqoop.testcategories.thirdpartytest.SqlServerTest; import org.apache.sqoop.tool.CodeGenTool; import org.apache.sqoop.util.ClassLoaderStack; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -63,6 +65,7 @@ import static org.junit.Assert.assertTrue; * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and * -Dms.sqlserver.password */ +@Category(SqlServerTest.class) public class SQLServerDatatypeExportSequenceFileTest extends ManagerCompatExport { http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportDelimitedFileTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportDelimitedFileTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportDelimitedFileTest.java index 520c4ac..225f6a0 100644 --- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportDelimitedFileTest.java +++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportDelimitedFileTest.java @@ -34,11 +34,13 @@ import org.apache.sqoop.manager.sqlserver.MSSQLTestDataFileParser.DATATYPES; import org.apache.sqoop.Sqoop; import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.orm.CompilationManager; +import org.apache.sqoop.testcategories.thirdpartytest.SqlServerTest; import org.apache.sqoop.testutil.CommonArgs; import org.apache.sqoop.tool.ImportTool; import org.apache.sqoop.util.ClassLoaderStack; import org.junit.Ignore; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -65,6 +67,7 @@ import static org.junit.Assert.fail; * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and * -Dms.sqlserver.password */ +@Category(SqlServerTest.class) public class SQLServerDatatypeImportDelimitedFileTest extends SQLServerDatatypeImportSequenceFileTest { http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportSequenceFileTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportSequenceFileTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportSequenceFileTest.java index 592a78f..5745664 100644 --- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportSequenceFileTest.java +++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportSequenceFileTest.java @@ -30,6 +30,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.util.StringUtils; +import org.apache.sqoop.testcategories.thirdpartytest.SqlServerTest; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -37,6 +38,7 @@ import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.testutil.ManagerCompatTestCase; import org.apache.sqoop.manager.sqlserver.MSSQLTestDataFileParser.DATATYPES; import org.apache.sqoop.manager.sqlserver.MSSQLTestData.KEY_STRINGS; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -63,6 +65,7 @@ import static org.junit.Assert.fail; * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and * -Dms.sqlserver.password */ +@Category(SqlServerTest.class) public class SQLServerDatatypeImportSequenceFileTest extends ManagerCompatTestCase { http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/sqlserver/SQLServerHiveImportTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerHiveImportTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerHiveImportTest.java index e6b0865..3c6aad6 100644 --- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerHiveImportTest.java +++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerHiveImportTest.java @@ -28,10 +28,12 @@ import org.apache.hadoop.util.StringUtils; import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.hive.TestHiveImport; +import org.apache.sqoop.testcategories.thirdpartytest.SqlServerTest; import org.apache.sqoop.testutil.CommonArgs; import org.apache.sqoop.tool.SqoopTool; import org.junit.After; import org.junit.Before; +import org.junit.experimental.categories.Category; import static org.junit.Assert.fail; @@ -57,6 +59,7 @@ import static org.junit.Assert.fail; * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and * -Dms.sqlserver.password */ +@Category(SqlServerTest.class) public class SQLServerHiveImportTest extends TestHiveImport { @Before http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerExportTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerExportTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerExportTest.java index b7c2b75..ab1e8ff 100644 --- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerExportTest.java +++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerExportTest.java @@ -19,6 +19,7 @@ package org.apache.sqoop.manager.sqlserver; import org.apache.sqoop.ConnFactory; import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.testcategories.thirdpartytest.SqlServerTest; import org.apache.sqoop.testutil.CommonArgs; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -28,6 +29,7 @@ import org.apache.hadoop.conf.Configuration; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.io.BufferedWriter; import java.io.File; @@ -46,6 +48,7 @@ import static org.junit.Assert.fail; /** * Please see instructions in SQLServerManagerImportTest. */ +@Category(SqlServerTest.class) public class SQLServerManagerExportTest extends ExportJobTestCase { public static final Log LOG = LogFactory.getLog( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerImportTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerImportTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerImportTest.java index 79e37f0..ea7942f 100644 --- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerImportTest.java +++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerImportTest.java @@ -26,14 +26,17 @@ import org.apache.hadoop.io.IOUtils; import org.apache.sqoop.ConnFactory; import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.manager.SQLServerManager; +import org.apache.sqoop.testcategories.thirdpartytest.SqlServerTest; import org.apache.sqoop.testutil.ArgumentArrayBuilder; import org.apache.sqoop.testutil.ImportJobTestCase; +import org.apache.sqoop.util.BlockJUnit4ClassRunnerWithParametersFactory; import org.apache.sqoop.util.ExpectedLogMessage; import org.apache.sqoop.util.FileListing; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @@ -53,6 +56,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @RunWith(Parameterized.class) [email protected](BlockJUnit4ClassRunnerWithParametersFactory.class) /** * Test the SQLServerManager implementation. * @@ -75,6 +79,7 @@ import static org.junit.Assert.fail; * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and * -Dms.sqlserver.password */ +@Category(SqlServerTest.class) public class SQLServerManagerImportTest extends ImportJobTestCase { public static final Log LOG = LogFactory.getLog( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerTest.java index fdf856b..04403bc 100644 --- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerTest.java +++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerTest.java @@ -30,6 +30,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.util.StringUtils; +import org.apache.sqoop.testcategories.sqooptest.IntegrationTest; +import org.apache.sqoop.testcategories.thirdpartytest.SqlServerTest; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -40,6 +42,7 @@ import org.apache.sqoop.metastore.JobData; import org.apache.sqoop.testutil.HsqldbTestServer; import org.apache.sqoop.tool.ImportTool; import org.apache.sqoop.tool.SqoopTool; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -68,6 +71,7 @@ import static org.junit.Assert.fail; * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and * -Dms.sqlserver.password */ +@Category({IntegrationTest.class, SqlServerTest.class}) public class SQLServerManagerTest { public static final Log LOG = LogFactory.getLog( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiColsTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiColsTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiColsTest.java index fb765fb..26f966b 100644 --- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiColsTest.java +++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiColsTest.java @@ -25,8 +25,10 @@ import org.apache.hadoop.conf.Configuration; import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.TestMultiCols; +import org.apache.sqoop.testcategories.thirdpartytest.SqlServerTest; import org.junit.After; import org.junit.Test; +import org.junit.experimental.categories.Category; /** * Test multiple columns in SQL Server. @@ -50,6 +52,7 @@ import org.junit.Test; * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and * -Dms.sqlserver.password */ +@Category(SqlServerTest.class) public class SQLServerMultiColsTest extends TestMultiCols { protected boolean useHsqldbTestServer() { http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiMapsTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiMapsTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiMapsTest.java index 5e89cc9..a1da99f 100644 --- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiMapsTest.java +++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiMapsTest.java @@ -39,6 +39,7 @@ import org.apache.hadoop.util.StringUtils; import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.SqoopOptions.InvalidOptionsException; import org.apache.sqoop.orm.CompilationManager; +import org.apache.sqoop.testcategories.thirdpartytest.SqlServerTest; import org.apache.sqoop.testutil.CommonArgs; import org.apache.sqoop.testutil.ImportJobTestCase; import org.apache.sqoop.testutil.SeqFileReader; @@ -48,6 +49,7 @@ import org.apache.sqoop.util.ClassLoaderStack; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -74,6 +76,7 @@ import static org.junit.Assert.fail; * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and * -Dms.sqlserver.password */ +@Category(SqlServerTest.class) public class SQLServerMultiMapsTest extends ImportJobTestCase { @Before http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/sqlserver/SQLServerParseMethodsTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerParseMethodsTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerParseMethodsTest.java index fbd8d96..94bbcc0 100644 --- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerParseMethodsTest.java +++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerParseMethodsTest.java @@ -40,6 +40,7 @@ import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.SqoopOptions.InvalidOptionsException; import org.apache.sqoop.config.ConfigurationHelper; import org.apache.sqoop.orm.CompilationManager; +import org.apache.sqoop.testcategories.thirdpartytest.SqlServerTest; import org.apache.sqoop.testutil.CommonArgs; import org.apache.sqoop.testutil.ImportJobTestCase; import org.apache.sqoop.testutil.ReparseMapper; @@ -48,6 +49,7 @@ import org.apache.sqoop.util.ClassLoaderStack; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.fail; @@ -74,6 +76,7 @@ import static org.junit.Assert.fail; * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and * -Dms.sqlserver.password */ +@Category(SqlServerTest.class) public class SQLServerParseMethodsTest extends ImportJobTestCase { @Before http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/sqlserver/SQLServerQueryTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerQueryTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerQueryTest.java index e0c8d67..d929a4c 100644 --- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerQueryTest.java +++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerQueryTest.java @@ -34,6 +34,7 @@ import org.apache.hadoop.util.StringUtils; import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.SqoopOptions.InvalidOptionsException; import org.apache.sqoop.orm.CompilationManager; +import org.apache.sqoop.testcategories.thirdpartytest.SqlServerTest; import org.apache.sqoop.testutil.CommonArgs; import org.apache.sqoop.testutil.ImportJobTestCase; import org.apache.sqoop.testutil.SeqFileReader; @@ -42,6 +43,7 @@ import org.apache.sqoop.util.ClassLoaderStack; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -68,6 +70,7 @@ import static org.junit.Assert.fail; * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and * -Dms.sqlserver.password */ +@Category(SqlServerTest.class) public class SQLServerQueryTest extends ImportJobTestCase { @Before http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/sqlserver/SQLServerSplitByTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerSplitByTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerSplitByTest.java index a1c2201..eb83e8e 100644 --- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerSplitByTest.java +++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerSplitByTest.java @@ -34,6 +34,7 @@ import org.apache.hadoop.util.StringUtils; import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.SqoopOptions.InvalidOptionsException; import org.apache.sqoop.orm.CompilationManager; +import org.apache.sqoop.testcategories.thirdpartytest.SqlServerTest; import org.apache.sqoop.testutil.CommonArgs; import org.apache.sqoop.testutil.ImportJobTestCase; import org.apache.sqoop.testutil.SeqFileReader; @@ -42,6 +43,7 @@ import org.apache.sqoop.util.ClassLoaderStack; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -68,6 +70,7 @@ import static org.junit.Assert.fail; * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and * -Dms.sqlserver.password */ +@Category(SqlServerTest.class) public class SQLServerSplitByTest extends ImportJobTestCase { @Before http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/sqlserver/SQLServerWhereTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerWhereTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerWhereTest.java index 11d0963..e6cb7f8 100644 --- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerWhereTest.java +++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerWhereTest.java @@ -34,6 +34,7 @@ import org.apache.hadoop.util.StringUtils; import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.SqoopOptions.InvalidOptionsException; import org.apache.sqoop.orm.CompilationManager; +import org.apache.sqoop.testcategories.thirdpartytest.SqlServerTest; import org.apache.sqoop.testutil.CommonArgs; import org.apache.sqoop.testutil.ImportJobTestCase; import org.apache.sqoop.testutil.SeqFileReader; @@ -42,6 +43,7 @@ import org.apache.sqoop.util.ClassLoaderStack; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -68,6 +70,7 @@ import static org.junit.Assert.fail; * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and * -Dms.sqlserver.password */ +@Category(SqlServerTest.class) public class SQLServerWhereTest extends ImportJobTestCase { @Before http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/manager/sqlserver/TestSqlServerManagerContextConfigurator.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/manager/sqlserver/TestSqlServerManagerContextConfigurator.java b/src/test/org/apache/sqoop/manager/sqlserver/TestSqlServerManagerContextConfigurator.java index c0d0a24..7087d19 100644 --- a/src/test/org/apache/sqoop/manager/sqlserver/TestSqlServerManagerContextConfigurator.java +++ b/src/test/org/apache/sqoop/manager/sqlserver/TestSqlServerManagerContextConfigurator.java @@ -31,14 +31,17 @@ import org.apache.sqoop.mapreduce.SQLServerResilientUpdateOutputFormat; import org.apache.sqoop.mapreduce.db.DataDrivenDBInputFormat; import org.apache.sqoop.mapreduce.db.SQLServerDBInputFormat; import org.apache.sqoop.mapreduce.sqlserver.SqlServerExportBatchOutputFormat; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.assertj.core.api.Assertions.assertThat; /** * Test methods in the configuration utilities. */ +@Category(UnitTest.class) public class TestSqlServerManagerContextConfigurator { public static final Log LOG = LogFactory.getLog(TestSqlServerManagerContextConfigurator.class.getName()); http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/mapreduce/TestJdbcExportJob.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/TestJdbcExportJob.java b/src/test/org/apache/sqoop/mapreduce/TestJdbcExportJob.java index 81ab677..f849548 100644 --- a/src/test/org/apache/sqoop/mapreduce/TestJdbcExportJob.java +++ b/src/test/org/apache/sqoop/mapreduce/TestJdbcExportJob.java @@ -37,16 +37,19 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.Job; import org.apache.sqoop.mapreduce.ExportJobBase.FileType; import org.apache.sqoop.mapreduce.parquet.ParquetExportJobConfigurator; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.junit.Test; import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.manager.ConnManager; import org.apache.sqoop.manager.ExportJobContext; +import org.junit.experimental.categories.Category; /** * Test methods of the JdbcExportJob implementation. */ +@Category(UnitTest.class) public class TestJdbcExportJob { @Test http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/mapreduce/TestJobBase.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/TestJobBase.java b/src/test/org/apache/sqoop/mapreduce/TestJobBase.java index e1781bb..7b5684d 100644 --- a/src/test/org/apache/sqoop/mapreduce/TestJobBase.java +++ b/src/test/org/apache/sqoop/mapreduce/TestJobBase.java @@ -28,11 +28,14 @@ import java.io.IOException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.Job; import org.apache.sqoop.config.ConfigurationConstants; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.junit.Before; import org.junit.Test; import org.apache.sqoop.SqoopOptions; +import org.junit.experimental.categories.Category; +@Category(UnitTest.class) public class TestJobBase { SqoopOptions options; http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/mapreduce/db/TestBigDecimalSplitter.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/db/TestBigDecimalSplitter.java b/src/test/org/apache/sqoop/mapreduce/db/TestBigDecimalSplitter.java index 951a3dc..bf90166 100644 --- a/src/test/org/apache/sqoop/mapreduce/db/TestBigDecimalSplitter.java +++ b/src/test/org/apache/sqoop/mapreduce/db/TestBigDecimalSplitter.java @@ -20,10 +20,13 @@ package org.apache.sqoop.mapreduce.db; import java.math.BigDecimal; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; +@Category(UnitTest.class) public class TestBigDecimalSplitter { /* Test if the decimal split sizes are generated as expected */ http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/mapreduce/db/TestDBConfiguration.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/db/TestDBConfiguration.java b/src/test/org/apache/sqoop/mapreduce/db/TestDBConfiguration.java index 3160db9..c45786c 100644 --- a/src/test/org/apache/sqoop/mapreduce/db/TestDBConfiguration.java +++ b/src/test/org/apache/sqoop/mapreduce/db/TestDBConfiguration.java @@ -20,13 +20,16 @@ package org.apache.sqoop.mapreduce.db; import java.util.Properties; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; /** * Test aspects of DBConfiguration. */ +@Category(UnitTest.class) public class TestDBConfiguration { @Test http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/mapreduce/db/TestDataDrivenDBInputFormat.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/db/TestDataDrivenDBInputFormat.java b/src/test/org/apache/sqoop/mapreduce/db/TestDataDrivenDBInputFormat.java index 9e538fd..3214491 100644 --- a/src/test/org/apache/sqoop/mapreduce/db/TestDataDrivenDBInputFormat.java +++ b/src/test/org/apache/sqoop/mapreduce/db/TestDataDrivenDBInputFormat.java @@ -35,11 +35,13 @@ import org.apache.hadoop.mapreduce.Reducer; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; import org.apache.hadoop.util.StringUtils; import org.apache.sqoop.mapreduce.DBWritable; +import org.apache.sqoop.testcategories.sqooptest.IntegrationTest; import org.apache.sqoop.mapreduce.db.DataDrivenDBInputFormat; import org.apache.sqoop.mapreduce.db.DBConfiguration; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -47,6 +49,7 @@ import static org.junit.Assert.assertTrue; /** * Test aspects of DataDrivenDBInputFormat. */ +@Category(IntegrationTest.class) public class TestDataDrivenDBInputFormat { private static final Log LOG = LogFactory.getLog( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/mapreduce/db/TestIntegerSplitter.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/db/TestIntegerSplitter.java b/src/test/org/apache/sqoop/mapreduce/db/TestIntegerSplitter.java index b43fc41..8e82862 100644 --- a/src/test/org/apache/sqoop/mapreduce/db/TestIntegerSplitter.java +++ b/src/test/org/apache/sqoop/mapreduce/db/TestIntegerSplitter.java @@ -20,7 +20,9 @@ package org.apache.sqoop.mapreduce.db; import java.sql.SQLException; import java.util.List; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.junit.Test; +import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -28,6 +30,7 @@ import static org.junit.Assert.fail; /** * Test that the IntegerSplitter generates sane splits. */ +@Category(UnitTest.class) public class TestIntegerSplitter { private long [] toLongArray(List<Long> in) { long [] out = new long[in.size()]; http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/mapreduce/db/TestSQLServerDBRecordReader.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/db/TestSQLServerDBRecordReader.java b/src/test/org/apache/sqoop/mapreduce/db/TestSQLServerDBRecordReader.java index 70187b1..ebbd276 100644 --- a/src/test/org/apache/sqoop/mapreduce/db/TestSQLServerDBRecordReader.java +++ b/src/test/org/apache/sqoop/mapreduce/db/TestSQLServerDBRecordReader.java @@ -27,8 +27,10 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.sqoop.lib.SqoopRecord; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -51,6 +53,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +@Category(UnitTest.class) public class TestSQLServerDBRecordReader { private static final String SPLIT_BY_COLUMN = "myCol"; http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/mapreduce/db/TestTextSplitter.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/db/TestTextSplitter.java b/src/test/org/apache/sqoop/mapreduce/db/TestTextSplitter.java index 5d9cdf0..bb92540 100644 --- a/src/test/org/apache/sqoop/mapreduce/db/TestTextSplitter.java +++ b/src/test/org/apache/sqoop/mapreduce/db/TestTextSplitter.java @@ -21,6 +21,7 @@ import java.math.BigDecimal; import java.sql.SQLException; import java.util.List; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.apache.sqoop.validation.ValidationException; import org.junit.Test; @@ -28,12 +29,14 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import org.junit.Rule; +import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; /** * Test that the TextSplitter implementation creates a sane set of splits. */ +@Category(UnitTest.class) public class TestTextSplitter { @Rule http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/mapreduce/db/TextSplitterHadoopConfIntegrationTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/db/TextSplitterHadoopConfIntegrationTest.java b/src/test/org/apache/sqoop/mapreduce/db/TextSplitterHadoopConfIntegrationTest.java index 9eb8922..8b326a6 100644 --- a/src/test/org/apache/sqoop/mapreduce/db/TextSplitterHadoopConfIntegrationTest.java +++ b/src/test/org/apache/sqoop/mapreduce/db/TextSplitterHadoopConfIntegrationTest.java @@ -23,16 +23,19 @@ import java.util.List; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.Job; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.apache.sqoop.validation.ValidationException; import org.apache.sqoop.testutil.MockResultSet; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import static org.junit.Assert.assertFalse; +@Category(UnitTest.class) public class TextSplitterHadoopConfIntegrationTest { private static final String TEXT_COL_NAME = "text_col_name"; http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/mapreduce/hcat/TestSqoopHCatImportHelper.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/hcat/TestSqoopHCatImportHelper.java b/src/test/org/apache/sqoop/mapreduce/hcat/TestSqoopHCatImportHelper.java index 3f734ea..0bc32c0 100644 --- a/src/test/org/apache/sqoop/mapreduce/hcat/TestSqoopHCatImportHelper.java +++ b/src/test/org/apache/sqoop/mapreduce/hcat/TestSqoopHCatImportHelper.java @@ -19,13 +19,16 @@ package org.apache.sqoop.mapreduce.hcat; import org.apache.hadoop.hive.common.type.HiveDecimal; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.math.BigDecimal; import static org.junit.Assert.assertEquals; +@Category(UnitTest.class) public class TestSqoopHCatImportHelper { private SqoopHCatImportHelper importHelper; http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/mapreduce/hcat/TestSqoopHCatUtilities.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/hcat/TestSqoopHCatUtilities.java b/src/test/org/apache/sqoop/mapreduce/hcat/TestSqoopHCatUtilities.java index dff11f1..3980155 100644 --- a/src/test/org/apache/sqoop/mapreduce/hcat/TestSqoopHCatUtilities.java +++ b/src/test/org/apache/sqoop/mapreduce/hcat/TestSqoopHCatUtilities.java @@ -23,9 +23,12 @@ import static org.junit.Assert.assertSame; import java.io.IOException; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(UnitTest.class) public class TestSqoopHCatUtilities { private static final String[] VALID_HCAT_ARGS = new String[] {"-h"}; http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetFTPRecordReader.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetFTPRecordReader.java b/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetFTPRecordReader.java index 3547294..502e633 100644 --- a/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetFTPRecordReader.java +++ b/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetFTPRecordReader.java @@ -45,6 +45,7 @@ import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.sqoop.lib.SqoopRecord; import org.apache.sqoop.mapreduce.DBWritable; import org.apache.sqoop.mapreduce.db.DBConfiguration; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.apache.sqoop.util.MainframeFTPClientUtils; import org.junit.After; import org.junit.Assert; @@ -53,7 +54,9 @@ import org.junit.Test; import org.apache.sqoop.lib.DelimiterSet; import org.apache.sqoop.lib.LargeObjectLoader; +import org.junit.experimental.categories.Category; +@Category(UnitTest.class) public class TestMainframeDatasetFTPRecordReader { private MainframeImportJob mfImportJob; http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetInputFormat.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetInputFormat.java b/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetInputFormat.java index efef056..ed61f91 100644 --- a/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetInputFormat.java +++ b/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetInputFormat.java @@ -37,6 +37,7 @@ import org.apache.hadoop.mapreduce.Job; import org.apache.sqoop.lib.SqoopRecord; import org.apache.sqoop.mapreduce.db.DBConfiguration; import org.apache.sqoop.mapreduce.mainframe.MainframeConfiguration; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.apache.sqoop.util.MainframeFTPClientUtils; import org.junit.After; import org.junit.Assert; @@ -44,7 +45,9 @@ import org.junit.Before; import org.junit.Test; import org.apache.sqoop.config.ConfigurationHelper; +import org.junit.experimental.categories.Category; +@Category(UnitTest.class) public class TestMainframeDatasetInputFormat { private MainframeDatasetInputFormat<SqoopRecord> format; http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetInputSplit.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetInputSplit.java b/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetInputSplit.java index 5d92f6d..174cbaa 100644 --- a/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetInputSplit.java +++ b/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetInputSplit.java @@ -22,10 +22,13 @@ import java.io.IOException; import org.apache.hadoop.io.DataInputBuffer; import org.apache.hadoop.io.DataOutputBuffer; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(UnitTest.class) public class TestMainframeDatasetInputSplit { private MainframeDatasetInputSplit mfDatasetInputSplit; http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetPath.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetPath.java b/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetPath.java index 9b277b2..91bc8f7 100644 --- a/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetPath.java +++ b/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeDatasetPath.java @@ -24,8 +24,11 @@ import static org.junit.Assert.assertNotNull; import java.text.ParseException; import org.apache.hadoop.conf.Configuration; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(UnitTest.class) public class TestMainframeDatasetPath { @Test http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeFTPFileEntryParser.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeFTPFileEntryParser.java b/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeFTPFileEntryParser.java index 26ed961..35fcca3 100644 --- a/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeFTPFileEntryParser.java +++ b/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeFTPFileEntryParser.java @@ -22,12 +22,15 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.net.ftp.FTPFile; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(UnitTest.class) public class TestMainframeFTPFileEntryParser { static List<String> listing; static MainframeFTPFileEntryParser parser2; http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeImportJob.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeImportJob.java b/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeImportJob.java index be62efd..ad90cbe 100644 --- a/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeImportJob.java +++ b/src/test/org/apache/sqoop/mapreduce/mainframe/TestMainframeImportJob.java @@ -29,12 +29,15 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.Mapper; import org.apache.sqoop.mapreduce.parquet.ParquetImportJobConfigurator; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.junit.Before; import org.junit.Test; import org.apache.sqoop.SqoopOptions; import org.apache.sqoop.manager.ImportJobContext; +import org.junit.experimental.categories.Category; +@Category(UnitTest.class) public class TestMainframeImportJob { private MainframeImportJob mfImportJob; http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormatTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormatTest.java b/src/test/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormatTest.java index a89e800..7b0482a 100644 --- a/src/test/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormatTest.java +++ b/src/test/org/apache/sqoop/mapreduce/sqlserver/SqlServerUpsertOutputFormatTest.java @@ -31,8 +31,11 @@ import org.apache.hadoop.mapreduce.TaskAttemptID; import org.apache.sqoop.manager.SQLServerManager; import org.apache.sqoop.mapreduce.ExportJobBase; import org.apache.sqoop.mapreduce.sqlserver.SqlServerUpsertOutputFormat.SqlServerUpsertRecordWriter; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category(UnitTest.class) public class SqlServerUpsertOutputFormatTest { @SuppressWarnings("unchecked") http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/metastore/PasswordRedactorTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/metastore/PasswordRedactorTest.java b/src/test/org/apache/sqoop/metastore/PasswordRedactorTest.java index a2dbc71..35616ce 100644 --- a/src/test/org/apache/sqoop/metastore/PasswordRedactorTest.java +++ b/src/test/org/apache/sqoop/metastore/PasswordRedactorTest.java @@ -17,7 +17,9 @@ */ package org.apache.sqoop.metastore; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.util.HashMap; import java.util.Map; @@ -26,6 +28,7 @@ import static org.apache.sqoop.SqoopOptions.DB_PASSWORD_KEY; import static org.apache.sqoop.metastore.PasswordRedactor.REDACTED_PASSWORD_STRING; import static org.junit.Assert.assertEquals; +@Category(UnitTest.class) public class PasswordRedactorTest { @Test http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/metastore/SavedJobsTestBase.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/metastore/SavedJobsTestBase.java b/src/test/org/apache/sqoop/metastore/SavedJobsTestBase.java index 9c9b2f4..0bd9ef3 100644 --- a/src/test/org/apache/sqoop/metastore/SavedJobsTestBase.java +++ b/src/test/org/apache/sqoop/metastore/SavedJobsTestBase.java @@ -28,6 +28,7 @@ import static org.junit.Assert.assertThat; import org.apache.sqoop.manager.ConnManager; import org.apache.sqoop.SqoopOptions; +import org.apache.sqoop.testcategories.sqooptest.IntegrationTest; import org.apache.sqoop.tool.VersionTool; import org.apache.hadoop.conf.Configuration; @@ -40,6 +41,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import java.io.IOException; @@ -56,6 +58,7 @@ import java.util.TreeMap; * Test the metastore and job-handling features, * implemented for specific database services in sub-classes. */ +@Category(IntegrationTest.class) public abstract class SavedJobsTestBase { public static final String TEST_JOB = "testJob"; http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/metastore/TestAutoGenericJobStorage.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/metastore/TestAutoGenericJobStorage.java b/src/test/org/apache/sqoop/metastore/TestAutoGenericJobStorage.java index d5424c6..ac67ee5 100644 --- a/src/test/org/apache/sqoop/metastore/TestAutoGenericJobStorage.java +++ b/src/test/org/apache/sqoop/metastore/TestAutoGenericJobStorage.java @@ -19,8 +19,10 @@ package org.apache.sqoop.metastore; import org.apache.hadoop.conf.Configuration; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.junit.Before; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.util.HashMap; import java.util.Map; @@ -29,6 +31,7 @@ import static org.apache.sqoop.metastore.AutoGenericJobStorage.AUTO_STORAGE_IS_A import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +@Category(UnitTest.class) public class TestAutoGenericJobStorage { private AutoGenericJobStorage jobStorage; http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/metastore/TestGenericJobStorage.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/metastore/TestGenericJobStorage.java b/src/test/org/apache/sqoop/metastore/TestGenericJobStorage.java index 026fbde..e61fe56 100644 --- a/src/test/org/apache/sqoop/metastore/TestGenericJobStorage.java +++ b/src/test/org/apache/sqoop/metastore/TestGenericJobStorage.java @@ -18,9 +18,11 @@ package org.apache.sqoop.metastore; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import java.io.IOException; @@ -31,6 +33,7 @@ import static org.apache.sqoop.metastore.GenericJobStorage.META_CONNECT_KEY; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +@Category(UnitTest.class) public class TestGenericJobStorage { @Rule http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/metastore/TestGenericJobStorageValidate.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/metastore/TestGenericJobStorageValidate.java b/src/test/org/apache/sqoop/metastore/TestGenericJobStorageValidate.java index 9995a42..3cfbc0b 100644 --- a/src/test/org/apache/sqoop/metastore/TestGenericJobStorageValidate.java +++ b/src/test/org/apache/sqoop/metastore/TestGenericJobStorageValidate.java @@ -18,9 +18,12 @@ package org.apache.sqoop.metastore; +import org.apache.sqoop.testcategories.sqooptest.UnitTest; +import org.apache.sqoop.util.BlockJUnit4ClassRunnerWithParametersFactory; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.junit.experimental.categories.Category; import org.junit.rules.ExpectedException; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -29,6 +32,8 @@ import org.junit.runners.Parameterized.Parameters; import java.util.Arrays; @RunWith(Parameterized.class) +@Category(UnitTest.class) [email protected](BlockJUnit4ClassRunnerWithParametersFactory.class) public class TestGenericJobStorageValidate { @Parameters(name = "metastoreConnectionString = {0}, validationShouldFail = {1}") http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/metastore/TestMetastoreConfigurationParameters.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/metastore/TestMetastoreConfigurationParameters.java b/src/test/org/apache/sqoop/metastore/TestMetastoreConfigurationParameters.java index 5a6fac5..bf75289 100644 --- a/src/test/org/apache/sqoop/metastore/TestMetastoreConfigurationParameters.java +++ b/src/test/org/apache/sqoop/metastore/TestMetastoreConfigurationParameters.java @@ -18,6 +18,7 @@ package org.apache.sqoop.metastore; +import org.apache.sqoop.testcategories.sqooptest.IntegrationTest; import org.apache.sqoop.testutil.ArgumentArrayBuilder; import org.apache.sqoop.testutil.HsqldbTestServer; import org.apache.sqoop.Sqoop; @@ -26,6 +27,7 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.experimental.categories.Category; import java.io.IOException; import java.sql.Connection; @@ -36,7 +38,7 @@ import java.sql.Statement; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; - +@Category(IntegrationTest.class) public class TestMetastoreConfigurationParameters { private static final int STATUS_FAILURE = 1; http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/metastore/db2/DB2JobToolTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/metastore/db2/DB2JobToolTest.java b/src/test/org/apache/sqoop/metastore/db2/DB2JobToolTest.java index b2b1fb6..81ef5fc 100644 --- a/src/test/org/apache/sqoop/metastore/db2/DB2JobToolTest.java +++ b/src/test/org/apache/sqoop/metastore/db2/DB2JobToolTest.java @@ -19,6 +19,8 @@ package org.apache.sqoop.metastore.db2; import org.apache.sqoop.metastore.JobToolTestBase; +import org.apache.sqoop.testcategories.thirdpartytest.Db2Test; +import org.junit.experimental.categories.Category; /** * Test that the Job Tool works in DB2 @@ -39,7 +41,7 @@ import org.apache.sqoop.metastore.JobToolTestBase; * -Dsqoop.test.db2.connectstring.host_url, -Dsqoop.test.db2.connectstring.database, * -Dsqoop.test.db2.connectstring.username and -Dsqoop.test.db2.connectstring.password respectively */ - +@Category(Db2Test.class) public class DB2JobToolTest extends JobToolTestBase { private static final String HOST_URL = System.getProperty( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/metastore/db2/DB2MetaConnectIncrementalImportTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/metastore/db2/DB2MetaConnectIncrementalImportTest.java b/src/test/org/apache/sqoop/metastore/db2/DB2MetaConnectIncrementalImportTest.java index e7969fa..5403908 100644 --- a/src/test/org/apache/sqoop/metastore/db2/DB2MetaConnectIncrementalImportTest.java +++ b/src/test/org/apache/sqoop/metastore/db2/DB2MetaConnectIncrementalImportTest.java @@ -19,6 +19,8 @@ package org.apache.sqoop.metastore.db2; import org.apache.sqoop.metastore.MetaConnectIncrementalImportTestBase; +import org.apache.sqoop.testcategories.thirdpartytest.Db2Test; +import org.junit.experimental.categories.Category; /** * Test that Incremental-Import values are stored correctly in DB2 @@ -39,7 +41,7 @@ import org.apache.sqoop.metastore.MetaConnectIncrementalImportTestBase; * -Dsqoop.test.db2.connectstring.host_url, -Dsqoop.test.db2.connectstring.database, * -Dsqoop.test.db2.connectstring.username and -Dsqoop.test.db2.connectstring.password respectively */ - +@Category(Db2Test.class) public class DB2MetaConnectIncrementalImportTest extends MetaConnectIncrementalImportTestBase { private static final String HOST_URL = System.getProperty( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/metastore/db2/DB2SavedJobsTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/metastore/db2/DB2SavedJobsTest.java b/src/test/org/apache/sqoop/metastore/db2/DB2SavedJobsTest.java index caf753c..b41eda1 100644 --- a/src/test/org/apache/sqoop/metastore/db2/DB2SavedJobsTest.java +++ b/src/test/org/apache/sqoop/metastore/db2/DB2SavedJobsTest.java @@ -20,6 +20,8 @@ package org.apache.sqoop.metastore.db2; import org.apache.sqoop.metastore.SavedJobsTestBase; import org.apache.sqoop.manager.JdbcDrivers; +import org.apache.sqoop.testcategories.thirdpartytest.Db2Test; +import org.junit.experimental.categories.Category; /** * Test of GenericJobStorage compatibility with DB2 @@ -40,7 +42,7 @@ import org.apache.sqoop.manager.JdbcDrivers; * -Dsqoop.test.db2.connectstring.host_url, -Dsqoop.test.db2.connectstring.database, * -Dsqoop.test.db2.connectstring.username and -Dsqoop.test.db2.connectstring.password respectively */ - +@Category(Db2Test.class) public class DB2SavedJobsTest extends SavedJobsTestBase { private static final String HOST_URL = System.getProperty( http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/metastore/mysql/MySqlJobToolTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/metastore/mysql/MySqlJobToolTest.java b/src/test/org/apache/sqoop/metastore/mysql/MySqlJobToolTest.java index 2ec9648..6ec57f6 100644 --- a/src/test/org/apache/sqoop/metastore/mysql/MySqlJobToolTest.java +++ b/src/test/org/apache/sqoop/metastore/mysql/MySqlJobToolTest.java @@ -20,6 +20,8 @@ package org.apache.sqoop.metastore.mysql; import org.apache.sqoop.manager.mysql.MySQLTestUtils; import org.apache.sqoop.metastore.JobToolTestBase; +import org.apache.sqoop.testcategories.thirdpartytest.MysqlTest; +import org.junit.experimental.categories.Category; /** * Test that the Job Tool works in MySql @@ -40,7 +42,7 @@ import org.apache.sqoop.metastore.JobToolTestBase; * -Dsqoop.test.mysql.connectstring.host_url, -Dsqoop.test.mysql.databasename, * -Dsqoop.test.mysql.username and -Dsqoop.test.mysql.password respectively */ - +@Category(MysqlTest.class) public class MySqlJobToolTest extends JobToolTestBase { private static MySQLTestUtils mySQLTestUtils = new MySQLTestUtils(); http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/metastore/mysql/MySqlMetaConnectIncrementalImportTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/metastore/mysql/MySqlMetaConnectIncrementalImportTest.java b/src/test/org/apache/sqoop/metastore/mysql/MySqlMetaConnectIncrementalImportTest.java index e19bbc8..5e548cf 100644 --- a/src/test/org/apache/sqoop/metastore/mysql/MySqlMetaConnectIncrementalImportTest.java +++ b/src/test/org/apache/sqoop/metastore/mysql/MySqlMetaConnectIncrementalImportTest.java @@ -21,6 +21,8 @@ package org.apache.sqoop.metastore.mysql; import org.apache.sqoop.manager.mysql.MySQLTestUtils; import org.apache.sqoop.metastore.MetaConnectIncrementalImportTestBase; +import org.apache.sqoop.testcategories.thirdpartytest.MysqlTest; +import org.junit.experimental.categories.Category; /** * Test that Incremental-Import values are stored correctly in MySql @@ -41,7 +43,7 @@ import org.apache.sqoop.metastore.MetaConnectIncrementalImportTestBase; * -Dsqoop.test.mysql.connectstring.host_url, -Dsqoop.test.mysql.databasename, * -Dsqoop.test.mysql.username and -Dsqoop.test.mysql.password respectively */ - +@Category(MysqlTest.class) public class MySqlMetaConnectIncrementalImportTest extends MetaConnectIncrementalImportTestBase { private static MySQLTestUtils mySQLTestUtils = new MySQLTestUtils(); http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/metastore/mysql/MySqlSavedJobsTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/metastore/mysql/MySqlSavedJobsTest.java b/src/test/org/apache/sqoop/metastore/mysql/MySqlSavedJobsTest.java index e15c322..9a66165 100644 --- a/src/test/org/apache/sqoop/metastore/mysql/MySqlSavedJobsTest.java +++ b/src/test/org/apache/sqoop/metastore/mysql/MySqlSavedJobsTest.java @@ -21,6 +21,8 @@ package org.apache.sqoop.metastore.mysql; import org.apache.sqoop.manager.mysql.MySQLTestUtils; import org.apache.sqoop.metastore.SavedJobsTestBase; import org.apache.sqoop.manager.JdbcDrivers; +import org.apache.sqoop.testcategories.thirdpartytest.MysqlTest; +import org.junit.experimental.categories.Category; /** * Test of GenericJobStorage compatibility with MySql @@ -41,7 +43,7 @@ import org.apache.sqoop.manager.JdbcDrivers; * -Dsqoop.test.mysql.connectstring.host_url, -Dsqoop.test.mysql.databasename, * -Dsqoop.test.mysql.username and -Dsqoop.test.mysql.password respectively */ - +@Category(MysqlTest.class) public class MySqlSavedJobsTest extends SavedJobsTestBase { private static MySQLTestUtils mySQLTestUtils = new MySQLTestUtils(); http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/metastore/oracle/OracleJobToolTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/metastore/oracle/OracleJobToolTest.java b/src/test/org/apache/sqoop/metastore/oracle/OracleJobToolTest.java index a3e61e9..0869ec0 100644 --- a/src/test/org/apache/sqoop/metastore/oracle/OracleJobToolTest.java +++ b/src/test/org/apache/sqoop/metastore/oracle/OracleJobToolTest.java @@ -20,6 +20,8 @@ package org.apache.sqoop.metastore.oracle; import org.apache.sqoop.manager.oracle.util.OracleUtils; import org.apache.sqoop.metastore.JobToolTestBase; +import org.apache.sqoop.testcategories.thirdpartytest.OracleTest; +import org.junit.experimental.categories.Category; /** * Test that the Job Tool works in Oracle @@ -40,7 +42,7 @@ import org.apache.sqoop.metastore.JobToolTestBase; * -Dsqoop.test.oracle.connectstring, -Dsqoop.test.oracle.username * and -Dsqoop.test.oracle.password respectively */ - +@Category(OracleTest.class) public class OracleJobToolTest extends JobToolTestBase { public OracleJobToolTest() { http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/metastore/oracle/OracleMetaConnectIncrementalImportTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/metastore/oracle/OracleMetaConnectIncrementalImportTest.java b/src/test/org/apache/sqoop/metastore/oracle/OracleMetaConnectIncrementalImportTest.java index 37beaa4..8b92ef4 100644 --- a/src/test/org/apache/sqoop/metastore/oracle/OracleMetaConnectIncrementalImportTest.java +++ b/src/test/org/apache/sqoop/metastore/oracle/OracleMetaConnectIncrementalImportTest.java @@ -20,6 +20,8 @@ package org.apache.sqoop.metastore.oracle; import org.apache.sqoop.manager.oracle.util.OracleUtils; import org.apache.sqoop.metastore.MetaConnectIncrementalImportTestBase; +import org.apache.sqoop.testcategories.thirdpartytest.OracleTest; +import org.junit.experimental.categories.Category; /** * Test that Incremental-Import values are stored correctly in Oracle @@ -40,7 +42,7 @@ import org.apache.sqoop.metastore.MetaConnectIncrementalImportTestBase; * -Dsqoop.test.oracle.connectstring, -Dsqoop.test.oracle.username * and -Dsqoop.test.oracle.password respectively */ - +@Category(OracleTest.class) public class OracleMetaConnectIncrementalImportTest extends MetaConnectIncrementalImportTestBase { public OracleMetaConnectIncrementalImportTest() { http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/metastore/oracle/OracleSavedJobsTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/metastore/oracle/OracleSavedJobsTest.java b/src/test/org/apache/sqoop/metastore/oracle/OracleSavedJobsTest.java index 4691530..8e6e6c4 100644 --- a/src/test/org/apache/sqoop/metastore/oracle/OracleSavedJobsTest.java +++ b/src/test/org/apache/sqoop/metastore/oracle/OracleSavedJobsTest.java @@ -21,6 +21,8 @@ package org.apache.sqoop.metastore.oracle; import org.apache.sqoop.manager.oracle.util.OracleUtils; import org.apache.sqoop.metastore.SavedJobsTestBase; import org.apache.sqoop.manager.JdbcDrivers; +import org.apache.sqoop.testcategories.thirdpartytest.OracleTest; +import org.junit.experimental.categories.Category; /** * Test of GenericJobStorage compatibility with Oracle @@ -41,7 +43,7 @@ import org.apache.sqoop.manager.JdbcDrivers; * -Dsqoop.test.oracle.connectstring, -Dsqoop.test.oracle.username * and -Dsqoop.test.oracle.password respectively */ - +@Category(OracleTest.class) public class OracleSavedJobsTest extends SavedJobsTestBase { public OracleSavedJobsTest() { http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/metastore/postgres/PostgresJobToolTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/metastore/postgres/PostgresJobToolTest.java b/src/test/org/apache/sqoop/metastore/postgres/PostgresJobToolTest.java index 065e1bb..59ea151 100644 --- a/src/test/org/apache/sqoop/metastore/postgres/PostgresJobToolTest.java +++ b/src/test/org/apache/sqoop/metastore/postgres/PostgresJobToolTest.java @@ -19,6 +19,8 @@ package org.apache.sqoop.metastore.postgres; import org.apache.sqoop.metastore.JobToolTestBase; +import org.apache.sqoop.testcategories.thirdpartytest.PostgresqlTest; +import org.junit.experimental.categories.Category; /** * Test that the Job Tool works in PostgreSQL @@ -35,7 +37,7 @@ import org.apache.sqoop.metastore.JobToolTestBase; * -Dsqoop.test.postgresql.connectstring.host_url, -Dsqoop.test.postgresql.database, * -Dsqoop.test.postgresql.username and -Dsqoop.test.postgresql.password respectively */ - +@Category(PostgresqlTest.class) public class PostgresJobToolTest extends JobToolTestBase { private static final String HOST_URL = System.getProperty("sqoop.test.postgresql.connectstring.host_url", http://git-wip-us.apache.org/repos/asf/sqoop/blob/d58e5f10/src/test/org/apache/sqoop/metastore/postgres/PostgresMetaConnectIncrementalImportTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/metastore/postgres/PostgresMetaConnectIncrementalImportTest.java b/src/test/org/apache/sqoop/metastore/postgres/PostgresMetaConnectIncrementalImportTest.java index 0ffbf5a..afc6bd2 100644 --- a/src/test/org/apache/sqoop/metastore/postgres/PostgresMetaConnectIncrementalImportTest.java +++ b/src/test/org/apache/sqoop/metastore/postgres/PostgresMetaConnectIncrementalImportTest.java @@ -19,6 +19,8 @@ package org.apache.sqoop.metastore.postgres; import org.apache.sqoop.metastore.MetaConnectIncrementalImportTestBase; +import org.apache.sqoop.testcategories.thirdpartytest.PostgresqlTest; +import org.junit.experimental.categories.Category; /** * Test that Incremental-Import values are stored correctly in PostgreSQL @@ -35,7 +37,7 @@ import org.apache.sqoop.metastore.MetaConnectIncrementalImportTestBase; * -Dsqoop.test.postgresql.connectstring.host_url, -Dsqoop.test.postgresql.database, * -Dsqoop.test.postgresql.username and -Dsqoop.test.postgresql.password respectively */ - +@Category(PostgresqlTest.class) public class PostgresMetaConnectIncrementalImportTest extends MetaConnectIncrementalImportTestBase { private static final String HOST_URL = System.getProperty("sqoop.test.postgresql.connectstring.host_url",
