SQOOP-2747: Allow customizing test username and password for Oracle t…

…ests (Jarek Jarcec Cecho via Venkat Ranganathan)
apache · Dec 17, 2015 · f19e2a5 · f19e2a5
1 parent e4f12a9
commit f19e2a5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/build.xml b/build.xml
@@ -350,8 +350,9 @@
       value="${name}/[conf]/[artifact]-[revision](-[classifier]).[ext]"/>
 
   <!--test related properties -->
-  <property name="sqoop.test.oracle.connectstring"
-            value="jdbc:oracle:thin:@//localhost/xe"/>
+  <property name="sqoop.test.oracle.connectstring" value="jdbc:oracle:thin:@//localhost/xe"/>
+  <property name="sqoop.test.oracle.username" value="SQOOPTEST"/>
+  <property name="sqoop.test.oracle.password" value="12345"/>
 
   <property name="sqoop.test.mysql.connectstring.host_url"
             value="jdbc:mysql://localhost/"/>
@@ -954,6 +955,12 @@
       <sysproperty key="sqoop.test.oracle.connectstring"
                    value="${sqoop.test.oracle.connectstring}"/>
 
+      <sysproperty key="sqoop.test.oracle.username"
+                   value="${sqoop.test.oracle.username}"/>
+
+      <sysproperty key="sqoop.test.oracle.password"
+                   value="${sqoop.test.oracle.password}"/>
+
       <sysproperty key="sqoop.test.mysql.connectstring.host_url"
                    value="${sqoop.test.mysql.connectstring.host_url}"/>
 

diff --git a/src/test/com/cloudera/sqoop/manager/OracleUtils.java b/src/test/com/cloudera/sqoop/manager/OracleUtils.java
@@ -37,11 +37,9 @@ public final class OracleUtils {
   // Express edition hardcoded name.
   public static final String ORACLE_DATABASE_NAME = "xe";
 
-  public static final String CONNECT_STRING =
-      System.getProperty("sqoop.test.oracle.connectstring",
-      "jdbc:oracle:thin:@//localhost/" + ORACLE_DATABASE_NAME);
-  public static final String ORACLE_USER_NAME = "SQOOPTEST";
-  public static final String ORACLE_USER_PASS = "12345";
+  public static final String CONNECT_STRING = System.getProperty("sqoop.test.oracle.connectstring", "jdbc:oracle:thin:@//localhost/" + ORACLE_DATABASE_NAME);
+  public static final String ORACLE_USER_NAME = System.getProperty("sqoop.test.oracle.username", "SQOOPTEST");
+  public static final String ORACLE_USER_PASS = System.getProperty("sqoop.test.oracle.password", "12345");
 
   public static final String ORACLE_SECONDARY_USER_NAME = "SQOOPTEST2";
   public static final String ORACLE_SECONDARY_USER_PASS = "ABCDEF";