Repository: sqoop Updated Branches: refs/heads/sqoop2 7c7932df4 -> bec7bd046
http://git-wip-us.apache.org/repos/asf/sqoop/blob/bec7bd04/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestSubmissionHandling.java ---------------------------------------------------------------------- diff --git a/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestSubmissionHandling.java b/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestSubmissionHandling.java index 79aced7..621d4e1 100644 --- a/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestSubmissionHandling.java +++ b/repository/repository-derby/src/test/java/org/apache/sqoop/repository/derby/TestSubmissionHandling.java @@ -45,8 +45,6 @@ public class TestSubmissionHandling extends DerbyTestCase { super.setUp(); handler = new DerbyRepositoryHandler(); - // We always needs schema for this test case - super.createOrUpgradeSchemaForLatestVersion(); // We always needs connector and framework structures in place loadConnectorAndDriverConfig(); http://git-wip-us.apache.org/repos/asf/sqoop/blob/bec7bd04/repository/repository-mysql/src/test/java/org/apache/sqoop/integration/repository/mysql/TestJobHandling.java ---------------------------------------------------------------------- diff --git a/repository/repository-mysql/src/test/java/org/apache/sqoop/integration/repository/mysql/TestJobHandling.java b/repository/repository-mysql/src/test/java/org/apache/sqoop/integration/repository/mysql/TestJobHandling.java index ed6543d..4784f10 100644 --- a/repository/repository-mysql/src/test/java/org/apache/sqoop/integration/repository/mysql/TestJobHandling.java +++ b/repository/repository-mysql/src/test/java/org/apache/sqoop/integration/repository/mysql/TestJobHandling.java @@ -136,9 +136,9 @@ public class TestJobHandling extends MySqlTestCase { @Test public void testFindJobsByConnector() throws Exception { List<MJob> list = handler - .findJobsForConnector( - handler.findConnector("A", provider.getConnection()) - .getPersistenceId(), provider.getConnection()); + .findJobsForConnectorUpgrade( + handler.findConnector("A", provider.getConnection()) + .getPersistenceId(), provider.getConnection()); assertEquals(2, list.size()); assertEquals(JOB_A_NAME, list.get(0).getName()); assertEquals(JOB_B_NAME, list.get(1).getName()); @@ -147,7 +147,7 @@ public class TestJobHandling extends MySqlTestCase { @Test public void testFindJobsForNonExistingConnector() throws Exception { List<MJob> list = handler - .findJobsForConnector(11, provider.getConnection()); + .findJobsForConnectorUpgrade(11, provider.getConnection()); assertEquals(0, list.size()); } http://git-wip-us.apache.org/repos/asf/sqoop/blob/bec7bd04/repository/repository-mysql/src/test/java/org/apache/sqoop/integration/repository/mysql/TestLinkHandling.java ---------------------------------------------------------------------- diff --git a/repository/repository-mysql/src/test/java/org/apache/sqoop/integration/repository/mysql/TestLinkHandling.java b/repository/repository-mysql/src/test/java/org/apache/sqoop/integration/repository/mysql/TestLinkHandling.java index db17124..2e33cdb 100644 --- a/repository/repository-mysql/src/test/java/org/apache/sqoop/integration/repository/mysql/TestLinkHandling.java +++ b/repository/repository-mysql/src/test/java/org/apache/sqoop/integration/repository/mysql/TestLinkHandling.java @@ -133,7 +133,7 @@ public class TestLinkHandling extends MySqlTestCase { List<MLink> list; // Load all two links on loaded repository - list = handler.findLinksForConnector("A", provider.getConnection()); + list = handler.findLinksForConnectorUpgrade("A", provider.getConnection()); assertEquals(1, list.size()); assertEquals(LINK_A_NAME, list.get(0).getName()); @@ -143,14 +143,14 @@ public class TestLinkHandling extends MySqlTestCase { } // Load empty list on empty repository - list = handler.findLinksForConnector("A", provider.getConnection()); + list = handler.findLinksForConnectorUpgrade("A", provider.getConnection()); assertEquals(0, list.size()); } @Test public void testFindLinksByNonExistingConnector() throws Exception { - List<MLink> list = handler.findLinksForConnector("NONEXISTCONNECTOR", - provider.getConnection()); + List<MLink> list = handler.findLinksForConnectorUpgrade("NONEXISTCONNECTOR", + provider.getConnection()); assertEquals(0, list.size()); } http://git-wip-us.apache.org/repos/asf/sqoop/blob/bec7bd04/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestJobHandling.java ---------------------------------------------------------------------- diff --git a/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestJobHandling.java b/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestJobHandling.java index 3a08268..6636bd3 100644 --- a/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestJobHandling.java +++ b/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestJobHandling.java @@ -17,7 +17,6 @@ */ package org.apache.sqoop.integration.repository.postgresql; -import org.apache.sqoop.common.Direction; import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.common.test.db.TableName; import org.apache.sqoop.model.MConfig; @@ -138,9 +137,9 @@ public class TestJobHandling extends PostgresqlTestCase { @Test public void testFindJobsByConnector() throws Exception { - List<MJob> list = handler.findJobsForConnector( - handler.findConnector("A", provider.getConnection()).getPersistenceId(), - provider.getConnection()); + List<MJob> list = handler.findJobsForConnectorUpgrade( + handler.findConnector("A", provider.getConnection()).getPersistenceId(), + provider.getConnection()); assertEquals(2, list.size()); assertEquals(JOB_A_NAME, list.get(0).getName()); assertEquals(JOB_B_NAME, list.get(1).getName()); @@ -148,7 +147,8 @@ public class TestJobHandling extends PostgresqlTestCase { @Test public void testFindJobsForNonExistingConnector() throws Exception { - List<MJob> list = handler.findJobsForConnector(11, provider.getConnection()); + List<MJob> list = handler.findJobsForConnectorUpgrade(11, provider + .getConnection()); assertEquals(0, list.size()); } http://git-wip-us.apache.org/repos/asf/sqoop/blob/bec7bd04/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestLinkHandling.java ---------------------------------------------------------------------- diff --git a/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestLinkHandling.java b/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestLinkHandling.java index 24de195..4aa9d9d 100644 --- a/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestLinkHandling.java +++ b/repository/repository-postgresql/src/test/java/org/apache/sqoop/integration/repository/postgresql/TestLinkHandling.java @@ -137,7 +137,7 @@ public class TestLinkHandling extends PostgresqlTestCase { List<MLink> list; // Load all two links on loaded repository - list = handler.findLinksForConnector("A", provider.getConnection()); + list = handler.findLinksForConnectorUpgrade("A", provider.getConnection()); assertEquals(1, list.size()); assertEquals(LINK_A_NAME, list.get(0).getName()); @@ -147,13 +147,13 @@ public class TestLinkHandling extends PostgresqlTestCase { } // Load empty list on empty repository - list = handler.findLinksForConnector("A", provider.getConnection()); + list = handler.findLinksForConnectorUpgrade("A", provider.getConnection()); assertEquals(0, list.size()); } @Test public void testFindLinksByNonExistingConnector() throws Exception { - List<MLink> list = handler.findLinksForConnector("NONEXISTCONNECTOR", provider.getConnection()); + List<MLink> list = handler.findLinksForConnectorUpgrade("NONEXISTCONNECTOR", provider.getConnection()); assertEquals(0, list.size()); }
