github/sqoop
5
0
Fork 0
mirror of https://github.com/apache/sqoop.git synced 2025-05-17 01:11:07 +08:00
Code Issues Projects Releases Wiki Activity

SQOOP-2303: EmptyTypeList when returned from DatabaseProvider class results in NPE in TestNG

Browse Source 
(Syed A. Hashmi via Jarek Jarcec Cecho)
This commit is contained in:
Jarek Jarcec Cecho 2015-04-13 16:14:28 -07:00
parent 59351b1328
commit 5ea695a6d9
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common-test/src/main/java/org/apache/sqoop/common/test/db/DatabaseProvider.java
View File

@ -19,9 +19,8 @@
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.apache.sqoop.common.test.db.types.DatabaseType;
import org.apache.sqoop.common.test.db.types.DatabaseTypeList; import org.apache.sqoop.common.test.db.types.DatabaseTypeList;
import org.apache.sqoop.common.test.db.types.EmptyTypeList; import org.apache.sqoop.common.test.db.types.DefaultTypeList;
import java.sql.Connection; import java.sql.Connection;
import java.sql.DriverManager; import java.sql.DriverManager;
@ -153,7 +152,7 @@ public String getJdbcDriver() {
* @return * @return
*/ */
public DatabaseTypeList getDatabaseTypes() { public DatabaseTypeList getDatabaseTypes() {
return new EmptyTypeList(); return new DefaultTypeList();
} }
/** /**

25
common-test/src/main/java/org/apache/sqoop/common/test/db/types/EmptyTypeList.java → common-test/src/main/java/org/apache/sqoop/common/test/db/types/DefaultTypeList.java
View File

@ -17,15 +17,22 @@
*/ */
package org.apache.sqoop.common.test.db.types; package org.apache.sqoop.common.test.db.types;
import java.util.LinkedList;
import java.util.List;
/** /**
* Default implementation that don't have any types. * This class provides one default type to be consumed by Types Tests.
* Any DB provider which wants to have more types covered should provide
* a separate class and return that instead of this class.
*/ */
public class EmptyTypeList extends DatabaseTypeList { public class DefaultTypeList extends DatabaseTypeList {
@Override public DefaultTypeList() {
public List<DatabaseType> getAllTypes() { super();
return new LinkedList<DatabaseType>();
// Integer type
add(DatabaseType.builder("INT")
.addExample("-32768", new Integer(-32768), "-32768")
.addExample("-1", new Integer(-1), "-1")
.addExample("0", new Integer(0), "0")
.addExample("1", new Integer(1), "1")
.addExample("32767", new Integer(32767), "32767")
.build());
} }
} }