You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ra...@apache.org on 2014/09/12 00:19:40 UTC
[35/41] FALCON-675 Request URLS moved from parameters into methods in
falcon-regression
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSnSTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSnSTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSnSTest.java
index 304549d..4768e68 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSnSTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSnSTest.java
@@ -27,7 +27,6 @@ import org.apache.falcon.regression.core.util.BundleUtil;
import org.apache.falcon.regression.core.util.OSUtil;
import org.apache.falcon.regression.core.util.OozieUtil;
import org.apache.falcon.regression.core.util.Util;
-import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.log4j.Logger;
import org.apache.oozie.client.Job;
@@ -91,7 +90,7 @@ public class PrismProcessSnSTest extends BaseTestClass {
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
//check if there is no criss cross
- ServiceResponse response = prism.getProcessHelper().getStatus(URLS.STATUS_URL, process2);
+ ServiceResponse response = prism.getProcessHelper().getStatus(process2);
logger.info(response.getMessage());
AssertUtil.checkNotStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
}
@@ -105,15 +104,13 @@ public class PrismProcessSnSTest extends BaseTestClass {
public void testProcessSnSForSubmittedProcessOnBothColos() throws Exception {
//schedule both bundles
bundles[0].submitProcess(true);
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, process1));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(process1));
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
AssertUtil.checkNotStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
bundles[1].submitProcess(true);
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, process1));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(process1));
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
//check if there is no criss cross
AssertUtil.checkNotStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
@@ -129,8 +126,7 @@ public class PrismProcessSnSTest extends BaseTestClass {
public void testProcessSnSForSubmittedProcessOnBothColosUsingColoHelper()
throws Exception {
bundles[0].submitProcess(true);
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, process1));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(process1));
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
AssertUtil.checkNotStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
bundles[1].submitProcess(true);
@@ -138,8 +134,7 @@ public class PrismProcessSnSTest extends BaseTestClass {
AssertUtil.checkNotStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
bundles[1].submitProcess(true);
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, process1));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(process1));
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
//check if there is no criss cross
AssertUtil.checkNotStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
@@ -162,8 +157,7 @@ public class PrismProcessSnSTest extends BaseTestClass {
AssertUtil.checkNotStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
//reschedule trial
- AssertUtil.assertSucceeded(cluster2.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, process1));
+ AssertUtil.assertSucceeded(cluster2.getProcessHelper().schedule(process1));
Assert.assertEquals(OozieUtil.getBundles(cluster2.getFeedHelper().getOozieClient(),
Util.readEntityName(process1), EntityType.PROCESS).size(), 1);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
@@ -179,19 +173,17 @@ public class PrismProcessSnSTest extends BaseTestClass {
//schedule both bundles
bundles[0].submitAndScheduleProcess();
bundles[1].submitAndScheduleProcess();
- AssertUtil.assertSucceeded(cluster2.getProcessHelper().suspend(URLS.SUSPEND_URL, process1));
+ AssertUtil.assertSucceeded(cluster2.getProcessHelper().suspend(process1));
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.SUSPENDED);
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, process1));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(process1));
Assert.assertEquals(OozieUtil.getBundles(cluster2OC, Util.readEntityName(process1),
EntityType.PROCESS).size(), 1);
- AssertUtil.assertSucceeded(cluster2.getProcessHelper().resume(URLS.SUSPEND_URL, process1));
+ AssertUtil.assertSucceeded(cluster2.getProcessHelper().resume(process1));
- AssertUtil.assertSucceeded(cluster1.getProcessHelper().suspend(URLS.SUSPEND_URL, process2));
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, process2));
+ AssertUtil.assertSucceeded(cluster1.getProcessHelper().suspend(process2));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(process2));
Assert.assertEquals(OozieUtil.getBundles(cluster1OC, Util.readEntityName(process2),
EntityType.PROCESS).size(), 1);
@@ -212,26 +204,24 @@ public class PrismProcessSnSTest extends BaseTestClass {
bundles[0].submitAndScheduleProcess();
Assert.assertEquals(Util.parseResponse(prism.getProcessHelper()
- .getStatus(URLS.STATUS_URL, process1)).getMessage(), cluster1Running);
+ .getStatus(process1)).getMessage(), cluster1Running);
bundles[1].submitAndScheduleProcess();
Assert.assertEquals(Util.parseResponse(prism.getProcessHelper()
- .getStatus(URLS.STATUS_URL, process2)).getMessage(), cluster2Running);
+ .getStatus(process2)).getMessage(), cluster2Running);
- AssertUtil.assertSucceeded(prism.getProcessHelper().delete(URLS.DELETE_URL, process1));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().delete(process1));
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
- AssertUtil.assertSucceeded(prism.getProcessHelper().delete(URLS.DELETE_URL, process2));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().delete(process2));
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.KILLED);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.KILLED);
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, process1));
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, process2));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(process1));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(process2));
Assert.assertEquals(Util.parseResponse(prism.getProcessHelper()
- .getStatus(URLS.STATUS_URL, process1)).getMessage(),cluster1Running);
+ .getStatus(process1)).getMessage(),cluster1Running);
Assert.assertEquals(Util.parseResponse(prism.getProcessHelper()
- .getStatus(URLS.STATUS_URL, process2)).getMessage(), cluster2Running);
+ .getStatus(process2)).getMessage(), cluster2Running);
}
/**
@@ -240,8 +230,13 @@ public class PrismProcessSnSTest extends BaseTestClass {
@Test(groups = {"prism", "0.2", "distributed"})
public void testScheduleNonExistentProcessOnBothColos() throws Exception {
Assert.assertEquals(Util.parseResponse(cluster2.getProcessHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, process1)).getStatusCode(), 404);
+ .submitAndSchedule(process1)).getStatusCode(), 404);
Assert.assertEquals(Util.parseResponse(cluster1.getProcessHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, process2)).getStatusCode(), 404);
+ .submitAndSchedule(process2)).getStatusCode(), 404);
+ }
+
+ @AfterClass(alwaysRun = true)
+ public void tearDownClass() throws IOException {
+ cleanTestDirs();
}
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSuspendTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSuspendTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSuspendTest.java
index a14cd35..23e0bd3 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSuspendTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSuspendTest.java
@@ -25,7 +25,6 @@ import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
import org.apache.falcon.regression.core.util.OSUtil;
import org.apache.falcon.regression.core.util.Util;
-import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.log4j.Logger;
import org.apache.oozie.client.Job;
@@ -87,21 +86,19 @@ public class PrismProcessSuspendTest extends BaseTestClass {
//suspend using prismHelper
- AssertUtil.assertSucceeded(
- prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
//verify
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.SUSPENDED);
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
Util.shutDownService(cluster1.getProcessHelper());
- AssertUtil.assertFailed(
- prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
for (int i = 0; i < 2; i++) {
//suspend on the other one
AssertUtil.assertSucceeded(prism.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ .suspend(bundles[1].getProcessData()));
AssertUtil
.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.SUSPENDED);
AssertUtil
@@ -117,23 +114,21 @@ public class PrismProcessSuspendTest extends BaseTestClass {
bundles[1].submitAndScheduleProcessUsingColoHelper(cluster2);
//suspend using prismHelper
- AssertUtil.assertSucceeded(
- prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
//verify
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.SUSPENDED);
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
//suspend on the other one
- AssertUtil.assertSucceeded(
- prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.SUSPENDED);
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
Assert.assertTrue(Util.parseResponse(prism.getProcessHelper()
- .getStatus(URLS.STATUS_URL, bundles[0].getProcessData())).getMessage()
+ .getStatus(bundles[0].getProcessData())).getMessage()
.contains("SUSPENDED"));
Assert.assertTrue(Util.parseResponse(prism.getProcessHelper()
- .getStatus(URLS.STATUS_URL, bundles[1].getProcessData())).getMessage()
+ .getStatus(bundles[1].getProcessData())).getMessage()
.contains("RUNNING"));
}
@@ -144,22 +139,18 @@ public class PrismProcessSuspendTest extends BaseTestClass {
bundles[1].submitAndScheduleProcessUsingColoHelper(cluster2);
//delete using coloHelpers
- AssertUtil.assertSucceeded(
- prism.getProcessHelper().delete(Util.URLS.DELETE_URL, bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().delete(bundles[0].getProcessData()));
//suspend using prismHelper
- AssertUtil.assertFailed(
- prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
//verify
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
- AssertUtil.assertSucceeded(
- prism.getProcessHelper().delete(Util.URLS.DELETE_URL, bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().delete(bundles[1].getProcessData()));
//suspend on the other one
- AssertUtil.assertFailed(
- prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().suspend(bundles[1].getProcessData()));
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.KILLED);
}
@@ -174,7 +165,7 @@ public class PrismProcessSuspendTest extends BaseTestClass {
for (int i = 0; i < 2; i++) {
//suspend using prismHelper
AssertUtil.assertSucceeded(prism.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
+ .suspend(bundles[0].getProcessData()));
//verify
AssertUtil
.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.SUSPENDED);
@@ -185,7 +176,7 @@ public class PrismProcessSuspendTest extends BaseTestClass {
for (int i = 0; i < 2; i++) {
//suspend on the other one
AssertUtil.assertSucceeded(prism.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ .suspend(bundles[1].getProcessData()));
AssertUtil
.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.SUSPENDED);
AssertUtil
@@ -195,15 +186,11 @@ public class PrismProcessSuspendTest extends BaseTestClass {
@Test(groups = "embedded")
public void testSuspendNonExistentProcessOnBothColos() throws Exception {
- AssertUtil.assertFailed(
- prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
- AssertUtil.assertFailed(
- prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL, bundles[1].getProcessData()));
-
- AssertUtil.assertFailed(cluster1.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
- AssertUtil.assertFailed(cluster2.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().suspend(bundles[1].getProcessData()));
+
+ AssertUtil.assertFailed(cluster1.getProcessHelper().suspend(bundles[0].getProcessData()));
+ AssertUtil.assertFailed(cluster2.getProcessHelper().suspend(bundles[0].getProcessData()));
}
@Test(groups = "embedded")
@@ -211,15 +198,11 @@ public class PrismProcessSuspendTest extends BaseTestClass {
bundles[0].submitProcess(true);
bundles[1].submitProcess(true);
- AssertUtil.assertFailed(
- prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
- AssertUtil.assertFailed(
- prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().suspend(bundles[1].getProcessData()));
- AssertUtil.assertFailed(cluster1.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
- AssertUtil.assertFailed(cluster2.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ AssertUtil.assertFailed(cluster1.getProcessHelper().suspend(bundles[0].getProcessData()));
+ AssertUtil.assertFailed(cluster2.getProcessHelper().suspend(bundles[1].getProcessData()));
}
@Test(groups = {"prism", "0.2", "distributed"})
@@ -232,14 +215,12 @@ public class PrismProcessSuspendTest extends BaseTestClass {
Util.shutDownService(cluster1.getProcessHelper());
//suspend using prismHelper
- AssertUtil.assertFailed(
- prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
//verify
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
//suspend on the other one
- AssertUtil.assertSucceeded(
- prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(bundles[1].getProcessData()));
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.SUSPENDED);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
}
@@ -251,23 +232,19 @@ public class PrismProcessSuspendTest extends BaseTestClass {
bundles[1].submitAndScheduleProcessUsingColoHelper(cluster2);
//delete using coloHelpers
- AssertUtil.assertSucceeded(
- prism.getProcessHelper().delete(Util.URLS.DELETE_URL, bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().delete(bundles[0].getProcessData()));
Util.shutDownService(cluster1.getProcessHelper());
//suspend using prismHelper
- AssertUtil.assertFailed(
- prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
//verify
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
- AssertUtil.assertSucceeded(
- prism.getProcessHelper().delete(Util.URLS.DELETE_URL, bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().delete(bundles[1].getProcessData()));
//suspend on the other one
- AssertUtil.assertFailed(
- prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().suspend(bundles[1].getProcessData()));
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.KILLED);
}
@@ -278,13 +255,10 @@ public class PrismProcessSuspendTest extends BaseTestClass {
restartRequired = true;
Util.shutDownService(cluster1.getProcessHelper());
- AssertUtil.assertFailed(
- prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL, bundles[1].getProcessData()));
- AssertUtil.assertFailed(
- prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().suspend(bundles[1].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
- AssertUtil.assertFailed(cluster2.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
+ AssertUtil.assertFailed(cluster2.getProcessHelper().suspend(bundles[0].getProcessData()));
}
@Test(groups = "distributed")
@@ -295,12 +269,9 @@ public class PrismProcessSuspendTest extends BaseTestClass {
Util.shutDownService(cluster1.getProcessHelper());
- AssertUtil.assertFailed(
- prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
- AssertUtil.assertFailed(
- prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL, bundles[1].getProcessData()));
- AssertUtil.assertFailed(cluster2.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().suspend(bundles[1].getProcessData()));
+ AssertUtil.assertFailed(cluster2.getProcessHelper().suspend(bundles[1].getProcessData()));
}
@AfterClass(alwaysRun = true)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismSubmitTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismSubmitTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismSubmitTest.java
index cdd02da..b11d586 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismSubmitTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismSubmitTest.java
@@ -26,7 +26,6 @@ import org.apache.falcon.regression.core.util.BundleUtil;
import org.apache.falcon.regression.core.util.OSUtil;
import org.apache.falcon.regression.core.util.TimeUtil;
import org.apache.falcon.regression.core.util.Util;
-import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.log4j.Logger;
import org.testng.Assert;
@@ -84,7 +83,7 @@ public class PrismSubmitTest extends BaseTestClass {
List<String> beforeSubmit = cluster1.getClusterHelper().getStoreInfo();
try {
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
} catch (ConnectException e) {
Assert.assertTrue(e.getMessage().contains("Connection to "
+ prism.getClusterHelper().getHostname() + " refused"), e.getMessage());
@@ -97,8 +96,7 @@ public class PrismSubmitTest extends BaseTestClass {
@Test(groups = "distributed")
public void submitCluster_resubmitDiffContent() throws Exception {
- ServiceResponse r =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
List<String> beforeSubmitCluster = cluster1.getClusterHelper().getStoreInfo();
List<String> beforeSubmitPrism = cluster2.getClusterHelper().getStoreInfo();
@@ -106,7 +104,7 @@ public class PrismSubmitTest extends BaseTestClass {
bundles[0].setCLusterWorkingPath(bundles[0].getClusters().get(0), randomHDFSPath);
logger.info("modified cluster Data: "
+ Util.prettyPrintXml(bundles[0].getClusters().get(0)));
- r = prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
List<String> afterSubmitCluster = cluster1.getClusterHelper().getStoreInfo();
@@ -121,15 +119,14 @@ public class PrismSubmitTest extends BaseTestClass {
Util.shutDownService(cluster1.getClusterHelper());
TimeUtil.sleepSeconds(30);
- ServiceResponse r =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("PARTIAL"));
Util.startService(cluster1.getClusterHelper());
TimeUtil.sleepSeconds(30);
- r = prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
}
@@ -137,14 +134,13 @@ public class PrismSubmitTest extends BaseTestClass {
public void submitProcess_1ColoDownAfter2FeedSubmitStartAfterProcessSubmitAnsDeleteProcess()
throws Exception {
restartRequired = true;
- ServiceResponse r =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
- r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getDataSets().get(0));
+ r = prism.getFeedHelper().submitEntity(bundles[0].getDataSets().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
- r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getDataSets().get(1));
+ r = prism.getFeedHelper().submitEntity(bundles[0].getDataSets().get(1));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
Util.shutDownService(cluster1.getClusterHelper());
@@ -155,11 +151,9 @@ public class PrismSubmitTest extends BaseTestClass {
List<String> beforeSubmitCluster2 = cluster2.getProcessHelper().getStoreInfo();
List<String> beforeSubmitPrism = prism.getProcessHelper().getStoreInfo();
- AssertUtil.assertSucceeded(
- prism.getProcessHelper().delete(URLS.DELETE_URL, bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().delete(bundles[0].getProcessData()));
- AssertUtil.assertSucceeded(
- prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitEntity(bundles[0].getProcessData()));
AssertUtil.assertFailed(r);
List<String> afterSubmitCluster1 = cluster1.getProcessHelper().getStoreInfo();
List<String> afterSubmitCluster2 = cluster2.getProcessHelper().getStoreInfo();
@@ -177,7 +171,7 @@ public class PrismSubmitTest extends BaseTestClass {
beforeSubmitCluster2 = cluster2.getProcessHelper().getStoreInfo();
beforeSubmitPrism = prism.getProcessHelper().getStoreInfo();
- r = prism.getProcessHelper().delete(URLS.DELETE_URL, bundles[0].getProcessData());
+ r = prism.getProcessHelper().delete(bundles[0].getProcessData());
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
afterSubmitCluster1 = cluster1.getProcessHelper().getStoreInfo();
@@ -193,18 +187,17 @@ public class PrismSubmitTest extends BaseTestClass {
@Test(groups = "distributed")
public void submitProcess_ideal() throws Exception {
- ServiceResponse r =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
List<String> beforeSubmitCluster1 = cluster1.getFeedHelper().getStoreInfo();
List<String> beforeSubmitCluster2 = cluster2.getFeedHelper().getStoreInfo();
List<String> beforeSubmitPrism = prism.getFeedHelper().getStoreInfo();
- r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getDataSets().get(0));
+ r = prism.getFeedHelper().submitEntity(bundles[0].getDataSets().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
- r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getDataSets().get(1));
+ r = prism.getFeedHelper().submitEntity(bundles[0].getDataSets().get(1));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
List<String> afterSubmitCluster1 = cluster1.getFeedHelper().getStoreInfo();
@@ -219,7 +212,7 @@ public class PrismSubmitTest extends BaseTestClass {
beforeSubmitCluster2 = cluster2.getProcessHelper().getStoreInfo();
beforeSubmitPrism = prism.getProcessHelper().getStoreInfo();
- r = prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData());
+ r = prism.getProcessHelper().submitEntity(bundles[0].getProcessData());
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
afterSubmitCluster1 = cluster1.getProcessHelper().getStoreInfo();
@@ -242,8 +235,7 @@ public class PrismSubmitTest extends BaseTestClass {
List<String> beforeSubmitCluster2 = cluster2.getClusterHelper().getStoreInfo();
List<String> beforeSubmitPrism = prism.getClusterHelper().getStoreInfo();
- ServiceResponse r =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
List<String> afterSubmitCluster2 = cluster2.getClusterHelper().getStoreInfo();
@@ -264,7 +256,7 @@ public class PrismSubmitTest extends BaseTestClass {
beforeSubmitCluster2 = cluster2.getClusterHelper().getStoreInfo();
beforeSubmitPrism = prism.getClusterHelper().getStoreInfo();
- r = prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
afterSubmitCluster2 = cluster2.getClusterHelper().getStoreInfo();
afterSubmitPrism = prism.getClusterHelper().getStoreInfo();
@@ -277,15 +269,14 @@ public class PrismSubmitTest extends BaseTestClass {
@Test(groups = "distributed")
public void submitCluster_1prism1coloSubmitDeleted() throws Exception {
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
- prism.getClusterHelper().delete(URLS.DELETE_URL, bundles[0].getClusters().get(0));
+ prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0));
List<String> beforeSubmitCluster1 = cluster1.getClusterHelper().getStoreInfo();
List<String> beforeSubmitCluster2 = cluster2.getClusterHelper().getStoreInfo();
List<String> beforeSubmitPrism = prism.getClusterHelper().getStoreInfo();
- ServiceResponse r =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
List<String> afterSubmitCluster1 = cluster1.getClusterHelper().getStoreInfo();
List<String> afterSubmitCluster2 = cluster2.getClusterHelper().getStoreInfo();
@@ -303,8 +294,7 @@ public class PrismSubmitTest extends BaseTestClass {
@Test(groups = "embedded")
public void submitProcess_woClusterSubmit() throws Exception {
- ServiceResponse r =
- prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData());
+ ServiceResponse r = prism.getProcessHelper().submitEntity(bundles[0].getProcessData());
Assert.assertTrue(r.getMessage().contains("FAILED"));
Assert.assertTrue(r.getMessage().contains("is not registered"));
@@ -312,11 +302,10 @@ public class PrismSubmitTest extends BaseTestClass {
@Test(groups = "embedded")
public void submitProcess_woFeedSubmit() throws Exception {
- ServiceResponse r =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
- r = prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData());
+ r = prism.getProcessHelper().submitEntity(bundles[0].getProcessData());
Assert.assertTrue(r.getMessage().contains("FAILED"));
Assert.assertTrue(r.getMessage().contains("is not registered"));
}
@@ -336,8 +325,7 @@ public class PrismSubmitTest extends BaseTestClass {
bundles[1].setCLusterColo(cluster2.getClusterHelper().getColoName());
logger.info("cluster b2: " + Util.prettyPrintXml(bundles[1].getClusters().get(0)));
- ServiceResponse r =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[1].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[1].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("PARTIAL"));
List<String> parCluster1 = cluster1.getClusterHelper().getStoreInfo();
@@ -354,7 +342,7 @@ public class PrismSubmitTest extends BaseTestClass {
bundles[0].setCLusterColo(cluster1.getClusterHelper().getColoName());
logger.info("cluster b1: " + Util.prettyPrintXml(bundles[0].getClusters().get(0)));
- r = prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
List<String> afterCluster1 = cluster1.getClusterHelper().getStoreInfo();
@@ -374,8 +362,7 @@ public class PrismSubmitTest extends BaseTestClass {
Util.shutDownService(cluster1.getClusterHelper());
List<String> beforeSubmitCluster = cluster1.getClusterHelper().getStoreInfo();
List<String> beforeSubmitPrism = cluster2.getClusterHelper().getStoreInfo();
- ServiceResponse r =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
List<String> afterSubmitCluster = cluster1.getClusterHelper().getStoreInfo();
List<String> afterSubmitPrism = cluster2.getClusterHelper().getStoreInfo();
Assert.assertTrue(r.getMessage().contains("PARTIAL"));
@@ -388,7 +375,7 @@ public class PrismSubmitTest extends BaseTestClass {
TimeUtil.sleepSeconds(30);
beforeSubmitCluster = cluster1.getClusterHelper().getStoreInfo();
beforeSubmitPrism = cluster2.getClusterHelper().getStoreInfo();
- r = prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
afterSubmitCluster = cluster1.getClusterHelper().getStoreInfo();
afterSubmitPrism = cluster2.getClusterHelper().getStoreInfo();
@@ -402,8 +389,7 @@ public class PrismSubmitTest extends BaseTestClass {
restartRequired = true;
Util.shutDownService(cluster1.getClusterHelper());
TimeUtil.sleepSeconds(30);
- ServiceResponse r =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("PARTIAL"));
Util.startService(cluster1.getClusterHelper());
@@ -412,7 +398,7 @@ public class PrismSubmitTest extends BaseTestClass {
List<String> beforeSubmitCluster = cluster1.getClusterHelper().getStoreInfo();
List<String> beforeSubmitPrism = cluster2.getClusterHelper().getStoreInfo();
bundles[0].setCLusterWorkingPath(bundles[0].getClusters().get(0), randomHDFSPath);
- r = prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
List<String> afterSubmitCluster = cluster1.getClusterHelper().getStoreInfo();
@@ -427,13 +413,12 @@ public class PrismSubmitTest extends BaseTestClass {
restartRequired = true;
Util.shutDownService(cluster1.getClusterHelper());
TimeUtil.sleepSeconds(30);
- ServiceResponse r =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("PARTIAL"));
List<String> beforeSubmitCluster = cluster1.getClusterHelper().getStoreInfo();
List<String> beforeSubmitPrism = cluster2.getClusterHelper().getStoreInfo();
- r = prism.getClusterHelper().delete(URLS.DELETE_URL, bundles[0].getClusters().get(0));
+ r = prism.getClusterHelper().delete(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("PARTIAL"));
List<String> afterSubmitCluster = cluster1.getClusterHelper().getStoreInfo();
@@ -442,15 +427,14 @@ public class PrismSubmitTest extends BaseTestClass {
AssertUtil.compareDataStoreStates(beforeSubmitPrism, afterSubmitPrism,
Util.readEntityName(bundles[0].getClusters().get(0)), -1);
- r = prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("PARTIAL"));
}
@Test(groups = "distributed")
public void submitCluster_submitPartialDeleted() throws Exception {
restartRequired = true;
- ServiceResponse r =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
TimeUtil.sleepSeconds(30);
@@ -460,7 +444,7 @@ public class PrismSubmitTest extends BaseTestClass {
List<String> beforeSubmitCluster = cluster1.getClusterHelper().getStoreInfo();
List<String> beforeSubmitPrism = cluster2.getClusterHelper().getStoreInfo();
- r = prism.getClusterHelper().delete(URLS.DELETE_URL, bundles[0].getClusters().get(0));
+ r = prism.getClusterHelper().delete(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("PARTIAL"));
List<String> afterSubmitCluster = cluster1.getClusterHelper().getStoreInfo();
List<String> afterSubmitPrism = cluster2.getClusterHelper().getStoreInfo();
@@ -473,7 +457,7 @@ public class PrismSubmitTest extends BaseTestClass {
beforeSubmitCluster = cluster1.getClusterHelper().getStoreInfo();
beforeSubmitPrism = cluster2.getClusterHelper().getStoreInfo();
- r = prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
afterSubmitCluster = cluster1.getClusterHelper().getStoreInfo();
afterSubmitPrism = cluster2.getClusterHelper().getStoreInfo();
@@ -484,13 +468,12 @@ public class PrismSubmitTest extends BaseTestClass {
@Test(groups = "embedded")
public void submitCluster_resubmitAlreadySucceeded() throws Exception {
- ServiceResponse r =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
List<String> beforeSubmitCluster = cluster1.getClusterHelper().getStoreInfo();
List<String> beforeSubmitPrism = cluster2.getClusterHelper().getStoreInfo();
- r = prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
List<String> afterSubmitCluster = cluster1.getClusterHelper().getStoreInfo();
@@ -505,8 +488,7 @@ public class PrismSubmitTest extends BaseTestClass {
List<String> beforeSubmitCluster2 = cluster2.getClusterHelper().getStoreInfo();
List<String> beforeSubmitPrism = prism.getClusterHelper().getStoreInfo();
- ServiceResponse r =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
List<String> afterSubmitCluster1 = cluster1.getClusterHelper().getStoreInfo();
List<String> afterSubmitCluster2 = cluster2.getClusterHelper().getStoreInfo();
@@ -523,14 +505,13 @@ public class PrismSubmitTest extends BaseTestClass {
@Test(groups = "embedded")
public void submitCluster_1prism1coloAlreadySubmitted() throws Exception {
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
List<String> beforeSubmitCluster1 = cluster1.getClusterHelper().getStoreInfo();
List<String> beforeSubmitCluster2 = cluster2.getClusterHelper().getStoreInfo();
List<String> beforeSubmitPrism = prism.getClusterHelper().getStoreInfo();
- ServiceResponse r =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
List<String> afterSubmitCluster1 = cluster1.getClusterHelper().getStoreInfo();
List<String> afterSubmitCluster2 = cluster2.getClusterHelper().getStoreInfo();
@@ -545,11 +526,10 @@ public class PrismSubmitTest extends BaseTestClass {
@Test
public void submitProcess_1ColoDownAfter1FeedSubmitStartAfter2feed() throws Exception {
restartRequired = true;
- ServiceResponse r =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ ServiceResponse r = prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"), r.getMessage());
- r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getDataSets().get(0));
+ r = prism.getFeedHelper().submitEntity(bundles[0].getDataSets().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"), r.getMessage());
Util.shutDownService(cluster1.getClusterHelper());
@@ -559,7 +539,7 @@ public class PrismSubmitTest extends BaseTestClass {
List<String> beforeSubmitCluster2 = cluster2.getFeedHelper().getStoreInfo();
List<String> beforeSubmitPrism = prism.getFeedHelper().getStoreInfo();
- r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getDataSets().get(1));
+ r = prism.getFeedHelper().submitEntity(bundles[0].getDataSets().get(1));
Assert.assertTrue(r.getMessage().contains("FAILED"));
List<String> afterSubmitCluster1 = cluster1.getFeedHelper().getStoreInfo();
@@ -578,7 +558,7 @@ public class PrismSubmitTest extends BaseTestClass {
beforeSubmitCluster2 = cluster2.getProcessHelper().getStoreInfo();
beforeSubmitPrism = prism.getProcessHelper().getStoreInfo();
- r = prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData());
+ r = prism.getProcessHelper().submitEntity(bundles[0].getProcessData());
Assert.assertTrue(r.getMessage().contains("FAILED"), r.getMessage());
afterSubmitCluster1 = cluster1.getProcessHelper().getStoreInfo();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java
index 139b472..dac4cf6 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java
@@ -27,7 +27,6 @@ import org.apache.falcon.regression.core.util.InstanceUtil;
import org.apache.falcon.regression.core.util.OSUtil;
import org.apache.falcon.regression.core.util.TimeUtil;
import org.apache.falcon.regression.core.util.Util;
-import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.falcon.regression.core.util.XmlUtil;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.log4j.Logger;
@@ -95,12 +94,10 @@ public class RescheduleKilledProcessTest extends BaseTestClass {
bundles[0].submitFeedsScheduleProcess(prism);
- AssertUtil.assertSucceeded(prism.getProcessHelper().delete(URLS.DELETE_URL,
- bundles[0].getProcessData()));
- AssertUtil.assertSucceeded(prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL,
- bundles[0].getProcessData()));
- AssertUtil.assertSucceeded(prism.getProcessHelper().schedule(URLS.SCHEDULE_URL,
- bundles[0].getProcessData()));
+ String processData = bundles[0].getProcessData();
+ AssertUtil.assertSucceeded(prism.getProcessHelper().delete(processData));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitEntity(processData));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().schedule(processData));
}
/**
@@ -118,19 +115,13 @@ public class RescheduleKilledProcessTest extends BaseTestClass {
logger.info("process: " + Util.prettyPrintXml(bundles[0].getProcessData()));
bundles[0].submitFeedsScheduleProcess(prism);
-
- AssertUtil.assertSucceeded(prism.getProcessHelper().delete(URLS.DELETE_URL,
- bundles[0].getProcessData()));
- AssertUtil.assertSucceeded(prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL,
- bundles[0].getProcessData()));
- AssertUtil.assertSucceeded(prism.getProcessHelper().schedule(URLS.SCHEDULE_URL,
- bundles[0].getProcessData()));
- AssertUtil.assertSucceeded(prism.getProcessHelper().delete(URLS.DELETE_URL,
- bundles[0].getProcessData()));
- AssertUtil.assertSucceeded(prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL,
- bundles[0].getProcessData()));
- AssertUtil.assertSucceeded(prism.getProcessHelper().schedule(URLS.SCHEDULE_URL,
- bundles[0].getProcessData()));
+ String processData = bundles[0].getProcessData();
+ AssertUtil.assertSucceeded(prism.getProcessHelper().delete(processData));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitEntity(processData));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().schedule(processData));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().delete(processData));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitEntity(processData));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().schedule(processData));
}
@AfterClass(alwaysRun = true)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java
index 3bba852..d168ed4 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java
@@ -29,7 +29,6 @@ import org.apache.falcon.regression.core.util.InstanceUtil;
import org.apache.falcon.regression.core.util.OSUtil;
import org.apache.falcon.regression.core.util.TimeUtil;
import org.apache.falcon.regression.core.util.Util;
-import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.security.authentication.client.AuthenticationException;
@@ -113,12 +112,12 @@ public class RescheduleProcessInFinalStatesTest extends BaseTestClass {
public void rescheduleSucceeded() throws Exception {
InstanceUtil
.waitForBundleToReachState(cluster, bundles[0].getProcessName(), Status.SUCCEEDED);
- prism.getProcessHelper().delete(URLS.DELETE_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().delete(bundles[0].getProcessData());
checkNotFoundDefinition(bundles[0].getProcessData());
//submit and schedule process again
AssertUtil.assertSucceeded(prism.getProcessHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, bundles[0].getProcessData()));
+ .submitAndSchedule(bundles[0].getProcessData()));
InstanceUtil
.waitForBundleToReachState(cluster, bundles[0].getProcessName(), Status.SUCCEEDED);
}
@@ -135,12 +134,12 @@ public class RescheduleProcessInFinalStatesTest extends BaseTestClass {
public void rescheduleFailed() throws Exception {
InstanceUtil
.waitForBundleToReachState(cluster, bundles[0].getProcessName(), Status.SUCCEEDED);
- prism.getProcessHelper().delete(URLS.DELETE_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().delete(bundles[0].getProcessData());
checkNotFoundDefinition(bundles[0].getProcessData());
//submit and schedule process again
AssertUtil.assertSucceeded(prism.getProcessHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, bundles[0].getProcessData()));
+ .submitAndSchedule(bundles[0].getProcessData()));
InstanceUtil
.waitForBundleToReachState(cluster, bundles[0].getProcessName(), Status.SUCCEEDED);
}
@@ -161,12 +160,12 @@ public class RescheduleProcessInFinalStatesTest extends BaseTestClass {
.waitForBundleToReachState(cluster, bundles[0].getProcessName(), Status.DONEWITHERROR);
//delete the process
- prism.getProcessHelper().delete(URLS.DELETE_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().delete(bundles[0].getProcessData());
checkNotFoundDefinition(bundles[0].getProcessData());
//submit and schedule process again
AssertUtil.assertSucceeded(prism.getProcessHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, bundles[0].getProcessData()));
+ .submitAndSchedule(bundles[0].getProcessData()));
InstanceUtil
.waitForBundleToReachState(cluster, bundles[0].getProcessName(), Status.SUCCEEDED);
}
@@ -177,14 +176,14 @@ public class RescheduleProcessInFinalStatesTest extends BaseTestClass {
**/
@Test(enabled = true)
public void rescheduleKilled() throws Exception {
- prism.getProcessHelper().delete(URLS.DELETE_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().delete(bundles[0].getProcessData());
InstanceUtil
.waitForBundleToReachState(cluster, bundles[0].getProcessName(), Status.KILLED);
checkNotFoundDefinition(bundles[0].getProcessData());
//submit and schedule process again
AssertUtil.assertSucceeded(prism.getProcessHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, bundles[0].getProcessData()));
+ .submitAndSchedule(bundles[0].getProcessData()));
InstanceUtil
.waitForBundleToReachState(cluster, bundles[0].getProcessName(), Status.SUCCEEDED);
}
@@ -201,8 +200,7 @@ public class RescheduleProcessInFinalStatesTest extends BaseTestClass {
*/
private void checkNotFoundDefinition(String process)
throws URISyntaxException, IOException, AuthenticationException, JAXBException {
- ServiceResponse r = prism.getProcessHelper()
- .getEntityDefinition(URLS.GET_ENTITY_DEFINITION, process);
+ ServiceResponse r = prism.getProcessHelper().getEntityDefinition(process);
Assert.assertTrue(r.getMessage().contains("(process) not found"));
AssertUtil.assertFailed(r);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
index 8bce3de..d113554 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
@@ -35,7 +35,6 @@ import org.apache.falcon.regression.core.util.MathUtil;
import org.apache.falcon.regression.core.util.OozieUtil;
import org.apache.falcon.regression.core.util.TimeUtil;
import org.apache.falcon.regression.core.util.Util;
-import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.security.authentication.client.AuthenticationException;
@@ -113,8 +112,7 @@ public class RetentionTest extends BaseTestClass {
final FeedMerlin feedObject = new FeedMerlin(bundles[0].getInputFeedFromBundle());
feedObject.setRetentionValue(retentionUnit.getValue() + "(" + retentionPeriod + ")");
- final ServiceResponse response = prism.getFeedHelper()
- .submitEntity(URLS.SUBMIT_URL, feedObject.toString());
+ final ServiceResponse response = prism.getFeedHelper().submitEntity(feedObject.toString());
if (retentionPeriod > 0) {
AssertUtil.assertSucceeded(response);
@@ -174,7 +172,7 @@ public class RetentionTest extends BaseTestClass {
//get Data created in the cluster
List<String> initialData = Util.getHadoopDataFromDir(clusterFS, feed, testHDFSDir);
- cluster.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed);
+ cluster.getFeedHelper().schedule(feed);
logger.info(cluster.getClusterHelper().getActiveMQ());
final String feedName = Util.readEntityName(feed);
logger.info(feedName);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
index cd7d7bd..378cbbd 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
@@ -177,8 +177,7 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
//submit and schedule feed
- ServiceResponse r =
- prism.getFeedHelper().submitEntity(Util.URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitEntity(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(r);
InstanceUtil.waitTillInstancesAreCreated(cluster1, feed, 0);
@@ -232,10 +231,8 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
processBundle.submitBundle(prism);
//schedule of 2 cluster
- cluster1.getProcessHelper().schedule(Util.URLS.SCHEDULE_URL,
- processBundle.getProcessData());
- cluster2.getProcessHelper().schedule(Util.URLS.SCHEDULE_URL,
- processBundle.getProcessData());
+ cluster1.getProcessHelper().schedule(processBundle.getProcessData());
+ cluster2.getProcessHelper().schedule(processBundle.getProcessData());
InstanceUtil.waitTillInstancesAreCreated(cluster2, processBundle.getProcessData(), 0);
//shut down cluster2
@@ -319,13 +316,13 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
//submit feed on all 3 clusters
- ServiceResponse r = prism.getFeedHelper().submitEntity(Util.URLS.SUBMIT_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(r);
//schedule feed of cluster1 and cluster2
- r = cluster1.getFeedHelper().schedule(Util.URLS.SCHEDULE_URL, feed);
+ r = cluster1.getFeedHelper().schedule(feed);
AssertUtil.assertSucceeded(r);
- r = cluster2.getFeedHelper().schedule(Util.URLS.SCHEDULE_URL, feed);
+ r = cluster2.getFeedHelper().schedule(feed);
AssertUtil.assertSucceeded(r);
InstanceUtil.waitTillInstancesAreCreated(cluster1, feed, 0);
@@ -441,10 +438,10 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
Util.readEntityName(processBundle.getClusters().get(0)), ClusterType.SOURCE,
null, baseTestDir + "/replication" + MINUTE_DATE_PATTERN);
- ServiceResponse r = prism.getClusterHelper().submitEntity(Util.URLS.SUBMIT_URL,
+ ServiceResponse r = prism.getClusterHelper().submitEntity(
processBundle.getClusters().get(0));
AssertUtil.assertSucceeded(r);
- r = prism.getFeedHelper().submitAndSchedule(Util.URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ r = prism.getFeedHelper().submitAndSchedule(feed);
AssertUtil.assertSucceeded(r);
InstanceUtil.waitTillInstancesAreCreated(cluster1, feed, 0);
@@ -585,12 +582,10 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
XmlUtil.createRtention("days(1000000)", ActionType.DELETE),
Util.readEntityName(b.getClusters().get(0)), ClusterType.SOURCE, "",
"/someTestPath" + MINUTE_DATE_PATTERN);
- ServiceResponse r = prism.getClusterHelper().submitEntity(Util.URLS
- .SUBMIT_URL,
+ ServiceResponse r = prism.getClusterHelper().submitEntity(
b.getClusters().get(0));
AssertUtil.assertSucceeded(r);
- r = prism.getFeedHelper().submitAndSchedule(Util.URLS
- .SUBMIT_AND_SCHEDULE_URL, feed);
+ r = prism.getFeedHelper().submitAndSchedule(feed);
AssertUtil.assertSucceeded(r);
return feed;
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java
index 7a69e58..d7ac724 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java
@@ -111,7 +111,7 @@ public class LineageGraphTest extends BaseUITestClass {
inputFeedName = bundles[0].getInputFeedNameFromBundle();
outputFeedName = bundles[0].getOutputFeedNameFromBundle();
/**schedule process, wait for instances to succeed*/
- prism.getProcessHelper().schedule(Util.URLS.SCHEDULE_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().schedule(bundles[0].getProcessData());
InstanceUtil.waitTillInstanceReachState(clusterOC, bundles[0].getProcessName(), 3,
CoordinatorAction.Status.SUCCEEDED, EntityType.PROCESS);
/**get process instances*/
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java
index 110e2e9..76173b7 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java
@@ -179,7 +179,7 @@ public class ProcessUITest extends BaseUITestClass {
String processName = Util.readEntityName(process);
softAssert.assertEquals(page.getEntityStatus(processName),
EntitiesPage.EntityStatus.SUBMITTED, "Process status should be SUBMITTED");
- prism.getProcessHelper().schedule(Util.URLS.SCHEDULE_URL, process);
+ prism.getProcessHelper().schedule(process);
InstanceUtil.waitTillInstanceReachState(clusterOC, processName, 1,
CoordinatorAction.Status.RUNNING, EntityType.PROCESS);