From 1b228f308c92ee99fb6077b55351d29b90609ef4 Mon Sep 17 00:00:00 2001 From: Jarek Jarcec Cecho Date: Sat, 5 Dec 2015 13:02:24 +0100 Subject: [PATCH] SQOOP-2715: Sqoop2: The test case ShowJobInOrderTest always failed (Colin Ma via Jarek Jarcec Cecho) --- .../test/infrastructure/SqoopTestCase.java | 18 +++++++++++++++ .../server/InformalObjectNameTest.java | 10 ++++++++ .../server/ShowJobInOrderTest.java | 23 +++++++++++++------ ...ubmissionWithDisabledModelObjectsTest.java | 2 ++ .../integration/server/rest/RestTest.java | 11 ++------- 5 files changed, 48 insertions(+), 16 deletions(-) diff --git a/test/src/main/java/org/apache/sqoop/test/infrastructure/SqoopTestCase.java b/test/src/main/java/org/apache/sqoop/test/infrastructure/SqoopTestCase.java index 4c5d3a8c..c1f355f6 100644 --- a/test/src/main/java/org/apache/sqoop/test/infrastructure/SqoopTestCase.java +++ b/test/src/main/java/org/apache/sqoop/test/infrastructure/SqoopTestCase.java @@ -459,4 +459,22 @@ public void createTableShortStories() { public void createAndLoadTableShortStories() { new ShortStories(getInfrastructureProvider(DatabaseInfrastructureProvider.class).getInstance(), getTableName()).createTables().loadBasicData(); } + + /** + * Clear the test data for Job. + */ + public void clearJob() { + for(MJob job : getClient().getJobs()) { + getClient().deleteJob(job.getName()); + } + } + + /** + * Clear the test data for Link. + */ + public void clearLink() { + for(MLink link : getClient().getLinks()) { + getClient().deleteLink(link.getName()); + } + } } diff --git a/test/src/test/java/org/apache/sqoop/integration/server/InformalObjectNameTest.java b/test/src/test/java/org/apache/sqoop/integration/server/InformalObjectNameTest.java index 920679fc..fe04df79 100644 --- a/test/src/test/java/org/apache/sqoop/integration/server/InformalObjectNameTest.java +++ b/test/src/test/java/org/apache/sqoop/integration/server/InformalObjectNameTest.java @@ -30,6 +30,7 @@ import org.apache.sqoop.test.infrastructure.providers.HadoopInfrastructureProvider; import org.apache.sqoop.test.infrastructure.providers.SqoopInfrastructureProvider; import org.apache.sqoop.test.utils.ParametrizedUtils; +import org.testng.annotations.AfterMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Factory; import org.testng.annotations.Test; @@ -146,4 +147,13 @@ private void verifyActionsForJob(String jobName) throws Exception { // ignore the exception } } + + @AfterMethod + public void dropTestData() { + if (TARGET_LINK.equals(target)) { + clearLink(); + } else if (TARGET_JOB.equals(target)) { + clearJob(); + } + } } diff --git a/test/src/test/java/org/apache/sqoop/integration/server/ShowJobInOrderTest.java b/test/src/test/java/org/apache/sqoop/integration/server/ShowJobInOrderTest.java index cbf1e90f..298ec096 100644 --- a/test/src/test/java/org/apache/sqoop/integration/server/ShowJobInOrderTest.java +++ b/test/src/test/java/org/apache/sqoop/integration/server/ShowJobInOrderTest.java @@ -22,9 +22,10 @@ import org.apache.sqoop.model.MLink; import org.apache.sqoop.test.infrastructure.Infrastructure; import org.apache.sqoop.test.infrastructure.SqoopTestCase; +import org.apache.sqoop.test.infrastructure.providers.DatabaseInfrastructureProvider; import org.apache.sqoop.test.infrastructure.providers.HadoopInfrastructureProvider; import org.apache.sqoop.test.infrastructure.providers.SqoopInfrastructureProvider; -import org.apache.sqoop.test.testcases.ConnectorTestCase; +import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; import java.util.List; @@ -34,7 +35,7 @@ /** * Ensure that jobs will be shown in order */ -@Infrastructure(dependencies = {HadoopInfrastructureProvider.class, SqoopInfrastructureProvider.class}) +@Infrastructure(dependencies = {HadoopInfrastructureProvider.class, SqoopInfrastructureProvider.class, DatabaseInfrastructureProvider.class}) public class ShowJobInOrderTest extends SqoopTestCase { public ShowJobInOrderTest() { @@ -56,6 +57,7 @@ public void testShowJobInOrder() throws Exception { // Job creation MJob job = getClient().createJob(rdbmsLink.getName(), hdfsLink.getName()); + job.setName("testJobName1"); // rdms "FROM" config fillRdbmsFromConfig(job, "id"); @@ -67,6 +69,7 @@ public void testShowJobInOrder() throws Exception { // Job creation job = getClient().createJob(hdfsLink.getName(), rdbmsLink.getName()); + job.setName("testJobName2"); // rdms "To" config fillRdbmsToConfig(job); @@ -78,6 +81,7 @@ public void testShowJobInOrder() throws Exception { // Job creation job = getClient().createJob(rdbmsLink.getName(), hdfsLink.getName()); + job.setName("testJobName3"); // rdms "FROM" config fillRdbmsFromConfig(job, "id"); @@ -89,7 +93,7 @@ public void testShowJobInOrder() throws Exception { // Job creation job = getClient().createJob(hdfsLink.getName(), rdbmsLink.getName()); - + job.setName("testJobName4"); // hdfs "From" config fillHdfsFromConfig(job); @@ -101,9 +105,14 @@ public void testShowJobInOrder() throws Exception { List jobs = getClient().getJobs(); - assertEquals(1, jobs.get(0).getPersistenceId()); - assertEquals(2, jobs.get(1).getPersistenceId()); - assertEquals(3, jobs.get(2).getPersistenceId()); - assertEquals(4, jobs.get(3).getPersistenceId()); + assertEquals(jobs.get(0).getName(), "testJobName1"); + assertEquals(jobs.get(1).getName(), "testJobName2"); + assertEquals(jobs.get(2).getName(), "testJobName3"); + assertEquals(jobs.get(3).getName(), "testJobName4"); + } + + @AfterMethod + public void dropTestData() { + clearJob(); } } diff --git a/test/src/test/java/org/apache/sqoop/integration/server/SubmissionWithDisabledModelObjectsTest.java b/test/src/test/java/org/apache/sqoop/integration/server/SubmissionWithDisabledModelObjectsTest.java index 9e682bc9..c2709a7b 100644 --- a/test/src/test/java/org/apache/sqoop/integration/server/SubmissionWithDisabledModelObjectsTest.java +++ b/test/src/test/java/org/apache/sqoop/integration/server/SubmissionWithDisabledModelObjectsTest.java @@ -72,6 +72,8 @@ public void setupRdbmsTable() { @AfterMethod public void tearDownRdbmsTable() { dropTable(); + clearJob(); + clearLink(); } @Test 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 4ac564c9..20f09e82 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 @@ -20,16 +20,13 @@ import org.apache.log4j.Logger; import org.apache.commons.io.IOUtils; import org.apache.hadoop.security.token.delegation.web.DelegationTokenAuthenticatedURL; -import org.apache.sqoop.common.SqoopException; import org.apache.sqoop.model.MConfigList; -import org.apache.sqoop.model.MJob; import org.apache.sqoop.model.MLink; import org.apache.sqoop.test.infrastructure.Infrastructure; import org.apache.sqoop.test.infrastructure.SqoopTestCase; import org.apache.sqoop.test.infrastructure.providers.HadoopInfrastructureProvider; import org.apache.sqoop.test.infrastructure.providers.SqoopInfrastructureProvider; import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.io.DataOutputStream; @@ -133,12 +130,8 @@ public void createFirstLink() { @AfterMethod public void dropTestData() { - for(MJob job : getClient().getJobs()) { - getClient().deleteJob(job.getName()); - } - for(MLink link : getClient().getLinks()) { - getClient().deleteLink(link.getName()); - } + clearJob(); + clearLink(); } private TestDescription desc;