sqoop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From f...@apache.org
Subject [1/4] sqoop git commit: Revert "SQOOP-3289: Add .travis.yml"
Date Fri, 23 Nov 2018 14:09:57 GMT
Repository: sqoop
Updated Branches:
  refs/heads/trunk 83a18e195 -> 2bf6f3ccd


http://git-wip-us.apache.org/repos/asf/sqoop/blob/cbc39c3b/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 648333a..afc6bd2 100644
--- a/src/test/org/apache/sqoop/metastore/postgres/PostgresMetaConnectIncrementalImportTest.java
+++ b/src/test/org/apache/sqoop/metastore/postgres/PostgresMetaConnectIncrementalImportTest.java
@@ -18,10 +18,6 @@
 
 package org.apache.sqoop.metastore.postgres;
 
-import static org.apache.sqoop.manager.postgresql.PostgresqlTestUtil.CONNECT_STRING;
-import static org.apache.sqoop.manager.postgresql.PostgresqlTestUtil.DATABASE_USER;
-import static org.apache.sqoop.manager.postgresql.PostgresqlTestUtil.PASSWORD;
-
 import org.apache.sqoop.metastore.MetaConnectIncrementalImportTestBase;
 import org.apache.sqoop.testcategories.thirdpartytest.PostgresqlTest;
 import org.junit.experimental.categories.Category;
@@ -44,6 +40,15 @@ import org.junit.experimental.categories.Category;
 @Category(PostgresqlTest.class)
 public class PostgresMetaConnectIncrementalImportTest extends MetaConnectIncrementalImportTestBase
{
 
+    private static final String HOST_URL = System.getProperty("sqoop.test.postgresql.connectstring.host_url",
+        "jdbc:postgresql://localhost/");
+    private static final String DATABASE_USER = System.getProperty(
+        "sqoop.test.postgresql.username", "sqooptest");
+    private static final String DATABASE_NAME = System.getProperty(
+        "sqoop.test.postgresql.database", "sqooptest");
+    private static final String PASSWORD = System.getProperty("sqoop.test.postgresql.password");
+    private static final String CONNECT_STRING = HOST_URL + DATABASE_NAME;
+
     public PostgresMetaConnectIncrementalImportTest() {
         super(CONNECT_STRING, DATABASE_USER, PASSWORD);
     }

http://git-wip-us.apache.org/repos/asf/sqoop/blob/cbc39c3b/src/test/org/apache/sqoop/metastore/postgres/PostgresSavedJobsTest.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/sqoop/metastore/postgres/PostgresSavedJobsTest.java b/src/test/org/apache/sqoop/metastore/postgres/PostgresSavedJobsTest.java
index 7b1559d..9f9e865 100644
--- a/src/test/org/apache/sqoop/metastore/postgres/PostgresSavedJobsTest.java
+++ b/src/test/org/apache/sqoop/metastore/postgres/PostgresSavedJobsTest.java
@@ -18,10 +18,6 @@
 
 package org.apache.sqoop.metastore.postgres;
 
-import static org.apache.sqoop.manager.postgresql.PostgresqlTestUtil.CONNECT_STRING;
-import static org.apache.sqoop.manager.postgresql.PostgresqlTestUtil.DATABASE_USER;
-import static org.apache.sqoop.manager.postgresql.PostgresqlTestUtil.PASSWORD;
-
 import org.apache.sqoop.metastore.SavedJobsTestBase;
 import org.apache.sqoop.manager.JdbcDrivers;
 import org.apache.sqoop.testcategories.thirdpartytest.PostgresqlTest;
@@ -45,6 +41,15 @@ import org.junit.experimental.categories.Category;
 @Category(PostgresqlTest.class)
 public class PostgresSavedJobsTest extends SavedJobsTestBase {
 
+    private static final String HOST_URL = System.getProperty("sqoop.test.postgresql.connectstring.host_url",
+        "jdbc:postgresql://localhost/");
+    private static final String DATABASE_USER = System.getProperty(
+        "sqoop.test.postgresql.username", "sqooptest");
+    private static final String DATABASE_NAME = System.getProperty(
+        "sqoop.test.postgresql.database", "sqooptest");
+    private static final String PASSWORD = System.getProperty("sqoop.test.postgresql.password");
+    private static final String CONNECT_STRING = HOST_URL + DATABASE_NAME;
+
     public PostgresSavedJobsTest() {
         super(CONNECT_STRING, DATABASE_USER, PASSWORD, JdbcDrivers.POSTGRES.getDriverClass());
     }

http://git-wip-us.apache.org/repos/asf/sqoop/blob/cbc39c3b/src/test/org/apache/sqoop/testcategories/thirdpartytest/OracleEeTest.java
----------------------------------------------------------------------
diff --git a/src/test/org/apache/sqoop/testcategories/thirdpartytest/OracleEeTest.java b/src/test/org/apache/sqoop/testcategories/thirdpartytest/OracleEeTest.java
deleted file mode 100644
index c2063f8..0000000
--- a/src/test/org/apache/sqoop/testcategories/thirdpartytest/OracleEeTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.sqoop.testcategories.thirdpartytest;
-
-/**
- * An Oracle EE test shall test scenarios where a Oracle Enterprise Edition database is needed,
- * for example because of partitioning.
- */
-public interface OracleEeTest extends OracleTest {
-}


Mime
View raw message