You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sqoop.apache.org by ja...@apache.org on 2016/02/11 21:11:37 UTC

sqoop git commit: SQOOP-2829: Sqoop2: LinkRestTest should pass when run against a real cluster

Repository: sqoop
Updated Branches:
  refs/heads/sqoop2 edb42dbdc -> 813319201


SQOOP-2829: Sqoop2: LinkRestTest should pass when run against a real cluster

(Abraham Fine via Jarek Jarcec Cecho)


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

Branch: refs/heads/sqoop2
Commit: 81331920157dd3c10376018314a8af120da40090
Parents: edb42db
Author: Jarek Jarcec Cecho <ja...@apache.org>
Authored: Thu Feb 11 12:11:13 2016 -0800
Committer: Jarek Jarcec Cecho <ja...@apache.org>
Committed: Thu Feb 11 12:11:13 2016 -0800

----------------------------------------------------------------------
 .../sqoop/integration/server/rest/LinkRestTest.java    |  2 +-
 .../apache/sqoop/integration/server/rest/RestTest.java | 13 ++++---------
 2 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/sqoop/blob/81331920/test/src/test/java/org/apache/sqoop/integration/server/rest/LinkRestTest.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/sqoop/integration/server/rest/LinkRestTest.java b/test/src/test/java/org/apache/sqoop/integration/server/rest/LinkRestTest.java
index c6f4eed..f9b0cbf 100644
--- a/test/src/test/java/org/apache/sqoop/integration/server/rest/LinkRestTest.java
+++ b/test/src/test/java/org/apache/sqoop/integration/server/rest/LinkRestTest.java
@@ -45,7 +45,7 @@ public class LinkRestTest extends RestTest {
         assertResponseCode(200);
         assertContains("first-link");
       }}),
-    new TestDescription("Get all links for connector", "v1/link/all?cname=generic-jdbc-connector", "GET", null, new Validator() {
+    new TestDescription("Get all links for connector", "v1/link/all?cname=hdfs-connector", "GET", null, new Validator() {
       @Override
       void validate() throws Exception {
         assertResponseCode(200);

http://git-wip-us.apache.org/repos/asf/sqoop/blob/81331920/test/src/test/java/org/apache/sqoop/integration/server/rest/RestTest.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/sqoop/integration/server/rest/RestTest.java b/test/src/test/java/org/apache/sqoop/integration/server/rest/RestTest.java
index 71384fb..5b3a7bf 100644
--- a/test/src/test/java/org/apache/sqoop/integration/server/rest/RestTest.java
+++ b/test/src/test/java/org/apache/sqoop/integration/server/rest/RestTest.java
@@ -118,15 +118,10 @@ public abstract class RestTest extends SqoopTestCase {
    * Various objects that can be pre-created by child test cases
    */
   public void createFirstLink() {
-    // Link: first-link
-    MLink genericJDBCLink = getClient().createLink("generic-jdbc-connector");
-    genericJDBCLink.setName("first-link");
-    MConfigList configs = genericJDBCLink.getConnectorLinkConfig();
-    configs.getStringInput("linkConfig.jdbcDriver").setValue("org.apache.derby.jdbc.ClientDriver");
-    configs.getStringInput("linkConfig.connectionString").setValue("jdbc:derby:memory:invalid-rest-calls-test;create=true");
-    configs.getStringInput("linkConfig.username").setValue("sqoop");
-    configs.getStringInput("linkConfig.password").setValue("is-awesome");
-    getClient().saveLink(genericJDBCLink);
+    MLink hdfsLinkFrom = getClient().createLink("hdfs-connector");
+    fillHdfsLink(hdfsLinkFrom);
+    hdfsLinkFrom.setName("first-link");
+    saveLink(hdfsLinkFrom);
   }
 
   @AfterMethod