SQOOP-3174: Add SQLServer manual tests to 3rd party test suite
(Boglarka Egyed via Anna Szonyi)
diff --git a/build.xml b/build.xml
index 10deb83..af43c47 100644
--- a/build.xml
+++ b/build.xml
@@ -743,7 +743,7 @@
<sysproperty key="test.build.data" value="${build.test}/data"/>
<sysproperty key="build.test" value="${build.test}"/>
- <!-- microsoft sqlserver manual test related properties-->
+ <!-- microsoft sqlserver thirdparty test related properties-->
<sysproperty key="test.data.dir" value="${basedir}/testdata"/>
<sysproperty key="ms.datatype.test.data.file.export" value="DatatypeTestData-export-lite.txt"/>
<sysproperty key="ms.datatype.test.data.file.import" value="DatatypeTestData-import-lite.txt"/>
diff --git a/src/test/com/cloudera/sqoop/manager/SQLServerManagerExportManualTest.java b/src/test/com/cloudera/sqoop/manager/SQLServerManagerExportTest.java
similarity index 98%
rename from src/test/com/cloudera/sqoop/manager/SQLServerManagerExportManualTest.java
rename to src/test/com/cloudera/sqoop/manager/SQLServerManagerExportTest.java
index 668a3a9..c87994f 100644
--- a/src/test/com/cloudera/sqoop/manager/SQLServerManagerExportManualTest.java
+++ b/src/test/com/cloudera/sqoop/manager/SQLServerManagerExportTest.java
@@ -43,12 +43,12 @@
import static org.junit.Assert.fail;
/**
- * Please see instructions in SQLServerManagerImportManualTest.
+ * Please see instructions in SQLServerManagerImportTest.
*/
-public class SQLServerManagerExportManualTest extends ExportJobTestCase {
+public class SQLServerManagerExportTest extends ExportJobTestCase {
public static final Log LOG = LogFactory.getLog(
- SQLServerManagerExportManualTest.class.getName());
+ SQLServerManagerExportTest.class.getName());
static final String HOST_URL = System.getProperty(
"sqoop.test.sqlserver.connectstring.host_url",
diff --git a/src/test/com/cloudera/sqoop/manager/SQLServerManagerImportManualTest.java b/src/test/com/cloudera/sqoop/manager/SQLServerManagerImportTest.java
similarity index 96%
rename from src/test/com/cloudera/sqoop/manager/SQLServerManagerImportManualTest.java
rename to src/test/com/cloudera/sqoop/manager/SQLServerManagerImportTest.java
index abc0479..714a592 100644
--- a/src/test/com/cloudera/sqoop/manager/SQLServerManagerImportManualTest.java
+++ b/src/test/com/cloudera/sqoop/manager/SQLServerManagerImportTest.java
@@ -55,22 +55,24 @@
* Since this requires an SQLServer installation,
* this class is named in such a way that Sqoop's default QA process does
* not run it. You need to run this manually with
- * -Dtestcase=SQLServerManagerImportManualTest.
+ * -Dtestcase=SQLServerManagerImportTest or -Dthirdparty=true.
*
* You need to put SQL Server JDBC driver library (sqljdbc4.jar) in a location
* where Sqoop will be able to access it (since this library cannot be checked
- * into Apache's tree for licensing reasons).
+ * into Apache's tree for licensing reasons) and set it's path through -Dsqoop.thirdparty.lib.dir.
*
* To set up your test environment:
* Install SQL Server Express 2012
* Create a database SQOOPTEST
* Create a login SQOOPUSER with password PASSWORD and grant all
* access for SQOOPTEST to SQOOPUSER.
+ * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and
+ * -Dms.sqlserver.password
*/
-public class SQLServerManagerImportManualTest extends ImportJobTestCase {
+public class SQLServerManagerImportTest extends ImportJobTestCase {
public static final Log LOG = LogFactory.getLog(
- SQLServerManagerImportManualTest.class.getName());
+ SQLServerManagerImportTest.class.getName());
static final String HOST_URL = System.getProperty(
"sqoop.test.sqlserver.connectstring.host_url",
diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportDelimitedFileManualTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportDelimitedFileTest.java
similarity index 88%
rename from src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportDelimitedFileManualTest.java
rename to src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportDelimitedFileTest.java
index 539eeb3..9b70af1 100644
--- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportDelimitedFileManualTest.java
+++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportDelimitedFileTest.java
@@ -36,19 +36,21 @@
* Since this requires an SQLServer installation,
* this class is named in such a way that Sqoop's default QA process does
* not run it. You need to run this manually with
- * -Dtestcase=SQLServerDatatypeExportDelimitedFileManualTest.
+ * -Dtestcase=SQLServerDatatypeExportDelimitedFileTest or -Dthirdparty=true.
*
* You need to put SQL Server JDBC driver library (sqljdbc4.jar) in a location
* where Sqoop will be able to access it (since this library cannot be checked
- * into Apache's tree for licensing reasons).
+ * into Apache's tree for licensing reasons) and set it's path through -Dsqoop.thirdparty.lib.dir.
*
* To set up your test environment:
* Install SQL Server Express 2012
* Create a database SQOOPTEST
* Create a login SQOOPUSER with password PASSWORD and grant all
* access for SQOOPTEST to SQOOPUSER.
+ * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and
+ * -Dms.sqlserver.password
*/
-public class SQLServerDatatypeExportDelimitedFileManualTest
+public class SQLServerDatatypeExportDelimitedFileTest
extends ManagerCompatExport {
@Override
diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportSequenceFileManualTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportSequenceFileTest.java
similarity index 95%
rename from src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportSequenceFileManualTest.java
rename to src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportSequenceFileTest.java
index 0f206d0..a68ed30 100644
--- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportSequenceFileManualTest.java
+++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeExportSequenceFileTest.java
@@ -49,19 +49,21 @@
* Since this requires an SQLServer installation,
* this class is named in such a way that Sqoop's default QA process does
* not run it. You need to run this manually with
- * -Dtestcase=SQLServerDatatypeExportSequenceFileManualTest.
+ * -Dtestcase=SQLServerDatatypeExportSequenceFileTest or -Dthirdparty=true.
*
* You need to put SQL Server JDBC driver library (sqljdbc4.jar) in a location
* where Sqoop will be able to access it (since this library cannot be checked
- * into Apache's tree for licensing reasons).
+ * into Apache's tree for licensing reasons) and set it's path through -Dsqoop.thirdparty.lib.dir.
*
* To set up your test environment:
* Install SQL Server Express 2012
* Create a database SQOOPTEST
* Create a login SQOOPUSER with password PASSWORD and grant all
* access for SQOOPTEST to SQOOPUSER.
+ * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and
+ * -Dms.sqlserver.password
*/
-public class SQLServerDatatypeExportSequenceFileManualTest
+public class SQLServerDatatypeExportSequenceFileTest
extends ManagerCompatExport {
private static Map jars = new HashMap();
diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportDelimitedFileManualTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportDelimitedFileTest.java
similarity index 95%
rename from src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportDelimitedFileManualTest.java
rename to src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportDelimitedFileTest.java
index 9c20bca..a4d1822 100644
--- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportDelimitedFileManualTest.java
+++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportDelimitedFileTest.java
@@ -51,20 +51,22 @@
* Since this requires an SQLServer installation,
* this class is named in such a way that Sqoop's default QA process does
* not run it. You need to run this manually with
- * -Dtestcase=SQLServerDatatypeImportDelimitedFileManualTest.
+ * -Dtestcase=SQLServerDatatypeImportDelimitedFileTest or -Dthirdparty=true.
*
* You need to put SQL Server JDBC driver library (sqljdbc4.jar) in a location
* where Sqoop will be able to access it (since this library cannot be checked
- * into Apache's tree for licensing reasons).
+ * into Apache's tree for licensing reasons) and set it's path through -Dsqoop.thirdparty.lib.dir.
*
* To set up your test environment:
* Install SQL Server Express 2012
* Create a database SQOOPTEST
* Create a login SQOOPUSER with password PASSWORD and grant all
* access for SQOOPTEST to SQOOPUSER.
+ * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and
+ * -Dms.sqlserver.password
*/
-public class SQLServerDatatypeImportDelimitedFileManualTest
- extends SQLServerDatatypeImportSequenceFileManualTest {
+public class SQLServerDatatypeImportDelimitedFileTest
+ extends SQLServerDatatypeImportSequenceFileTest {
/**
* Create the argv to pass to Sqoop.
diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportSequenceFileManualTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportSequenceFileTest.java
similarity index 97%
rename from src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportSequenceFileManualTest.java
rename to src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportSequenceFileTest.java
index 9cd3176..409c4ad 100644
--- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportSequenceFileManualTest.java
+++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerDatatypeImportSequenceFileTest.java
@@ -49,23 +49,25 @@
* Since this requires an SQLServer installation,
* this class is named in such a way that Sqoop's default QA process does
* not run it. You need to run this manually with
- * -Dtestcase=SQLServerDatatypeImportSequenceFileManualTest.
+ * -Dtestcase=SQLServerDatatypeImportSequenceFileTest or -Dthirdparty=true.
*
* You need to put SQL Server JDBC driver library (sqljdbc4.jar) in a location
* where Sqoop will be able to access it (since this library cannot be checked
- * into Apache's tree for licensing reasons).
+ * into Apache's tree for licensing reasons) and set it's path through -Dsqoop.thirdparty.lib.dir.
*
* To set up your test environment:
* Install SQL Server Express 2012
* Create a database SQOOPTEST
* Create a login SQOOPUSER with password PASSWORD and grant all
* access for SQOOPTEST to SQOOPUSER.
+ * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and
+ * -Dms.sqlserver.password
*/
-public class SQLServerDatatypeImportSequenceFileManualTest extends
+public class SQLServerDatatypeImportSequenceFileTest extends
ManagerCompatTestCase {
public static final Log LOG = LogFactory.getLog(
- SQLServerDatatypeImportSequenceFileManualTest.class.getName());
+ SQLServerDatatypeImportSequenceFileTest.class.getName());
private static MSSQLTestDataFileParser tdfs;
private static Map report;
diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerHiveImportManualTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerHiveImportTest.java
similarity index 93%
rename from src/test/org/apache/sqoop/manager/sqlserver/SQLServerHiveImportManualTest.java
rename to src/test/org/apache/sqoop/manager/sqlserver/SQLServerHiveImportTest.java
index ab3dd08..535e599 100644
--- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerHiveImportManualTest.java
+++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerHiveImportTest.java
@@ -43,19 +43,21 @@
* Since this requires an SQLServer installation,
* this class is named in such a way that Sqoop's default QA process does
* not run it. You need to run this manually with
- * -Dtestcase=SQLServerHiveImportManualTest.
+ * -Dtestcase=SQLServerHiveImportTest or -Dthirdparty=true.
*
* You need to put SQL Server JDBC driver library (sqljdbc4.jar) in a location
* where Sqoop will be able to access it (since this library cannot be checked
- * into Apache's tree for licensing reasons).
+ * into Apache's tree for licensing reasons) and set it's path through -Dsqoop.thirdparty.lib.dir.
*
* To set up your test environment:
* Install SQL Server Express 2012
* Create a database SQOOPTEST
* Create a login SQOOPUSER with password PASSWORD and grant all
* access for SQOOPTEST to SQOOPUSER.
+ * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and
+ * -Dms.sqlserver.password
*/
-public class SQLServerHiveImportManualTest extends TestHiveImport {
+public class SQLServerHiveImportTest extends TestHiveImport {
@Before
public void setUp() {
diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerManualTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerTest.java
similarity index 96%
rename from src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerManualTest.java
rename to src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerTest.java
index 8cc5a0b..67d8f1b 100644
--- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerManualTest.java
+++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerManagerTest.java
@@ -54,22 +54,24 @@
* Since this requires an SQLServer installation,
* this class is named in such a way that Sqoop's default QA process does
* not run it. You need to run this manually with
- * -Dtestcase=SQLServerManagerManualTest.
+ * -Dtestcase=SQLServerManagerTest or -Dthirdparty=true.
*
* You need to put SQL Server JDBC driver library (sqljdbc4.jar) in a location
* where Sqoop will be able to access it (since this library cannot be checked
- * into Apache's tree for licensing reasons).
+ * into Apache's tree for licensing reasons) and set it's path through -Dsqoop.thirdparty.lib.dir.
*
* To set up your test environment:
* Install SQL Server Express 2012
* Create a database SQOOPTEST
* Create a login SQOOPUSER with password PASSWORD and grant all
* access for SQOOPTEST to SQOOPUSER.
+ * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and
+ * -Dms.sqlserver.password
*/
-public class SQLServerManagerManualTest {
+public class SQLServerManagerTest {
public static final Log LOG = LogFactory.getLog(
- SQLServerManagerManualTest.class.getName());
+ SQLServerManagerTest.class.getName());
/** the name of a table that doesn't exist. */
static final String MISSING_TABLE = "MISSING_TABLE";
diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiColsManualTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiColsTest.java
similarity index 91%
rename from src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiColsManualTest.java
rename to src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiColsTest.java
index 51d5f75..d48de99 100644
--- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiColsManualTest.java
+++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiColsTest.java
@@ -36,19 +36,21 @@
* Since this requires an SQLServer installation,
* this class is named in such a way that Sqoop's default QA process does
* not run it. You need to run this manually with
- * -Dtestcase=SQLServerMultiColsManualTest.
+ * -Dtestcase=SQLServerMultiColsTest or -Dthirdparty=true.
*
* You need to put SQL Server JDBC driver library (sqljdbc4.jar) in a location
* where Sqoop will be able to access it (since this library cannot be checked
- * into Apache's tree for licensing reasons).
+ * into Apache's tree for licensing reasons) and set it's path through -Dsqoop.thirdparty.lib.dir.
*
* To set up your test environment:
* Install SQL Server Express 2012
* Create a database SQOOPTEST
* Create a login SQOOPUSER with password PASSWORD and grant all
* access for SQOOPTEST to SQOOPUSER.
+ * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and
+ * -Dms.sqlserver.password
*/
-public class SQLServerMultiColsManualTest extends TestMultiCols {
+public class SQLServerMultiColsTest extends TestMultiCols {
protected boolean useHsqldbTestServer() {
return false;
diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiMapsManualTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiMapsTest.java
similarity index 96%
rename from src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiMapsManualTest.java
rename to src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiMapsTest.java
index fc9e20d..be42da3 100644
--- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiMapsManualTest.java
+++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerMultiMapsTest.java
@@ -60,19 +60,21 @@
* Since this requires an SQLServer installation,
* this class is named in such a way that Sqoop's default QA process does
* not run it. You need to run this manually with
- * -Dtestcase=SQLServerMultiMapsManualTest.
+ * -Dtestcase=SQLServerMultiMapsTest or -Dthirdparty=true.
*
* You need to put SQL Server JDBC driver library (sqljdbc4.jar) in a location
* where Sqoop will be able to access it (since this library cannot be checked
- * into Apache's tree for licensing reasons).
+ * into Apache's tree for licensing reasons) and set it's path through -Dsqoop.thirdparty.lib.dir.
*
* To set up your test environment:
* Install SQL Server Express 2012
* Create a database SQOOPTEST
* Create a login SQOOPUSER with password PASSWORD and grant all
* access for SQOOPTEST to SQOOPUSER.
+ * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and
+ * -Dms.sqlserver.password
*/
-public class SQLServerMultiMapsManualTest extends ImportJobTestCase {
+public class SQLServerMultiMapsTest extends ImportJobTestCase {
@Before
public void setUp() {
diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerParseMethodsManualTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerParseMethodsTest.java
similarity index 95%
rename from src/test/org/apache/sqoop/manager/sqlserver/SQLServerParseMethodsManualTest.java
rename to src/test/org/apache/sqoop/manager/sqlserver/SQLServerParseMethodsTest.java
index b28c165..9547d80 100644
--- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerParseMethodsManualTest.java
+++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerParseMethodsTest.java
@@ -60,19 +60,21 @@
* Since this requires an SQLServer installation,
* this class is named in such a way that Sqoop's default QA process does
* not run it. You need to run this manually with
- * -Dtestcase=SQLServerParseMethodsManualTest.
+ * -Dtestcase=SQLServerParseMethodsTest or -Dthirdparty=true.
*
* You need to put SQL Server JDBC driver library (sqljdbc4.jar) in a location
* where Sqoop will be able to access it (since this library cannot be checked
- * into Apache's tree for licensing reasons).
+ * into Apache's tree for licensing reasons) and set it's path through -Dsqoop.thirdparty.lib.dir.
*
* To set up your test environment:
* Install SQL Server Express 2012
* Create a database SQOOPTEST
* Create a login SQOOPUSER with password PASSWORD and grant all
* access for SQOOPTEST to SQOOPUSER.
+ * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and
+ * -Dms.sqlserver.password
*/
-public class SQLServerParseMethodsManualTest extends ImportJobTestCase {
+public class SQLServerParseMethodsTest extends ImportJobTestCase {
@Before
public void setUp() {
diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerQueryManualTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerQueryTest.java
similarity index 96%
rename from src/test/org/apache/sqoop/manager/sqlserver/SQLServerQueryManualTest.java
rename to src/test/org/apache/sqoop/manager/sqlserver/SQLServerQueryTest.java
index d891c2b..1d570fe 100644
--- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerQueryManualTest.java
+++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerQueryTest.java
@@ -54,19 +54,21 @@
* Since this requires an SQLServer installation,
* this class is named in such a way that Sqoop's default QA process does
* not run it. You need to run this manually with
- * -Dtestcase=SQLServerQueryManualTest.
+ * -Dtestcase=SQLServerQueryTest or -Dthirdparty=true.
*
* You need to put SQL Server JDBC driver library (sqljdbc4.jar) in a location
* where Sqoop will be able to access it (since this library cannot be checked
- * into Apache's tree for licensing reasons).
+ * into Apache's tree for licensing reasons) and set it's path through -Dsqoop.thirdparty.lib.dir.
*
* To set up your test environment:
* Install SQL Server Express 2012
* Create a database SQOOPTEST
* Create a login SQOOPUSER with password PASSWORD and grant all
* access for SQOOPTEST to SQOOPUSER.
+ * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and
+ * -Dms.sqlserver.password
*/
-public class SQLServerQueryManualTest extends ImportJobTestCase {
+public class SQLServerQueryTest extends ImportJobTestCase {
@Before
public void setUp() {
diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerSplitByManualTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerSplitByTest.java
similarity index 95%
rename from src/test/org/apache/sqoop/manager/sqlserver/SQLServerSplitByManualTest.java
rename to src/test/org/apache/sqoop/manager/sqlserver/SQLServerSplitByTest.java
index 67e2cae..4894b21 100644
--- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerSplitByManualTest.java
+++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerSplitByTest.java
@@ -54,19 +54,21 @@
* Since this requires an SQLServer installation,
* this class is named in such a way that Sqoop's default QA process does
* not run it. You need to run this manually with
- * -Dtestcase=SQLServerSplitByManualTest.
+ * -Dtestcase=SQLServerSplitByTest or -Dthirdparty=true.
*
* You need to put SQL Server JDBC driver library (sqljdbc4.jar) in a location
* where Sqoop will be able to access it (since this library cannot be checked
- * into Apache's tree for licensing reasons).
+ * into Apache's tree for licensing reasons) and set it's path through -Dsqoop.thirdparty.lib.dir.
*
* To set up your test environment:
* Install SQL Server Express 2012
* Create a database SQOOPTEST
* Create a login SQOOPUSER with password PASSWORD and grant all
* access for SQOOPTEST to SQOOPUSER.
+ * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and
+ * -Dms.sqlserver.password
*/
-public class SQLServerSplitByManualTest extends ImportJobTestCase {
+public class SQLServerSplitByTest extends ImportJobTestCase {
@Before
public void setUp() {
diff --git a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerWhereManualTest.java b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerWhereTest.java
similarity index 95%
rename from src/test/org/apache/sqoop/manager/sqlserver/SQLServerWhereManualTest.java
rename to src/test/org/apache/sqoop/manager/sqlserver/SQLServerWhereTest.java
index 700fbba..2c5dbd3 100644
--- a/src/test/org/apache/sqoop/manager/sqlserver/SQLServerWhereManualTest.java
+++ b/src/test/org/apache/sqoop/manager/sqlserver/SQLServerWhereTest.java
@@ -54,19 +54,21 @@
* Since this requires an SQLServer installation,
* this class is named in such a way that Sqoop's default QA process does
* not run it. You need to run this manually with
- * -Dtestcase=SQLServerWhereManualTest.
+ * -Dtestcase=SQLServerWhereTest or -Dthirdparty=true.
*
* You need to put SQL Server JDBC driver library (sqljdbc4.jar) in a location
* where Sqoop will be able to access it (since this library cannot be checked
- * into Apache's tree for licensing reasons).
+ * into Apache's tree for licensing reasons) and set it's path through -Dsqoop.thirdparty.lib.dir.
*
* To set up your test environment:
* Install SQL Server Express 2012
* Create a database SQOOPTEST
* Create a login SQOOPUSER with password PASSWORD and grant all
* access for SQOOPTEST to SQOOPUSER.
+ * Set these through -Dsqoop.test.sqlserver.connectstring.host_url, -Dsqoop.test.sqlserver.database and
+ * -Dms.sqlserver.password
*/
-public class SQLServerWhereManualTest extends ImportJobTestCase {
+public class SQLServerWhereTest extends ImportJobTestCase {
@Before
public void setUp(){
