Repository: sqoop Updated Branches: refs/heads/trunk 264cddbec -> 83a18e195
http://git-wip-us.apache.org/repos/asf/sqoop/blob/83a18e19/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 afc6bd2..648333a 100644 --- a/src/test/org/apache/sqoop/metastore/postgres/PostgresMetaConnectIncrementalImportTest.java +++ b/src/test/org/apache/sqoop/metastore/postgres/PostgresMetaConnectIncrementalImportTest.java @@ -18,6 +18,10 @@ 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; @@ -40,15 +44,6 @@ 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/83a18e19/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 9f9e865..7b1559d 100644 --- a/src/test/org/apache/sqoop/metastore/postgres/PostgresSavedJobsTest.java +++ b/src/test/org/apache/sqoop/metastore/postgres/PostgresSavedJobsTest.java @@ -18,6 +18,10 @@ 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; @@ -41,15 +45,6 @@ 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/83a18e19/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 new file mode 100644 index 0000000..c2063f8 --- /dev/null +++ b/src/test/org/apache/sqoop/testcategories/thirdpartytest/OracleEeTest.java @@ -0,0 +1,26 @@ +/** + * 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 { +}
