You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ro...@apache.org on 2014/09/08 15:06:16 UTC
[1/5] FALCON-675 Request URLS moved from parameters into methods in
falcon-regression
Repository: incubator-falcon
Updated Branches:
refs/heads/master 245b6b457 -> 051a3d291
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);
[3/5] FALCON-675 Request URLS moved from parameters into methods in
falcon-regression
Posted by ro...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java
index 9198901..db29b19 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java
@@ -36,7 +36,6 @@ import org.apache.falcon.regression.core.util.OSUtil;
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.core.util.XmlUtil;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.hadoop.fs.FileSystem;
@@ -130,8 +129,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
String oldBundleId = InstanceUtil
.getLatestBundleID(cluster3,
Util.readEntityName(bundles[1].getProcessData()), EntityType.PROCESS);
@@ -183,8 +181,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
@@ -257,8 +254,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
String oldBundleId = InstanceUtil
.getLatestBundleID(cluster3,
Util.readEntityName(bundles[1].getProcessData()), EntityType.PROCESS);
@@ -342,8 +338,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
String oldBundleId = InstanceUtil
.getLatestBundleID(cluster3,
Util.readEntityName(bundles[1].getProcessData()), EntityType.PROCESS);
@@ -382,8 +377,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
String originalProcessData = bundles[1].getProcessData();
String oldBundleId = InstanceUtil
.getLatestBundleID(cluster3,
@@ -417,8 +411,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
String oldBundleId = InstanceUtil
.getLatestBundleID(cluster3,
@@ -500,8 +493,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
@@ -587,14 +579,12 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
String oldBundleId = InstanceUtil
.getLatestBundleID(cluster3,
Util.readEntityName(bundles[1].getProcessData()), EntityType.PROCESS);
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
waitForProcessToReachACertainState(cluster3, bundles[1], Job.Status.RUNNING);
@@ -602,8 +592,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
EntityType.PROCESS);
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .suspend(URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().suspend(bundles[1].getProcessData()));
//now to update
while (Util
.parseResponse(updateProcessConcurrency(bundles[1],
@@ -622,8 +611,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
OozieUtil.verifyNewBundleCreation(cluster3, oldBundleId, oldNominalTimes,
bundles[1].getProcessData(), false, true);
AssertUtil.checkNotStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
- AssertUtil.assertSucceeded(cluster3.getProcessHelper()
- .resume(URLS.RESUME_URL, bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(cluster3.getProcessHelper().resume(bundles[1].getProcessData()));
AssertUtil.checkStatus(cluster3OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
Job.Status status = OozieUtil.getOozieJobStatus(cluster3.getFeedHelper().getOozieClient(),
@@ -682,8 +670,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
LOGGER.info("process to be scheduled: " + Util.prettyPrintXml(bundles[1].getProcessData()));
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
String oldBundleId = InstanceUtil
@@ -783,8 +770,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
@@ -852,8 +838,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
@@ -873,8 +858,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].getProcessObject().setOrder(getRandomExecutionType(bundles[1]));
//suspend
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .suspend(URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().suspend(bundles[1].getProcessData()));
//now to update
String updateTime = new DateTime(DateTimeZone.UTC).plusMinutes(2).toString();
@@ -886,8 +870,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
TimeUtil.sleepSeconds(10);
}
- AssertUtil.assertSucceeded(cluster3.getProcessHelper()
- .resume(URLS.RESUME_URL, bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(cluster3.getProcessHelper().resume(bundles[1].getProcessData()));
String prismString = getResponse(prism, bundles[1].getProcessData(), true);
Assert.assertEquals(Util.getProcessObject(prismString).getParallel(),
@@ -929,8 +912,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
@@ -950,8 +932,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
inputFeed = Util.setFeedName(inputFeed, newFeedName);
LOGGER.info(inputFeed);
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, inputFeed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(inputFeed));
while (Util.parseResponse(
prism.getProcessHelper()
@@ -983,8 +964,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0);
@@ -1003,10 +983,8 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
inputFeed = Util.setFeedName(inputFeed, newFeedName);
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .suspend(URLS.SUSPEND_URL, bundles[1].getProcessData()));
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, inputFeed));
+ cluster3.getProcessHelper().suspend(bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(inputFeed));
while (Util.parseResponse(
prism.getProcessHelper()
@@ -1019,8 +997,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].getProcessData(), true, false);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 1, 10);
- AssertUtil.assertSucceeded(cluster3.getProcessHelper()
- .resume(URLS.RESUME_URL, bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(cluster3.getProcessHelper().resume(bundles[1].getProcessData()));
bundles[1].verifyDependencyListing(cluster2);
@@ -1050,8 +1027,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, originalProcess));
+ cluster3.getProcessHelper().schedule(originalProcess));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, originalProcess, 0, 10);
@@ -1064,8 +1040,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
EntityType.PROCESS);
//submit new feed
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, inputFeed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(inputFeed));
Util.shutDownService(cluster3.getProcessHelper());
@@ -1114,8 +1089,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
@@ -1181,8 +1155,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
String oldBundleId = InstanceUtil
.getLatestBundleID(cluster3,
Util.readEntityName(bundles[1].getProcessData()), EntityType.PROCESS);
@@ -1200,8 +1173,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
newEndTime);
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .suspend(URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().suspend(bundles[1].getProcessData()));
while (Util.parseResponse(
prism.getProcessHelper()
.update((bundles[1].getProcessData()), bundles[1].getProcessData()))
@@ -1209,8 +1181,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
LOGGER.info("update didnt SUCCEED in last attempt");
TimeUtil.sleepSeconds(10);
}
- AssertUtil.assertSucceeded(cluster3.getProcessHelper()
- .resume(URLS.RESUME_URL, bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(cluster3.getProcessHelper().resume(bundles[1].getProcessData()));
dualComparison(prism, cluster2, bundles[1].getProcessData());
@@ -1249,8 +1220,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
String oldBundleId = InstanceUtil
@@ -1301,8 +1271,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
@@ -1346,8 +1315,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
TimeUtil.sleepSeconds(30);
InstanceUtil.waitTillInstancesAreCreated(cluster3, bundles[1].getProcessData(), 0, 10);
@@ -1385,9 +1353,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData())
- );
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
String oldBundleId = InstanceUtil
.getLatestBundleID(cluster3,
Util.readEntityName(bundles[1].getProcessData()), EntityType.PROCESS);
@@ -1410,9 +1376,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
waitForProcessToReachACertainState(cluster3, bundles[1], Job.Status.RUNNING);
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .suspend(URLS.SUSPEND_URL, bundles[1].getProcessData())
- );
+ cluster3.getProcessHelper().suspend(bundles[1].getProcessData()));
AssertUtil.assertSucceeded(
prism.getProcessHelper()
@@ -1447,8 +1411,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
bundles[1].submitBundle(prism);
//now to schedule in 1 colo and let it remain in another
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().schedule(bundles[1].getProcessData()));
String oldBundleId = InstanceUtil
.getLatestBundleID(cluster3,
Util.readEntityName(bundles[1].getProcessData()), EntityType.PROCESS);
@@ -1467,13 +1430,11 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
waitForProcessToReachACertainState(cluster3, bundles[1], Job.Status.RUNNING);
AssertUtil.assertSucceeded(
- cluster3.getProcessHelper()
- .suspend(URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ cluster3.getProcessHelper().suspend(bundles[1].getProcessData()));
AssertUtil.assertSucceeded(
prism.getProcessHelper()
.update(bundles[1].getProcessData(), bundles[1].getProcessData()));
- AssertUtil.assertSucceeded(cluster3.getProcessHelper()
- .resume(URLS.RESUME_URL, bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(cluster3.getProcessHelper().resume(bundles[1].getProcessData()));
List<String> oldNominalTimes =
OozieUtil.getActionsNominalTime(cluster3, oldBundleId, EntityType.PROCESS);
@@ -1579,8 +1540,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
private String getResponse(ColoHelper prism, String processData, boolean bool)
throws Exception {
- ServiceResponse response = prism.getProcessHelper()
- .getEntityDefinition(Util.URLS.GET_ENTITY_DEFINITION, processData);
+ ServiceResponse response = prism.getProcessHelper().getEntityDefinition(processData);
if (bool) {
AssertUtil.assertSucceeded(response);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismClusterDeleteTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismClusterDeleteTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismClusterDeleteTest.java
index a4c2dae..c601345 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismClusterDeleteTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismClusterDeleteTest.java
@@ -75,7 +75,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
@Test(groups = {"multiCluster"})
public void testServer1ClusterDeleteInBothColos() throws Exception {
AssertUtil.assertSucceeded((prism.getClusterHelper()
- .submitEntity(Util.URLS.SUBMIT_URL, bundles[0].getClusters().get(0))));
+ .submitEntity(bundles[0].getClusters().get(0))));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -90,7 +90,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
//lets now delete the cluster from both colos
AssertUtil.assertSucceeded(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -127,7 +127,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
restartRequired = true;
AssertUtil.assertSucceeded(prism.getClusterHelper()
- .submitEntity(Util.URLS.SUBMIT_URL, bundles[0].getClusters().get(0)));
+ .submitEntity(bundles[0].getClusters().get(0)));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -146,7 +146,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
//lets now delete the cluster from both colos
AssertUtil.assertPartial(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -177,7 +177,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
//now bring up the service and roll forward the delete
Util.startService(cluster1.getClusterHelper());
AssertUtil.assertSucceeded(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
//get final data states:
List<String> server1ArchiveFinalState2 = cluster1.getClusterHelper().getArchiveInfo();
@@ -204,9 +204,9 @@ public class PrismClusterDeleteTest extends BaseTestClass {
public void testServer1ClusterDeleteAlreadyDeletedCluster() throws Exception {
restartRequired = true;
AssertUtil.assertSucceeded(prism.getClusterHelper()
- .submitEntity(Util.URLS.SUBMIT_URL, bundles[0].getClusters().get(0)));
+ .submitEntity(bundles[0].getClusters().get(0)));
AssertUtil.assertSucceeded(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -220,7 +220,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
List<String> initialServer2ArchiveStore = cluster2.getClusterHelper().getArchiveInfo();
AssertUtil.assertSucceeded(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -255,12 +255,12 @@ public class PrismClusterDeleteTest extends BaseTestClass {
restartRequired = true;
AssertUtil.assertSucceeded(prism.getClusterHelper()
- .submitEntity(Util.URLS.SUBMIT_URL, bundles[0].getClusters().get(0)));
+ .submitEntity(bundles[0].getClusters().get(0)));
Util.shutDownService(cluster1.getClusterHelper());
//lets now delete the cluster from both colos
AssertUtil.assertPartial(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
//now lets get the final states
List<String> initialPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -278,7 +278,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
//delete again
AssertUtil.assertSucceeded(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
//get final states
List<String> finalPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -323,7 +323,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
//delete
AssertUtil.assertSucceeded(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
//get final states
List<String> finalPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -374,7 +374,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
//delete
AssertUtil.assertSucceeded(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
//get final states
List<String> finalPrismStore = prism.getClusterHelper().getStoreInfo();
@@ -404,7 +404,7 @@ public class PrismClusterDeleteTest extends BaseTestClass {
Util.startService(cluster1.getFeedHelper());
AssertUtil.assertSucceeded(
- prism.getClusterHelper().delete(Util.URLS.DELETE_URL, bundles[0].getClusters().get(0)));
+ prism.getClusterHelper().delete(bundles[0].getClusters().get(0)));
List<String> server1StorePostUp = cluster1.getClusterHelper().getStoreInfo();
List<String> server1ArchivePostUp = cluster1.getClusterHelper().getArchiveInfo();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java
index 630ca28..c767649 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java
@@ -80,7 +80,7 @@ public class PrismConcurrentRequestTest extends BaseTestClass {
*/
@Test(groups = {"multiCluster"})
public void submitFeedParallel() throws Exception {
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
for (int i = 1; i <= brothers.length; i++) {
brothers[i - 1] =
new Brother("brother" + i, "submit", EntityType.FEED, brotherGrimm, bundles[0],
@@ -104,9 +104,9 @@ public class PrismConcurrentRequestTest extends BaseTestClass {
*/
@Test(groups = {"multiCluster"})
public void submitProcessParallel() throws Exception {
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getDataSets().get(0));
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getDataSets().get(1));
+ prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
+ prism.getFeedHelper().submitEntity(bundles[0].getDataSets().get(0));
+ prism.getFeedHelper().submitEntity(bundles[0].getDataSets().get(1));
for (int i = 1; i <= brothers.length; i++) {
brothers[i - 1] =
new Brother("brother" + i, "submit", EntityType.PROCESS, brotherGrimm, bundles[0],
@@ -181,11 +181,11 @@ public class PrismConcurrentRequestTest extends BaseTestClass {
@Test(groups = {"multiCluster"})
public void resumeAndSuspendFeedParallel() throws Exception {
brothers = new Brother[4];
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
- AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
+ prism.getFeedHelper().submitEntity(feed);
+ AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
- prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed);
+ prism.getFeedHelper().suspend(feed);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
for (int i = 1; i <= 2; i++) {
brothers[i - 1] =
@@ -217,15 +217,15 @@ public class PrismConcurrentRequestTest extends BaseTestClass {
@Test(groups = {"multiCluster"})
public void resumeFeedParallel() throws Exception {
final double delay = 15;
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
- AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
+ prism.getFeedHelper().submitEntity(feed);
+ AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(feed));
TimeUtil.sleepSeconds(delay);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
- prism.getFeedHelper().resume(URLS.RESUME_URL, feed);
+ prism.getFeedHelper().resume(feed);
TimeUtil.sleepSeconds(delay);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
- prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed);
+ prism.getFeedHelper().suspend(feed);
TimeUtil.sleepSeconds(delay);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
for (int i = 1; i <= brothers.length; i++) {
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java
index 9e3ed12..f67e2ce 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java
@@ -32,7 +32,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;
@@ -107,8 +106,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
List<String> initialServer2ArchiveStore = cluster2.getFeedHelper().getArchiveInfo();
//lets now delete the cluster from both colos
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -160,8 +158,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
//lets now delete the cluster from both colos
- AssertUtil.assertFailed(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -192,8 +189,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.startService(cluster1.getFeedHelper());
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
List<String> Server2ArchivePostUp = cluster2.getFeedHelper().getArchiveInfo();
List<String> Server2StorePostUp = cluster2.getFeedHelper().getStoreInfo();
@@ -219,8 +215,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
public void testServer1FeedDeleteAlreadyDeletedFeed() throws Exception {
restartRequired = true;
bundles[0].submitFeed();
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -233,8 +228,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
List<String> initialServer2Store = cluster2.getFeedHelper().getStoreInfo();
List<String> initialServer2ArchiveStore = cluster2.getFeedHelper().getArchiveInfo();
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -274,8 +268,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
//lets now delete the cluster from both colos
- AssertUtil.assertFailed(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> initialPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -292,8 +285,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.startService(cluster1.getFeedHelper());
//delete again
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//get final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -337,8 +329,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
List<String> initialServer2Store = cluster2.getFeedHelper().getStoreInfo();
List<String> initialServer2ArchiveStore = cluster2.getFeedHelper().getArchiveInfo();
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//get final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -377,13 +368,12 @@ public class PrismFeedDeleteTest extends BaseTestClass {
bundles[0].setCLusterColo(cluster1Colo);
logger.info("cluster bundle1: " + Util.prettyPrintXml(bundles[0].getClusters().get(0)));
- 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"));
bundles[1].setCLusterColo(cluster2Colo);
logger.info("cluster bundle2: " + Util.prettyPrintXml(bundles[1].getClusters().get(0)));
- r = prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[1].getClusters().get(0));
+ r = prism.getClusterHelper().submitEntity(bundles[1].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
String startTimeServer1 = "2012-10-01T12:00Z";
@@ -409,7 +399,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
- AssertUtil.assertSucceeded(prism.getFeedHelper().delete(Util.URLS.DELETE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(feed));
}
@@ -430,8 +420,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
List<String> initialServer2ArchiveStore = cluster2.getFeedHelper().getArchiveInfo();
//lets now delete the cluster from both colos
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -469,8 +458,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
bundles[1].submitAndScheduleFeed();
//suspend Server1 colo thingy
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -484,8 +472,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
List<String> initialServer2ArchiveStore = cluster2.getFeedHelper().getArchiveInfo();
//lets now delete the cluster from both colos
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -524,10 +511,8 @@ public class PrismFeedDeleteTest extends BaseTestClass {
bundles[1].submitAndScheduleFeed();
//suspend Server1 colo thingy
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(URLS.SUSPEND_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[1].getDataSets().get(0)));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -541,8 +526,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
List<String> initialServer2ArchiveStore = cluster2.getFeedHelper().getArchiveInfo();
//lets now delete the cluster from both colos
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -580,8 +564,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
bundles[0].submitAndScheduleFeed();
bundles[1].submitAndScheduleFeed();
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -598,8 +581,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
//lets now delete the cluster from both colos
- AssertUtil.assertFailed(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -630,8 +612,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.startService(cluster1.getClusterHelper());
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
List<String> Server1StorePostUp = cluster1.getFeedHelper().getStoreInfo();
List<String> Server1ArchivePostUp = cluster1.getFeedHelper().getArchiveInfo();
@@ -662,10 +643,8 @@ public class PrismFeedDeleteTest extends BaseTestClass {
bundles[0].submitAndScheduleFeed();
bundles[1].submitAndScheduleFeed();
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(Util.URLS.SUSPEND_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[1].getDataSets().get(0)));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getFeedHelper().getStoreInfo();
List<String> initialPrismArchiveStore = prism.getFeedHelper().getArchiveInfo();
@@ -681,8 +660,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
//lets now delete the feed from both colos
- AssertUtil.assertFailed(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -713,8 +691,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.startService(cluster1.getFeedHelper());
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
HashMap<String, List<String>> finalSystemState = getSystemState(EntityType.FEED);
@@ -754,8 +731,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
//lets now delete the cluster from both colos
- AssertUtil.assertFailed(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -786,8 +762,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.startService(cluster1.getClusterHelper());
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
HashMap<String, List<String>> systemStatePostUp = getSystemState(EntityType.FEED);
@@ -812,13 +787,12 @@ public class PrismFeedDeleteTest extends BaseTestClass {
bundles[0].setCLusterColo(cluster1Colo);
logger.info("cluster bundle1: " + Util.prettyPrintXml(bundles[0].getClusters().get(0)));
- 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"));
bundles[1].setCLusterColo(cluster2Colo);
logger.info("cluster bundle2: " + Util.prettyPrintXml(bundles[1].getClusters().get(0)));
- r = prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[1].getClusters().get(0));
+ r = prism.getClusterHelper().submitEntity(bundles[1].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
String startTimeServer1 = "2012-10-01T12:00Z";
@@ -844,11 +818,11 @@ public class PrismFeedDeleteTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ r = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(r);
- r = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed);
+ r = prism.getFeedHelper().schedule(feed);
AssertUtil.assertSucceeded(r);
TimeUtil.sleepSeconds(15);
@@ -865,14 +839,14 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
- r = prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed);
+ r = prism.getFeedHelper().suspend(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertPartial(r);
Assert
.assertTrue(r.getMessage().contains(cluster1Colo + "/org.apache.falcon.FalconException")
&& r.getMessage().contains(cluster2Colo + "/" + Util.readEntityName(feed)));
- ServiceResponse response = prism.getFeedHelper().delete(Util.URLS.DELETE_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().delete(feed);
Assert.assertTrue(
response.getMessage().contains(cluster1Colo + "/org.apache.falcon.FalconException")
&& response.getMessage().contains(cluster2Colo + "/" + Util.readEntityName(feed)));
@@ -914,13 +888,12 @@ public class PrismFeedDeleteTest extends BaseTestClass {
bundles[0].setCLusterColo(cluster1Colo);
logger.info("cluster bundle1: " + Util.prettyPrintXml(bundles[0].getClusters().get(0)));
- 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"));
bundles[1].setCLusterColo(cluster2Colo);
logger.info("cluster bundle2: " + Util.prettyPrintXml(bundles[1].getClusters().get(0)));
- r = prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[1].getClusters().get(0));
+ r = prism.getClusterHelper().submitEntity(bundles[1].getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
String startTimeServer1 = "2012-10-01T12:00Z";
@@ -944,11 +917,11 @@ public class PrismFeedDeleteTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ r = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(r);
- r = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed);
+ r = prism.getFeedHelper().schedule(feed);
AssertUtil.assertSucceeded(r);
TimeUtil.sleepSeconds(15);
@@ -963,13 +936,13 @@ public class PrismFeedDeleteTest extends BaseTestClass {
List<String> initialServer2Store = cluster2.getFeedHelper().getStoreInfo();
List<String> initialServer2ArchiveStore = cluster2.getFeedHelper().getArchiveInfo();
- r = prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed);
+ r = prism.getFeedHelper().suspend(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(r);
Util.shutDownService(cluster1.getFeedHelper());
- ServiceResponse response = prism.getFeedHelper().delete(Util.URLS.DELETE_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().delete(feed);
Assert.assertTrue(response.getMessage().contains(cluster1Colo + "/org.apache.falcon" +
".FalconException")
&& response.getMessage().contains(cluster2Colo + "/" + Util.readEntityName(feed)));
@@ -1026,8 +999,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
//lets now delete the cluster from both colos
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[1].getDataSets().get(0)));
//now lets get the final states
List<String> finalPrismStore = prism.getFeedHelper().getStoreInfo();
@@ -1058,8 +1030,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
Util.startService(cluster1.getFeedHelper());
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
clusterName = Util.readEntityName(bundles[0].getDataSets().get(0));
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java
index 8a14229..9e0fbed 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.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.core.util.XmlUtil;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.hadoop.fs.FileSystem;
@@ -127,7 +126,7 @@ public class PrismFeedLateReplicationTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ prism.getFeedHelper().submitAndSchedule(feed);
TimeUtil.sleepSeconds(10);
String bundleId =
@@ -200,7 +199,7 @@ public class PrismFeedLateReplicationTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ prism.getFeedHelper().submitAndSchedule(feed);
TimeUtil.sleepSeconds(10);
String postFix = "/US/" + cluster2.getClusterHelper().getColoName();
@@ -393,7 +392,7 @@ public class PrismFeedLateReplicationTest extends BaseTestClass {
//submit and schedule feed
logger.info("feed: " + Util.prettyPrintXml(feed));
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ prism.getFeedHelper().submitAndSchedule(feed);
TimeUtil.sleepSeconds(10);
//wait till 1st instance of replication coord is SUCCEEDED
@@ -595,7 +594,7 @@ public class PrismFeedLateReplicationTest extends BaseTestClass {
//submit and schedule feed
logger.info("feed: " + Util.prettyPrintXml(feed));
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ prism.getFeedHelper().submitAndSchedule(feed);
TimeUtil.sleepSeconds(10);
//wait till 1st instance of replication coord is SUCCEEDED
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java
index 2d67583..7a5a91e 100755
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java
@@ -31,7 +31,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.hadoop.fs.FileSystem;
@@ -230,7 +229,7 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- ServiceResponse r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitEntity(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertFailed(r, "submit of feed should have failed as the partition in source " +
"is blank");
@@ -278,11 +277,11 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- ServiceResponse r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitEntity(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(r);
- r = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed);
+ r = prism.getFeedHelper().schedule(feed);
AssertUtil.assertSucceeded(r);
TimeUtil.sleepSeconds(15);
@@ -373,8 +372,7 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- ServiceResponse r =
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitAndSchedule(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(r);
@@ -466,11 +464,11 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- ServiceResponse r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitEntity(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(r);
- AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(feed));
TimeUtil.sleepSeconds(15);
InstanceUtil.waitTillInstanceReachState(cluster1OC, Util.readEntityName(feed), 1,
@@ -563,7 +561,7 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
//clean target if old data exists
logger.info("feed: " + Util.prettyPrintXml(feed));
- ServiceResponse r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertFailed(r, "Submission of feed should have failed.");
Assert.assertTrue(r.getMessage().contains(
"Partition expression has to be specified for cluster " +
@@ -619,11 +617,11 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- ServiceResponse r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitEntity(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(r);
- AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(feed));
TimeUtil.sleepSeconds(15);
InstanceUtil.waitTillInstanceReachState(cluster1OC, Util.readEntityName(feed), 1,
@@ -720,11 +718,11 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- ServiceResponse r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitEntity(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(r);
- r = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed);
+ r = prism.getFeedHelper().schedule(feed);
AssertUtil.assertSucceeded(r);
TimeUtil.sleepSeconds(15);
@@ -802,11 +800,11 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- ServiceResponse r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitEntity(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(r);
- AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(feed));
TimeUtil.sleepSeconds(15);
InstanceUtil.waitTillInstanceReachState(cluster1OC, Util.readEntityName(feed), 1,
CoordinatorAction.Status.SUCCEEDED, EntityType.FEED, 20);
@@ -890,7 +888,7 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- ServiceResponse r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse r = prism.getFeedHelper().submitEntity(feed);
TimeUtil.sleepSeconds(10);
AssertUtil.assertFailed(r, "is defined more than once for feed");
Assert.assertTrue(r.getMessage().contains("is defined more than once for feed"));
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java
index a4c27d7..56e0af9 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java
@@ -30,7 +30,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.hadoop.fs.FileSystem;
@@ -142,8 +141,8 @@ public class PrismFeedReplicationUpdateTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(feed));
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed));
- AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(feed));
//change feed location path
feed = InstanceUtil.setFeedFilePath(feed, alternativeInputPath);
@@ -264,9 +263,9 @@ public class PrismFeedReplicationUpdateTest extends BaseTestClass {
Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.TARGET, null);
//submit and schedule feeds
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed01);
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed02);
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_URL, outputFeed);
+ prism.getFeedHelper().submitAndSchedule(feed01);
+ prism.getFeedHelper().submitAndSchedule(feed02);
+ prism.getFeedHelper().submitAndSchedule(outputFeed);
//create a process with 2 clusters
@@ -291,8 +290,7 @@ public class PrismFeedReplicationUpdateTest extends BaseTestClass {
Util.readEntityName(feed02));
//submit and schedule process
- AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(URLS
- .SUBMIT_AND_SCHEDULE_URL, process));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(process));
logger.info("Wait till process goes into running ");
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedResumeTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedResumeTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedResumeTest.java
index af1620a..79ceacc 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedResumeTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedResumeTest.java
@@ -82,38 +82,36 @@ public class PrismFeedResumeTest extends BaseTestClass {
bundles[1].submitAndScheduleFeedUsingColoHelper(cluster2);
//suspend using prismHelper
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
//verify
checkAndCompareStatus(cluster1, bundles[0], Job.Status.SUSPENDED);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
//suspend using prismHelper
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
//verify
checkAndCompareStatus(cluster1, bundles[0], Job.Status.RUNNING);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
//try using the colohelper
AssertUtil.assertSucceeded(cluster1.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ .suspend(bundles[0].getDataSets().get(0)));
//verify
checkAndCompareStatus(cluster1, bundles[0], Job.Status.SUSPENDED);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
//suspend using prismHelper
AssertUtil.assertSucceeded(
- cluster1.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ cluster1.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
//verify
checkAndCompareStatus(cluster1, bundles[0], Job.Status.RUNNING);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
//suspend on the other one
AssertUtil.assertSucceeded(cluster1.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ .suspend(bundles[0].getDataSets().get(0)));
checkAndCompareStatus(cluster1, bundles[0], Job.Status.SUSPENDED);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
AssertUtil.assertSucceeded(
- cluster1.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ cluster1.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
checkAndCompareStatus(cluster1, bundles[0], Job.Status.RUNNING);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
}
@@ -125,27 +123,21 @@ public class PrismFeedResumeTest extends BaseTestClass {
bundles[1].submitAndScheduleFeedUsingColoHelper(cluster2);
//delete using coloHelpers
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//suspend using prismHelper
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
//verify
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[1].getDataSets().get(0)));
//suspend on the other one
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.KILLED);
- AssertUtil.assertFailed(
- cluster1.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster1.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
- AssertUtil.assertFailed(
- cluster2.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster2.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.KILLED);
}
@@ -155,25 +147,23 @@ public class PrismFeedResumeTest extends BaseTestClass {
bundles[0].submitAndScheduleFeedUsingColoHelper(cluster1);
bundles[1].submitAndScheduleFeedUsingColoHelper(cluster2);
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
checkAndCompareStatus(cluster1, bundles[0], Job.Status.SUSPENDED);
for (int i = 0; i < 2; i++) {
//suspend using prismHelper
AssertUtil.assertSucceeded(prism.getFeedHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ .resume(bundles[0].getDataSets().get(0)));
//verify
checkAndCompareStatus(cluster1, bundles[0], Job.Status.RUNNING);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
}
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(Util.URLS.SUSPEND_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[1].getDataSets().get(0)));
checkAndCompareStatus(cluster2, bundles[1], Job.Status.SUSPENDED);
for (int i = 0; i < 2; i++) {
AssertUtil.assertSucceeded(cluster1.getFeedHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ .resume(bundles[0].getDataSets().get(0)));
//verify
checkAndCompareStatus(cluster1, bundles[0], Job.Status.RUNNING);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.SUSPENDED);
@@ -183,7 +173,7 @@ public class PrismFeedResumeTest extends BaseTestClass {
for (int i = 0; i < 2; i++) {
//suspend on the other one
AssertUtil.assertSucceeded(prism.getFeedHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ .resume(bundles[1].getDataSets().get(0)));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.RUNNING);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
}
@@ -191,7 +181,7 @@ public class PrismFeedResumeTest extends BaseTestClass {
for (int i = 0; i < 2; i++) {
//suspend on the other one
AssertUtil.assertSucceeded(cluster2.getFeedHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ .resume(bundles[1].getDataSets().get(0)));
checkAndCompareStatus(cluster1, bundles[0], Job.Status.RUNNING);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
}
@@ -199,15 +189,11 @@ public class PrismFeedResumeTest extends BaseTestClass {
@Test
public void testResumeNonExistentFeedOnBothColos() throws Exception {
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
-
- AssertUtil.assertFailed(
- cluster1.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertFailed(
- cluster2.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
+
+ AssertUtil.assertFailed(cluster1.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster2.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
}
@Test
@@ -215,15 +201,11 @@ public class PrismFeedResumeTest extends BaseTestClass {
bundles[0].submitFeed();
bundles[1].submitFeed();
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
- AssertUtil.assertFailed(
- cluster1.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertFailed(
- cluster2.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster1.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster2.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
}
@Test(groups = {"prism", "0.2"})
@@ -234,28 +216,26 @@ public class PrismFeedResumeTest extends BaseTestClass {
bundles[0].submitAndScheduleFeedUsingColoHelper(cluster1);
bundles[1].submitAndScheduleFeedUsingColoHelper(cluster2);
AssertUtil.assertSucceeded(cluster1.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ .suspend(bundles[0].getDataSets().get(0)));
AssertUtil.assertSucceeded(cluster2.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getDataSets().get(0)));
+ .suspend(bundles[1].getDataSets().get(0)));
Util.shutDownService(cluster1.getFeedHelper());
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
//verify
checkAndCompareStatus(cluster2, bundles[1], Job.Status.SUSPENDED);
//resume on the other one
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
Util.startService(cluster1.getFeedHelper());
checkAndCompareStatus(cluster1, bundles[0], Job.Status.SUSPENDED);
AssertUtil.assertSucceeded(
- cluster2.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ cluster2.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
AssertUtil.assertSucceeded(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
checkAndCompareStatus(cluster1, bundles[0], Job.Status.RUNNING);
}
@@ -269,36 +249,29 @@ public class PrismFeedResumeTest extends BaseTestClass {
bundles[1].submitAndScheduleFeedUsingColoHelper(cluster2);
//delete using prismHelper
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
Util.shutDownService(cluster1.getFeedHelper());
//suspend using prismHelper
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
//verify
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
//suspend using prismHelper
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
//verify
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
checkAndCompareStatus(cluster2, bundles[1], Job.Status.RUNNING);
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[1].getDataSets().get(0)));
//suspend on the other one
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.KILLED);
- AssertUtil.assertFailed(
- cluster2.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster2.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.KILLED);
}
@@ -309,12 +282,9 @@ public class PrismFeedResumeTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertFailed(
- cluster2.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster2.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
}
@Test(groups = {"prism", "0.2"})
@@ -326,12 +296,9 @@ public class PrismFeedResumeTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertFailed(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
- AssertUtil.assertFailed(
- cluster2.getFeedHelper().resume(Util.URLS.RESUME_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster2.getFeedHelper().resume(bundles[1].getDataSets().get(0)));
}
@@ -341,16 +308,11 @@ public class PrismFeedResumeTest extends BaseTestClass {
.checkStatus(coloHelper.getFeedHelper().getOozieClient(), EntityType.FEED, bundle,
expectedStatus);
String entity = bundle.getDataSets().get(0);
- Assert.assertEquals(
- Util.parseResponse(prism.getFeedHelper().getStatus(Util.URLS.STATUS_URL, entity))
- .getMessage(),
+ Assert.assertEquals(Util.parseResponse(prism.getFeedHelper().getStatus(entity)).getMessage(),
coloHelper.getFeedHelper().getColoName() + "/" + expectedStatus);
- Assert.assertEquals(
- Util.parseResponse(prism.getFeedHelper().getStatus(Util.URLS.STATUS_URL, entity))
- .getMessage(),
+ Assert.assertEquals(Util.parseResponse(prism.getFeedHelper().getStatus(entity)).getMessage(),
coloHelper.getFeedHelper().getColoName() + "/"
- + Util.parseResponse(
- coloHelper.getFeedHelper().getStatus(Util.URLS.STATUS_URL, entity)).getMessage());
+ + Util.parseResponse(coloHelper.getFeedHelper().getStatus(entity)).getMessage());
}
@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/PrismFeedScheduleTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedScheduleTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedScheduleTest.java
index ab2e95d..9a32932 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedScheduleTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedScheduleTest.java
@@ -24,7 +24,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;
@@ -81,8 +80,7 @@ public class PrismFeedScheduleTest extends BaseTestClass {
logger.info("feed: " + Util.prettyPrintXml(bundles[0].getDataSets().get(0)));
bundles[0].submitAndScheduleFeed();
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .suspend(URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.SUSPENDED);
bundles[1].submitAndScheduleFeed();
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
[4/5] FALCON-675 Request URLS moved from parameters into methods in
falcon-regression
Posted by ro...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitAndScheduleTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitAndScheduleTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitAndScheduleTest.java
index 1fdfa95..db82a8c 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitAndScheduleTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitAndScheduleTest.java
@@ -27,7 +27,6 @@ import org.apache.falcon.regression.core.util.BundleUtil;
import org.apache.falcon.regression.core.util.InstanceUtil;
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.hadoop.security.authentication.client.AuthenticationException;
import org.apache.log4j.Logger;
@@ -85,9 +84,8 @@ public class FeedSubmitAndScheduleTest extends BaseTestClass {
private void submitFirstClusterScheduleFirstFeed()
throws JAXBException, IOException, URISyntaxException, AuthenticationException {
Assert.assertEquals(Util.parseResponse(prism.getClusterHelper()
- .submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0))).getStatusCode(), 200);
- ServiceResponse response = prism.getFeedHelper().submitAndSchedule(URLS
- .SUBMIT_AND_SCHEDULE_URL, feed);
+ .submitEntity(bundles[0].getClusters().get(0))).getStatusCode(), 200);
+ ServiceResponse response = prism.getFeedHelper().submitAndSchedule(feed);
AssertUtil.assertSucceeded(response);
}
@@ -107,8 +105,7 @@ public class FeedSubmitAndScheduleTest extends BaseTestClass {
.getLatestBundleID(cluster, Util.readEntityName(feed), EntityType.FEED);
//try to submit and schedule the same process again
- ServiceResponse response = prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitAndSchedule(feed);
AssertUtil.assertSucceeded(response);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, bundles[0], Job.Status.RUNNING);
@@ -124,8 +121,7 @@ public class FeedSubmitAndScheduleTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void snsFeedWithoutCluster() throws Exception {
- ServiceResponse response = prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitAndSchedule(feed);
AssertUtil.assertFailed(response);
}
@@ -139,11 +135,10 @@ public class FeedSubmitAndScheduleTest extends BaseTestClass {
public void snsDeletedFeed() throws Exception {
submitFirstClusterScheduleFirstFeed();
AssertUtil.checkStatus(clusterOC, EntityType.FEED, bundles[0], Job.Status.RUNNING);
- Assert.assertEquals(Util.parseResponse(prism.getFeedHelper().delete(URLS.DELETE_URL,
- feed)).getStatusCode(), 200);
+ Assert.assertEquals(Util.parseResponse(prism.getFeedHelper().delete(feed))
+ .getStatusCode(), 200);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, bundles[0], Job.Status.KILLED);
- ServiceResponse response = prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitAndSchedule(feed);
AssertUtil.assertSucceeded(response);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, bundles[0], Job.Status.RUNNING);
}
@@ -158,11 +153,10 @@ public class FeedSubmitAndScheduleTest extends BaseTestClass {
public void snsSuspendedFeed() throws Exception {
submitFirstClusterScheduleFirstFeed();
AssertUtil.checkStatus(clusterOC, EntityType.FEED, bundles[0], Job.Status.RUNNING);
- Assert.assertEquals(Util.parseResponse(
- prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed)).getStatusCode(), 200);
+ Assert.assertEquals(Util.parseResponse(prism.getFeedHelper().suspend(feed))
+ .getStatusCode(), 200);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, bundles[0], Job.Status.SUSPENDED);
- ServiceResponse response = prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitAndSchedule(feed);
AssertUtil.assertSucceeded(response);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, bundles[0], Job.Status.SUSPENDED);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitTest.java
index 72f4921..8d96741 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitTest.java
@@ -24,7 +24,6 @@ import org.apache.falcon.regression.core.helpers.ColoHelper;
import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
-import org.apache.falcon.regression.core.util.Util.URLS;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.log4j.Logger;
import org.testng.annotations.AfterClass;
@@ -54,7 +53,7 @@ public class FeedSubmitTest extends BaseTestClass {
//submit the cluster
ServiceResponse response =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
AssertUtil.assertSucceeded(response);
feed = bundles[0].getInputFeedFromBundle();
}
@@ -71,7 +70,7 @@ public class FeedSubmitTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void submitValidFeed() throws Exception {
- ServiceResponse response = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(response);
}
@@ -82,13 +81,13 @@ public class FeedSubmitTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void submitValidFeedPostDeletion() throws Exception {
- ServiceResponse response = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().delete(URLS.DELETE_URL, feed);
+ response = prism.getFeedHelper().delete(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ response = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(response);
}
@@ -99,13 +98,13 @@ public class FeedSubmitTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void submitValidFeedPostGet() throws Exception {
- ServiceResponse response = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().getEntityDefinition(URLS.GET_ENTITY_DEFINITION, feed);
+ response = prism.getFeedHelper().getEntityDefinition(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ response = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(response);
}
@@ -116,10 +115,10 @@ public class FeedSubmitTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void submitValidFeedTwice() throws Exception {
- ServiceResponse response = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ response = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(response);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSuspendTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSuspendTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSuspendTest.java
index 1973bf5..9676a30 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSuspendTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSuspendTest.java
@@ -24,7 +24,6 @@ import org.apache.falcon.regression.core.helpers.ColoHelper;
import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
-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;
@@ -57,7 +56,7 @@ public class FeedSuspendTest extends BaseTestClass {
//submit the cluster
ServiceResponse response =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
AssertUtil.assertSucceeded(response);
feed = bundles[0].getInputFeedFromBundle();
@@ -76,11 +75,10 @@ public class FeedSuspendTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void suspendScheduledFeed() throws Exception {
- ServiceResponse response =
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitAndSchedule(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed);
+ response = prism.getFeedHelper().suspend(feed);
AssertUtil.assertSucceeded(response);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
}
@@ -93,14 +91,13 @@ public class FeedSuspendTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void suspendAlreadySuspendedFeed() throws Exception {
- ServiceResponse response =
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitAndSchedule(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed);
+ response = prism.getFeedHelper().suspend(feed);
AssertUtil.assertSucceeded(response);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
- response = prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed);
+ response = prism.getFeedHelper().suspend(feed);
AssertUtil.assertSucceeded(response);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
@@ -113,14 +110,13 @@ public class FeedSuspendTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void suspendDeletedFeed() throws Exception {
- ServiceResponse response =
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitAndSchedule(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().delete(URLS.DELETE_URL, feed);
+ response = prism.getFeedHelper().delete(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed);
+ response = prism.getFeedHelper().suspend(feed);
AssertUtil.assertFailed(response);
}
@@ -131,7 +127,7 @@ public class FeedSuspendTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void suspendNonExistentFeed() throws Exception {
- ServiceResponse response = prism.getFeedHelper().suspend(URLS.SCHEDULE_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().suspend(feed);
AssertUtil.assertFailed(response);
}
@@ -142,10 +138,10 @@ public class FeedSuspendTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void suspendSubmittedFeed() throws Exception {
- ServiceResponse response = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed);
+ response = prism.getFeedHelper().suspend(feed);
AssertUtil.assertFailed(response);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
index 75eccaf..db600ff 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
@@ -255,7 +255,7 @@ public class InstanceSummaryTest extends BaseTestClass {
feedInputPath, 1);*/
//submit and schedule feed
- prism.getFeedHelper().submitAndSchedule(Util.URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ prism.getFeedHelper().submitAndSchedule(feed);
InstancesSummaryResult r = prism.getFeedHelper()
.getInstanceSummary(Util.readEntityName(feed), "?start=" + startTime);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java
index c505a93..d4f31e9 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NewRetryTest.java
@@ -36,7 +36,6 @@ import org.apache.falcon.regression.core.util.OSUtil;
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.log4j.Logger;
@@ -114,14 +113,14 @@ public class NewRetryTest extends BaseTestClass {
public void testRetryInProcessZeroAttemptUpdate(Retry retry) throws Exception {
for (String data : bundles[0].getDataSets()) {
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, data));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(data));
}
bundles[0].setRetry(retry);
//submit and schedule process
ServiceResponse response =
- prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().submitEntity(bundles[0].getProcessData());
if (retry.getAttempts() <= 0 || retry.getDelay().getFrequencyAsInt() <= 0) {
AssertUtil.assertFailed(response);
@@ -133,7 +132,7 @@ public class NewRetryTest extends BaseTestClass {
//schedule process
AssertUtil.assertSucceeded(
- prism.getProcessHelper().schedule(URLS.SCHEDULE_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().schedule(bundles[0].getProcessData()));
//now wait till the process is over
String bundleId = OozieUtil.getBundles(clusterOC,
@@ -167,13 +166,13 @@ public class NewRetryTest extends BaseTestClass {
public void testRetryInProcessLowerAttemptUpdate(Retry retry) throws Exception {
for (String data : bundles[0].getDataSets()) {
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, data));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(data));
}
bundles[0].setRetry(retry);
//submit and schedule process
ServiceResponse response =
- prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().submitEntity(bundles[0].getProcessData());
if (retry.getAttempts() <= 0 || retry.getDelay().getFrequencyAsInt() <= 0) {
AssertUtil.assertFailed(response);
@@ -183,7 +182,7 @@ public class NewRetryTest extends BaseTestClass {
HadoopUtil.lateDataReplenish(clusterFS, 20, 0, lateDir);
//now wait till the process is over
AssertUtil.assertSucceeded(
- prism.getProcessHelper().schedule(URLS.SCHEDULE_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().schedule(bundles[0].getProcessData()));
String bundleId = OozieUtil.getBundles(clusterOC,
Util.readEntityName(bundles[0].getProcessData()), EntityType.PROCESS).get(0);
@@ -225,13 +224,13 @@ public class NewRetryTest extends BaseTestClass {
public void testRetryInProcessLowerManageableAttemptUpdate(Retry retry) throws Exception {
for (String data : bundles[0].getDataSets()) {
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, data));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(data));
}
bundles[0].setRetry(retry);
//submit and schedule process
ServiceResponse response =
- prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().submitEntity(bundles[0].getProcessData());
if (retry.getAttempts() <= 0 || retry.getDelay().getFrequencyAsInt() <= 0) {
AssertUtil.assertFailed(response);
@@ -241,7 +240,7 @@ public class NewRetryTest extends BaseTestClass {
HadoopUtil.lateDataReplenish(clusterFS, 20, 0, lateDir);
AssertUtil.assertSucceeded(
- prism.getProcessHelper().schedule(URLS.SCHEDULE_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().schedule(bundles[0].getProcessData()));
//now wait till the process is over
String bundleId = OozieUtil.getBundles(clusterOC,
Util.readEntityName(bundles[0].getProcessData()), EntityType.PROCESS).get(0);
@@ -278,13 +277,13 @@ public class NewRetryTest extends BaseTestClass {
public void testRetryInProcessLowerBoundaryAttemptUpdate(Retry retry) throws Exception {
for (String data : bundles[0].getDataSets()) {
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, data));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(data));
}
bundles[0].setRetry(retry);
//submit and schedule process
ServiceResponse response =
- prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().submitEntity(bundles[0].getProcessData());
if (retry.getAttempts() <= 0 || retry.getDelay().getFrequencyAsInt() <= 0) {
AssertUtil.assertFailed(response);
@@ -293,7 +292,7 @@ public class NewRetryTest extends BaseTestClass {
HadoopUtil.deleteDirIfExists(lateDir, clusterFS);
HadoopUtil.lateDataReplenish(clusterFS, 20, 0, lateDir);
AssertUtil.assertSucceeded(
- prism.getProcessHelper().schedule(URLS.SCHEDULE_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().schedule(bundles[0].getProcessData()));
//now wait till the process is over
String bundleId = OozieUtil.getBundles(clusterOC,
@@ -334,13 +333,13 @@ public class NewRetryTest extends BaseTestClass {
public void testRetryInProcessUpdate(Retry retry) throws Exception {
for (String data : bundles[0].getDataSets()) {
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, data));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(data));
}
bundles[0].setRetry(retry);
//submit and schedule process
ServiceResponse response =
- prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().submitEntity(bundles[0].getProcessData());
if (retry.getAttempts() <= 0 || retry.getDelay().getFrequencyAsInt() <= 0) {
AssertUtil.assertFailed(response);
@@ -349,7 +348,7 @@ public class NewRetryTest extends BaseTestClass {
HadoopUtil.deleteDirIfExists(lateDir, clusterFS);
HadoopUtil.lateDataReplenish(clusterFS, 20, 0, lateDir);
AssertUtil.assertSucceeded(
- prism.getProcessHelper().schedule(URLS.SCHEDULE_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().schedule(bundles[0].getProcessData()));
//now wait till the process is over
String bundleId = OozieUtil.getBundles(clusterOC,
Util.readEntityName(bundles[0].getProcessData()), EntityType.PROCESS).get(0);
@@ -383,13 +382,13 @@ public class NewRetryTest extends BaseTestClass {
public void testRetryInProcessHigherDelayUpdate(Retry retry) throws Exception {
for (String data : bundles[0].getDataSets()) {
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, data));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(data));
}
bundles[0].setRetry(retry);
//submit and schedule process
ServiceResponse response =
- prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().submitEntity(bundles[0].getProcessData());
if (retry.getAttempts() <= 0 || retry.getDelay().getFrequencyAsInt() <= 0) {
AssertUtil.assertFailed(response);
} else {
@@ -397,7 +396,7 @@ public class NewRetryTest extends BaseTestClass {
HadoopUtil.deleteDirIfExists(lateDir, clusterFS);
HadoopUtil.lateDataReplenish(clusterFS, 20, 0, lateDir);
AssertUtil.assertSucceeded(
- prism.getProcessHelper().schedule(URLS.SCHEDULE_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().schedule(bundles[0].getProcessData()));
//now wait till the process is over
String bundleId = OozieUtil.getBundles(clusterOC,
Util.readEntityName(bundles[0].getProcessData()), EntityType.PROCESS).get(0);
@@ -432,15 +431,14 @@ public class NewRetryTest extends BaseTestClass {
public void testRetryInProcessLowerDelayUpdate(Retry retry) throws Exception {
for (String data : bundles[0].getDataSets()) {
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, data));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(data));
}
bundles[0].setRetry(retry);
//submit and schedule process
ServiceResponse response =
- prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().submitEntity(bundles[0].getProcessData());
if (retry.getAttempts() <= 0 || retry.getDelay().getFrequencyAsInt() <= 0) {
AssertUtil.assertFailed(response);
@@ -449,7 +447,7 @@ public class NewRetryTest extends BaseTestClass {
HadoopUtil.deleteDirIfExists(lateDir, clusterFS);
HadoopUtil.lateDataReplenish(clusterFS, 20, 0, lateDir);
AssertUtil.assertSucceeded(
- prism.getProcessHelper().schedule(URLS.SCHEDULE_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().schedule(bundles[0].getProcessData()));
//now wait till the process is over
String bundleId = OozieUtil.getBundles(clusterOC,
Util.readEntityName(bundles[0].getProcessData()), EntityType.PROCESS).get(0);
@@ -487,14 +485,14 @@ public class NewRetryTest extends BaseTestClass {
public void testRetryInProcessZeroDelayUpdate(Retry retry) throws Exception {
for (String data : bundles[0].getDataSets()) {
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, data));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(data));
}
bundles[0].setRetry(retry);
//submit and schedule process
ServiceResponse response =
- prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().submitEntity(bundles[0].getProcessData());
if (retry.getAttempts() <= 0 || retry.getDelay().getFrequencyAsInt() <= 0) {
AssertUtil.assertFailed(response);
@@ -503,7 +501,7 @@ public class NewRetryTest extends BaseTestClass {
HadoopUtil.deleteDirIfExists(lateDir, clusterFS);
HadoopUtil.lateDataReplenish(clusterFS, 20, 0, lateDir);
AssertUtil.assertSucceeded(
- prism.getProcessHelper().schedule(URLS.SCHEDULE_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().schedule(bundles[0].getProcessData()));
//now wait till the process is over
String bundleId = OozieUtil.getBundles(clusterOC,
Util.readEntityName(bundles[0].getProcessData()), EntityType.PROCESS).get(0);
@@ -540,13 +538,13 @@ public class NewRetryTest extends BaseTestClass {
bundles[0].setRetry(retry);
for (String data : bundles[0].getDataSets()) {
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, data));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(data));
}
bundles[0].setProcessLatePolicy(null);
//submit and schedule process
ServiceResponse response =
- prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().submitEntity(bundles[0].getProcessData());
if (retry.getAttempts() <= 0 || retry.getDelay().getFrequencyAsInt() <= 0) {
AssertUtil.assertFailed(response);
@@ -555,7 +553,7 @@ public class NewRetryTest extends BaseTestClass {
HadoopUtil.deleteDirIfExists(lateDir, clusterFS);
HadoopUtil.lateDataReplenish(clusterFS, 20, 0, lateDir);
AssertUtil.assertSucceeded(
- prism.getProcessHelper().schedule(URLS.SCHEDULE_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().schedule(bundles[0].getProcessData()));
//now wait till the process is over
String bundleId = OozieUtil.getBundles(clusterOC,
Util.readEntityName(bundles[0].getProcessData()), EntityType.PROCESS).get(0);
@@ -578,14 +576,14 @@ public class NewRetryTest extends BaseTestClass {
bundles[0].setRetry(retry);
for (String data : bundles[0].getDataSets()) {
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, data));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(data));
}
logger.info("process dates: " + startDate + "," + endDate);
//submit and schedule process
ServiceResponse response =
- prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().submitEntity(bundles[0].getProcessData());
if (retry.getAttempts() <= 0 || retry.getDelay().getFrequencyAsInt() <= 0) {
AssertUtil.assertFailed(response);
@@ -594,7 +592,7 @@ public class NewRetryTest extends BaseTestClass {
HadoopUtil.deleteDirIfExists(lateDir, clusterFS);
HadoopUtil.lateDataReplenish(clusterFS, 20, 0, lateDir);
AssertUtil.assertSucceeded(
- prism.getProcessHelper().schedule(URLS.SCHEDULE_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().schedule(bundles[0].getProcessData()));
//now wait till the process is over
String bundleId = OozieUtil.getBundles(clusterOC,
@@ -632,14 +630,14 @@ public class NewRetryTest extends BaseTestClass {
bundles[0].setRetry(retry);
for (String data : bundles[0].getDataSets()) {
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, data));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(data));
}
logger.info("process dates: " + startDate + "," + endDate);
//submit and schedule process
ServiceResponse response =
- prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().submitEntity(bundles[0].getProcessData());
if (retry.getAttempts() <= 0 || retry.getDelay().getFrequencyAsInt() <= 0) {
AssertUtil.assertFailed(response);
@@ -648,7 +646,7 @@ public class NewRetryTest extends BaseTestClass {
HadoopUtil.deleteDirIfExists(lateDir, clusterFS);
HadoopUtil.lateDataReplenish(clusterFS, 20, 0, lateDir);
AssertUtil.assertSucceeded(
- prism.getProcessHelper().schedule(URLS.SCHEDULE_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().schedule(bundles[0].getProcessData()));
//now wait till the process is over
String bundleId = OozieUtil.getBundles(clusterOC,
Util.readEntityName(bundles[0].getProcessData()),
@@ -689,12 +687,12 @@ public class NewRetryTest extends BaseTestClass {
bundles[0].setRetry(retry);
for (String data : bundles[0].getDataSets()) {
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, data));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(data));
}
//submit and schedule process
ServiceResponse response =
- prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().submitEntity(bundles[0].getProcessData());
if (retry.getAttempts() <= 0 || retry.getDelay().getFrequencyAsInt() <= 0) {
AssertUtil.assertFailed(response);
@@ -703,7 +701,7 @@ public class NewRetryTest extends BaseTestClass {
HadoopUtil.deleteDirIfExists(lateDir, clusterFS);
HadoopUtil.lateDataReplenish(clusterFS, 20, 0, lateDir);
AssertUtil.assertSucceeded(
- prism.getProcessHelper().schedule(URLS.SCHEDULE_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().schedule(bundles[0].getProcessData()));
String bundleId = OozieUtil.getBundles(clusterOC,
Util.readEntityName(bundles[0].getProcessData()), EntityType.PROCESS).get(0);
List<DateTime> dates = null;
@@ -729,7 +727,7 @@ public class NewRetryTest extends BaseTestClass {
logger.info("now suspending the process altogether....");
AssertUtil.assertSucceeded(
- cluster.getProcessHelper().suspend(URLS.SUSPEND_URL, bundles[0].getProcessData()));
+ cluster.getProcessHelper().suspend(bundles[0].getProcessData()));
HashMap<String, Integer> initialMap = getFailureRetriesForEachWorkflow(
clusterOC, getDefaultOozieCoordinator(clusterOC, bundleId));
@@ -760,7 +758,7 @@ public class NewRetryTest extends BaseTestClass {
logger.info("now resuming the process...");
AssertUtil.assertSucceeded(
- cluster.getProcessHelper().resume(URLS.RESUME_URL, bundles[0].getProcessData()));
+ cluster.getProcessHelper().resume(bundles[0].getProcessData()));
//now to validate all failed instances to check if they were retried or not.
validateRetry(clusterOC, bundleId,
@@ -786,12 +784,12 @@ public class NewRetryTest extends BaseTestClass {
bundles[0].setRetry(retry);
for (String data : bundles[0].getDataSets()) {
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, data));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(data));
}
//submit and schedule process
ServiceResponse response =
- prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().submitEntity(bundles[0].getProcessData());
if (retry.getAttempts() <= 0 || retry.getDelay().getFrequencyAsInt() <= 0) {
AssertUtil.assertFailed(response);
@@ -803,7 +801,7 @@ public class NewRetryTest extends BaseTestClass {
Util.getHadoopDataFromDir(clusterFS, bundles[0].getInputFeedFromBundle(),
lateDir);
AssertUtil.assertSucceeded(
- prism.getProcessHelper().schedule(URLS.SCHEDULE_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().schedule(bundles[0].getProcessData()));
String bundleId = OozieUtil.getBundles(clusterOC,
Util.readEntityName(bundles[0].getProcessData()), EntityType.PROCESS).get(0);
List<DateTime> dates = null;
@@ -864,13 +862,13 @@ public class NewRetryTest extends BaseTestClass {
bundles[0].setRetry(retry);
for (String data : bundles[0].getDataSets()) {
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, data));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(data));
}
//submit and schedule process
ServiceResponse response =
- prism.getProcessHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().submitEntity(bundles[0].getProcessData());
if (retry.getAttempts() <= 0 || retry.getDelay().getFrequencyAsInt() <= 0) {
AssertUtil.assertFailed(response);
} else {
@@ -878,7 +876,7 @@ public class NewRetryTest extends BaseTestClass {
HadoopUtil.deleteDirIfExists(lateDir, clusterFS);
HadoopUtil.lateDataReplenish(clusterFS, 20, 0, lateDir);
AssertUtil.assertSucceeded(
- prism.getProcessHelper().schedule(URLS.SCHEDULE_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().schedule(bundles[0].getProcessData()));
//now wait till the process is over
String bundleId = OozieUtil.getBundles(clusterOC,
Util.readEntityName(bundles[0].getProcessData()), EntityType.PROCESS).get(0);
@@ -887,7 +885,7 @@ public class NewRetryTest extends BaseTestClass {
(bundles[0].getProcessObject().getRetry().getAttempts()) / 2);
AssertUtil.assertSucceeded(
- prism.getProcessHelper().delete(URLS.DELETE_URL, (bundles[0].getProcessData())));
+ prism.getProcessHelper().delete((bundles[0].getProcessData())));
if (retry.getPolicy() == PolicyType.EXP_BACKOFF) {
TimeUnit.MINUTES.sleep(retry.getDelay().getFrequencyAsInt() * ((retry.getAttempts()
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java
index 9c355a2..cf5ba0f 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java
@@ -32,7 +32,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.hadoop.fs.FileSystem;
@@ -182,12 +181,11 @@ public class ProcessInstanceColoMixedTest extends BaseTestClass {
LOGGER.info("feed02: " + Util.prettyPrintXml(feed02));
LOGGER.info("outputFeed: " + Util.prettyPrintXml(outputFeed));
- ServiceResponse r = prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed01);
+ ServiceResponse r = prism.getFeedHelper().submitAndSchedule(feed01);
AssertUtil.assertSucceeded(r);
- r = prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed02);
+ r = prism.getFeedHelper().submitAndSchedule(feed02);
AssertUtil.assertSucceeded(r);
- r = prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, outputFeed);
+ r = prism.getFeedHelper().submitAndSchedule(outputFeed);
AssertUtil.assertSucceeded(r);
//create a process with 2 clusters
@@ -219,8 +217,7 @@ public class ProcessInstanceColoMixedTest extends BaseTestClass {
//submit and schedule process
LOGGER.info("process: " + Util.prettyPrintXml(process));
- prism.getProcessHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, process);
+ prism.getProcessHelper().submitAndSchedule(process);
LOGGER.info("Wait till process goes into running ");
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java
index bfb8d52..2e774c2 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java
@@ -30,7 +30,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.log4j.Logger;
@@ -218,7 +217,7 @@ public class ProcessInstanceResumeTest extends BaseTestClass {
@Test(groups = {"singleCluster"})
public void testProcessInstanceResumeDeleted() throws Exception {
bundles[0].submitFeedsScheduleProcess(prism);
- prism.getProcessHelper().delete(URLS.DELETE_URL, bundles[0].getProcessData());
+ prism.getProcessHelper().delete(bundles[0].getProcessData());
InstancesResult r = prism.getProcessHelper().getProcessInstanceResume(processName,
"?start=2010-01-02T01:05Z");
InstanceUtil.validateSuccessWithStatusCode(r, ResponseKeys.PROCESS_NOT_FOUND);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java
index e92f6b8..7a7e735 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java
@@ -31,7 +31,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.log4j.Logger;
@@ -110,12 +109,11 @@ public class ProcessInstanceRunningTest extends BaseTestClass {
bundles[0].submitFeedsScheduleProcess(prism);
TimeUtil.sleepSeconds(TIMEOUT);
String process = bundles[0].getProcessData();
- AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(URLS.SUSPEND_URL, process));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(process));
TimeUtil.sleepSeconds(TIMEOUT);
- AssertUtil.assertSucceeded(prism.getProcessHelper().resume(URLS.RESUME_URL, process));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().resume(process));
TimeUtil.sleepSeconds(TIMEOUT);
- InstancesResult r = prism.getProcessHelper().getRunningInstance(URLS.INSTANCE_RUNNING,
- processName);
+ InstancesResult r = prism.getProcessHelper().getRunningInstance(processName);
InstanceUtil.validateSuccess(r, bundles[0], WorkflowStatus.RUNNING);
}
@@ -129,11 +127,9 @@ public class ProcessInstanceRunningTest extends BaseTestClass {
public void getSuspendedProcessInstance() throws Exception {
bundles[0].setProcessConcurrency(3);
bundles[0].submitFeedsScheduleProcess(prism);
- AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(URLS.SUSPEND_URL,
- bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
TimeUtil.sleepSeconds(TIMEOUT);
- InstancesResult r = prism.getProcessHelper().getRunningInstance(URLS.INSTANCE_RUNNING,
- processName);
+ InstancesResult r = prism.getProcessHelper().getRunningInstance(processName);
InstanceUtil.validateSuccessWOInstances(r);
}
@@ -146,8 +142,7 @@ public class ProcessInstanceRunningTest extends BaseTestClass {
@Test(groups = {"singleCluster"})
public void getRunningProcessInstance() throws Exception {
bundles[0].submitFeedsScheduleProcess(prism);
- InstancesResult r = prism.getProcessHelper().getRunningInstance(URLS.INSTANCE_RUNNING,
- processName);
+ InstancesResult r = prism.getProcessHelper().getRunningInstance(processName);
InstanceUtil.validateSuccess(r, bundles[0], WorkflowStatus.RUNNING);
}
@@ -158,8 +153,7 @@ public class ProcessInstanceRunningTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void getNonExistenceProcessInstance() throws Exception {
- InstancesResult r = prism.getProcessHelper().getRunningInstance(URLS.INSTANCE_RUNNING,
- "invalidName");
+ InstancesResult r = prism.getProcessHelper().getRunningInstance("invalidName");
Assert.assertEquals(r.getStatusCode(), ResponseKeys.PROCESS_NOT_FOUND,
"Unexpected status code");
}
@@ -172,9 +166,8 @@ public class ProcessInstanceRunningTest extends BaseTestClass {
@Test(groups = {"singleCluster"})
public void getKilledProcessInstance() throws Exception {
bundles[0].submitFeedsScheduleProcess(prism);
- prism.getProcessHelper().delete(URLS.DELETE_URL, bundles[0].getProcessData());
- InstancesResult r = prism.getProcessHelper().getRunningInstance(URLS.INSTANCE_RUNNING,
- processName);
+ prism.getProcessHelper().delete(bundles[0].getProcessData());
+ InstancesResult r = prism.getProcessHelper().getRunningInstance(processName);
Assert.assertEquals(r.getStatusCode(), ResponseKeys.PROCESS_NOT_FOUND,
"Unexpected status code");
}
@@ -189,8 +182,7 @@ public class ProcessInstanceRunningTest extends BaseTestClass {
public void getSucceededProcessInstance() throws Exception {
bundles[0].submitFeedsScheduleProcess(prism);
InstanceUtil.waitForBundleToReachState(cluster, processName, Job.Status.SUCCEEDED);
- InstancesResult r = prism.getProcessHelper().getRunningInstance(URLS.INSTANCE_RUNNING,
- processName);
+ InstancesResult r = prism.getProcessHelper().getRunningInstance(processName);
InstanceUtil.validateSuccessWOInstances(r);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java
index 8c82da9..12a3907 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java
@@ -32,7 +32,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;
@@ -216,8 +215,7 @@ public class ProcessInstanceStatusTest extends BaseTestClass {
@Test(groups = {"singleCluster"})
public void testProcessInstanceStatusKilled() throws Exception {
bundles[0].submitFeedsScheduleProcess(prism);
- AssertUtil.assertSucceeded(prism.getProcessHelper().delete(URLS.DELETE_URL,
- bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().delete(bundles[0].getProcessData()));
InstancesResult r = prism.getProcessHelper().getProcessInstanceStatus(processName,
"?start=2010-01-02T01:00Z&end=2010-01-02T01:20Z");
if ((r.getStatusCode() != ResponseKeys.PROCESS_NOT_FOUND)) {
@@ -234,8 +232,7 @@ public class ProcessInstanceStatusTest extends BaseTestClass {
@Test(groups = {"singleCluster"})
public void testProcessInstanceStatusOnlyStartSuspended() throws Exception {
bundles[0].submitFeedsScheduleProcess(prism);
- AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(URLS.SUSPEND_URL,
- bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
TimeUtil.sleepSeconds(TIMEOUT);
InstancesResult r = prism.getProcessHelper().getProcessInstanceStatus(processName,
"?start=2010-01-02T01:00Z");
@@ -289,9 +286,9 @@ public class ProcessInstanceStatusTest extends BaseTestClass {
bundles[0].submitFeedsScheduleProcess(prism);
String process = bundles[0].getProcessData();
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.RUNNING);
- prism.getProcessHelper().suspend(URLS.SUSPEND_URL, process);
+ prism.getProcessHelper().suspend(process);
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.SUSPENDED);
- prism.getProcessHelper().resume(URLS.RESUME_URL, process);
+ prism.getProcessHelper().resume(process);
TimeUtil.sleepSeconds(TIMEOUT);
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.RUNNING);
InstancesResult r = prism.getProcessHelper().getProcessInstanceStatus(processName,
@@ -348,7 +345,7 @@ public class ProcessInstanceStatusTest extends BaseTestClass {
String process = bundles[0].getProcessData();
bundles[0].submitFeedsScheduleProcess(prism);
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.RUNNING);
- AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(URLS.SUSPEND_URL, process));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(process));
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.SUSPENDED);
TimeUtil.sleepSeconds(TIMEOUT);
InstancesResult r = prism.getProcessHelper().getProcessInstanceStatus(processName,
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java
index 2a4f7f3..ebe6236 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java
@@ -32,7 +32,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.log4j.Logger;
@@ -241,11 +240,11 @@ public class ProcessInstanceSuspendTest extends BaseTestClass {
TimeUtil.sleepSeconds(TIMEOUT);
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, bundles[0].getProcessData(),
Job.Status.RUNNING);
- prism.getProcessHelper().getRunningInstance(URLS.INSTANCE_RUNNING, processName);
+ prism.getProcessHelper().getRunningInstance(processName);
InstancesResult r = prism.getProcessHelper().getProcessInstanceSuspend(processName,
"?start=2010-01-02T01:00Z");
InstanceUtil.validateSuccessOnlyStart(r, WorkflowStatus.SUSPENDED);
- prism.getProcessHelper().getRunningInstance(URLS.INSTANCE_RUNNING, processName);
+ prism.getProcessHelper().getRunningInstance(processName);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java
index 5d1f1b6..8b5c01c 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java
@@ -128,7 +128,7 @@ public class HCatFeedOperationsTest extends BaseTestClass {
feed = bundles[1].getInputFeedFromBundle();
FeedMerlin feedObj = new FeedMerlin(feed);
feedObj.setTableValue(dbName, randomTblName, FeedType.YEARLY.getHcatPathValue());
- ServiceResponse response = prism.getFeedHelper().submitEntity(Util.URLS.SUBMIT_URL, feedObj.toString());
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feedObj.toString());
AssertUtil.assertFailed(response);
}
@@ -144,13 +144,13 @@ public class HCatFeedOperationsTest extends BaseTestClass {
feed = bundles[0].getInputFeedFromBundle();
FeedMerlin feedObj = new FeedMerlin(feed);
feedObj.setTableValue(dbName, tableName, FeedType.YEARLY.getHcatPathValue());
- ServiceResponse response = prism.getFeedHelper().submitEntity(Util.URLS.SUBMIT_URL, feedObj.toString());
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feedObj.toString());
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().delete(Util.URLS.DELETE_URL, feedObj.toString());
+ response = prism.getFeedHelper().delete(feedObj.toString());
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().submitEntity(Util.URLS.SUBMIT_URL, feedObj.toString());
+ response = prism.getFeedHelper().submitEntity(feedObj.toString());
AssertUtil.assertSucceeded(response);
}
@@ -178,10 +178,7 @@ public class HCatFeedOperationsTest extends BaseTestClass {
Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET, null,
tableUri);
- AssertUtil.assertPartial(
- prism.getFeedHelper().submitAndSchedule(Util.URLS.SUBMIT_AND_SCHEDULE_URL,
- feed)
- );
+ AssertUtil.assertPartial(prism.getFeedHelper().submitAndSchedule(feed));
}
/**
@@ -209,10 +206,7 @@ public class HCatFeedOperationsTest extends BaseTestClass {
Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET, null,
tableUri);
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitAndSchedule(Util.URLS.SUBMIT_AND_SCHEDULE_URL,
- feed)
- );
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
Assert.assertEquals(InstanceUtil
.checkIfFeedCoordExist(cluster2.getFeedHelper(), Util.readEntityName(feed),
"REPLICATION"), 1);
@@ -231,19 +225,13 @@ public class HCatFeedOperationsTest extends BaseTestClass {
submitAndScheduleReplicationFeedWhenTableExistsOnSourceAndTarget();
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().suspend(Util.URLS.SUSPEND_URL,
- feed)
- );
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(feed));
//check that feed suspended on both clusters
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, feed, Job.Status.SUSPENDED);
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().resume(Util.URLS.RESUME_URL,
- feed)
- );
+ AssertUtil.assertSucceeded(prism.getFeedHelper().resume(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, feed, Job.Status.RUNNING);
@@ -259,10 +247,7 @@ public class HCatFeedOperationsTest extends BaseTestClass {
public void deleteReplicationFeed() throws Exception {
submitAndScheduleReplicationFeedWhenTableExistsOnSourceAndTarget();
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(Util.URLS.DELETE_URL,
- feed)
- );
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, feed, Job.Status.KILLED);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java
index 557a9f1..50ccd8a 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatReplicationTest.java
@@ -182,10 +182,7 @@ public class HCatReplicationTest extends BaseTestClass {
Util.readEntityName(bundles[1].getClusters().get(0)), ClusterType.TARGET, null,
tableUri);
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitAndSchedule(Util.URLS.SUBMIT_AND_SCHEDULE_URL,
- feed)
- );
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
TimeUtil.sleepSeconds(TIMEOUT);
//check if all coordinators exist
Assert.assertEquals(InstanceUtil
@@ -277,10 +274,7 @@ public class HCatReplicationTest extends BaseTestClass {
Util.readEntityName(bundles[2].getClusters().get(0)), ClusterType.TARGET, null,
tableUri);
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitAndSchedule(Util.URLS.SUBMIT_AND_SCHEDULE_URL,
- feed)
- );
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
TimeUtil.sleepSeconds(TIMEOUT);
//check if all coordinators exist
Assert.assertEquals(InstanceUtil
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatRetentionTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatRetentionTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatRetentionTest.java
index 5dc96e2..aae3125 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatRetentionTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatRetentionTest.java
@@ -32,7 +32,6 @@ import org.apache.falcon.regression.core.util.OSUtil;
import org.apache.falcon.regression.core.util.OozieUtil;
import org.apache.falcon.regression.core.util.HadoopUtil;
import org.apache.falcon.regression.core.util.TimeUtil;
-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.fs.Path;
@@ -105,7 +104,7 @@ public class HCatRetentionTest extends BaseTestClass {
.setRetentionValue(retentionUnit.getValue() + "(" + retentionPeriod + ")");
if (retentionPeriod <= 0) {
AssertUtil.assertFailed(prism.getFeedHelper()
- .submitEntity(URLS.SUBMIT_URL, bundle.getInputFeedFromBundle()));
+ .submitEntity(bundle.getInputFeedFromBundle()));
} else {
final DateTime dataStartTime = new DateTime(
feedElement.getClusters().getClusters().get(0).getValidity().getStart(),
@@ -127,12 +126,11 @@ public class HCatRetentionTest extends BaseTestClass {
AssertUtil.checkForListSizes(initialData, initialPtnList);
AssertUtil.assertSucceeded(prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feedElement.toString()));
+ .submitAndSchedule(feedElement.toString()));
final String bundleId = OozieUtil.getBundles(clusterOC, feedElement.getName(),
EntityType.FEED).get(0);
OozieUtil.waitForRetentionWorkflowToSucceed(bundleId, clusterOC);
- AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(URLS.SUSPEND_URL,
- feedElement.toString()));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(feedElement.toString()));
List<String> expectedOutput = getExpectedOutput(retentionPeriod, retentionUnit,
feedType, new DateTime(DateTimeZone.UTC), initialData);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
index 0c6ecae..143789f 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
@@ -38,7 +38,6 @@ import org.apache.falcon.regression.core.util.BundleUtil;
import org.apache.falcon.regression.core.util.CleanupUtil;
import org.apache.falcon.regression.core.util.Generator;
import org.apache.falcon.regression.core.util.GraphAssert;
-import org.apache.falcon.regression.core.util.Util;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.http.HttpResponse;
import org.apache.log4j.Logger;
@@ -91,8 +90,7 @@ public class LineageApiTest extends BaseTestClass {
Assert.assertEquals(clusterStrings.size(), 1, "Expecting only 1 clusterMerlin.");
clusterMerlin = new ClusterMerlin(clusterStrings.get(0));
clusterMerlin.setTags(testTag);
- AssertUtil.assertSucceeded(
- prism.getClusterHelper().submitEntity(Util.URLS.SUBMIT_URL, clusterMerlin.toString()));
+ AssertUtil.assertSucceeded(prism.getClusterHelper().submitEntity(clusterMerlin.toString()));
logger.info("numInputFeeds = " + numInputFeeds);
logger.info("numOutputFeeds = " + numOutputFeeds);
final FeedMerlin inputMerlin = new FeedMerlin(bundles[0].getInputFeedFromBundle());
@@ -101,8 +99,7 @@ public class LineageApiTest extends BaseTestClass {
Generator.getNameGenerator("infeed", inputMerlin.getName()),
Generator.getHadoopPathGenerator(feedInputPath, MINUTE_DATE_PATTERN));
for (FeedMerlin feed : inputFeeds) {
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(Util.URLS.SUBMIT_URL,
- feed.toString()));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(feed.toString()));
}
FeedMerlin outputMerlin = new FeedMerlin(bundles[0].getOutputFeedFromBundle());
@@ -111,8 +108,7 @@ public class LineageApiTest extends BaseTestClass {
Generator.getNameGenerator("outfeed", outputMerlin.getName()),
Generator.getHadoopPathGenerator(feedOutputPath, MINUTE_DATE_PATTERN));
for (FeedMerlin feed : outputFeeds) {
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(Util.URLS.SUBMIT_URL,
- feed.toString()));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(feed.toString()));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java
index 72d03cd..55d69a3 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java
@@ -89,8 +89,7 @@ public class EntityDryRunTest extends BaseTestClass {
public void testDryRunFailureScheduleProcess() throws Exception {
bundles[0].setProcessProperty("EntityDryRunTestProp", "${coord:someEL(1)");
bundles[0].submitProcess(true);
- ServiceResponse response = prism.getProcessHelper()
- .schedule(Util.URLS.SCHEDULE_URL, bundles[0].getProcessData());
+ ServiceResponse response = prism.getProcessHelper().schedule(bundles[0].getProcessData());
validate(response);
}
@@ -119,8 +118,7 @@ public class EntityDryRunTest extends BaseTestClass {
String feed = bundles[0].getInputFeedFromBundle();
feed = Util.setFeedProperty(feed, "EntityDryRunTestProp", "${coord:someEL(1)");
bundles[0].submitClusters(prism);
- ServiceResponse response = prism.getFeedHelper().submitAndSchedule(
- Util.URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitAndSchedule(feed);
validate(response);
}
@@ -131,8 +129,7 @@ public class EntityDryRunTest extends BaseTestClass {
public void testDryRunFailureUpdateFeed() throws Exception {
bundles[0].submitClusters(prism);
String feed = bundles[0].getInputFeedFromBundle();
- ServiceResponse response =
- prism.getFeedHelper().submitAndSchedule(Util.URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitAndSchedule(feed);
AssertUtil.assertSucceeded(response);
feed = Util.setFeedProperty(feed, "EntityDryRunTestProp", "${coord:someEL(1)");
response = prism.getFeedHelper().update(feed, feed);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java
index c234f0d..6298981 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java
@@ -26,7 +26,6 @@ import org.apache.falcon.regression.core.util.BundleUtil;
import org.apache.falcon.regression.core.util.InstanceUtil;
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.core.util.XmlUtil;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.log4j.Logger;
@@ -117,8 +116,7 @@ public class FeedDelayParallelTimeoutTest extends BaseTestClass {
feedOutput01 = Util.setFeedProperty(feedOutput01, "parallel", "3");
logger.info("feedOutput01: " + Util.prettyPrintXml(feedOutput01));
- prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feedOutput01);
+ prism.getFeedHelper().submitAndSchedule(feedOutput01);
}
@AfterClass(alwaysRun = true)
[5/5] git commit: FALCON-675 Request URLS moved from parameters into
methods in falcon-regression
Posted by ro...@apache.org.
FALCON-675 Request URLS moved from parameters into methods in falcon-regression
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/051a3d29
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/051a3d29
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/051a3d29
Branch: refs/heads/master
Commit: 051a3d29143e0bdaa74469916502114a64b18adb
Parents: 245b6b4
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Fri Sep 5 15:24:56 2014 +0300
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Mon Sep 8 16:05:41 2014 +0300
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 4 +
.../falcon/regression/core/bundle/Bundle.java | 54 +++----
.../core/helpers/ClusterEntityHelperImpl.java | 14 +-
.../core/interfaces/IEntityManagerHelper.java | 130 +++++++--------
.../regression/core/supportClasses/Brother.java | 16 +-
.../falcon/regression/core/util/BundleUtil.java | 3 +-
.../regression/core/util/CleanupUtil.java | 11 +-
.../falcon/regression/core/util/Util.java | 3 +-
.../falcon/regression/AuthorizationTest.java | 78 ++++-----
.../regression/EmbeddedPigScriptTest.java | 28 ++--
.../regression/FeedClusterUpdateTest.java | 76 ++++-----
.../regression/FeedInstanceStatusTest.java | 15 +-
.../falcon/regression/FeedReplicationTest.java | 12 +-
.../falcon/regression/FeedResumeTest.java | 26 ++-
.../falcon/regression/FeedScheduleTest.java | 27 ++--
.../falcon/regression/FeedStatusTest.java | 28 ++--
.../regression/FeedSubmitAndScheduleTest.java | 26 ++-
.../falcon/regression/FeedSubmitTest.java | 21 ++-
.../falcon/regression/FeedSuspendTest.java | 28 ++--
.../falcon/regression/InstanceSummaryTest.java | 2 +-
.../apache/falcon/regression/NewRetryTest.java | 92 ++++++-----
.../ProcessInstanceColoMixedTest.java | 11 +-
.../regression/ProcessInstanceResumeTest.java | 3 +-
.../regression/ProcessInstanceRunningTest.java | 28 ++--
.../regression/ProcessInstanceStatusTest.java | 13 +-
.../regression/ProcessInstanceSuspendTest.java | 5 +-
.../regression/hcat/HCatFeedOperationsTest.java | 33 ++--
.../regression/hcat/HCatReplicationTest.java | 10 +-
.../regression/hcat/HCatRetentionTest.java | 8 +-
.../regression/lineage/LineageApiTest.java | 10 +-
.../regression/prism/EntityDryRunTest.java | 9 +-
.../prism/FeedDelayParallelTimeoutTest.java | 4 +-
.../prism/NewPrismProcessUpdateTest.java | 114 +++++--------
.../prism/PrismClusterDeleteTest.java | 28 ++--
.../prism/PrismConcurrentRequestTest.java | 26 +--
.../regression/prism/PrismFeedDeleteTest.java | 109 +++++--------
.../prism/PrismFeedLateReplicationTest.java | 9 +-
.../PrismFeedReplicationPartitionExpTest.java | 30 ++--
.../prism/PrismFeedReplicationUpdateTest.java | 14 +-
.../regression/prism/PrismFeedResumeTest.java | 136 ++++++----------
.../regression/prism/PrismFeedScheduleTest.java | 4 +-
.../regression/prism/PrismFeedSnSTest.java | 116 ++++++--------
.../regression/prism/PrismFeedSuspendTest.java | 107 ++++---------
.../regression/prism/PrismFeedUpdateTest.java | 18 +--
.../prism/PrismProcessDeleteTest.java | 94 ++++-------
.../prism/PrismProcessResumeTest.java | 159 ++++++-------------
.../prism/PrismProcessScheduleTest.java | 53 +++----
.../regression/prism/PrismProcessSnSTest.java | 57 +++----
.../prism/PrismProcessSuspendTest.java | 97 ++++-------
.../regression/prism/PrismSubmitTest.java | 108 +++++--------
.../prism/RescheduleKilledProcessTest.java | 31 ++--
.../RescheduleProcessInFinalStatesTest.java | 20 ++-
.../falcon/regression/prism/RetentionTest.java | 6 +-
.../prism/UpdateAtSpecificTimeTest.java | 25 ++-
.../falcon/regression/ui/LineageGraphTest.java | 2 +-
.../falcon/regression/ui/ProcessUITest.java | 2 +-
56 files changed, 840 insertions(+), 1353 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 231f33e..b74a4ee 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -9,8 +9,12 @@ Trunk (Unreleased)
via Samarth Gupta)
IMPROVEMENTS
+ FALCON-675 Request URLS moved from parameters into methods in falcon-regression (Ruslan
+ Ostafiychuk)
+
FALCON-656 add test in falcon regression's Authorization test where non-feed owner updates
a feed with a dependent process(Karishma via Samarth Gupta)
+
FALCON-674 General code factored out for ProcessInstance* tests (Paul Isaychuk via Ruslan
Ostafiychuk)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java
index 57c7292..6d8b032 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java
@@ -46,7 +46,6 @@ import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.AssertUtil;
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.hadoop.security.authentication.client.AuthenticationException;
import org.apache.log4j.Logger;
import org.joda.time.DateTime;
@@ -80,22 +79,19 @@ public class Bundle {
public void submitFeed() throws URISyntaxException, IOException, AuthenticationException, JAXBException {
submitClusters(prismHelper);
- AssertUtil.assertSucceeded(
- prismHelper.getFeedHelper().submitEntity(URLS.SUBMIT_URL, dataSets.get(0)));
+ AssertUtil.assertSucceeded(prismHelper.getFeedHelper().submitEntity(dataSets.get(0)));
}
public void submitAndScheduleFeed() throws Exception {
submitClusters(prismHelper);
- AssertUtil.assertSucceeded(prismHelper.getFeedHelper().submitAndSchedule(
- URLS.SUBMIT_AND_SCHEDULE_URL, dataSets.get(0)));
+ AssertUtil.assertSucceeded(prismHelper.getFeedHelper().submitAndSchedule(dataSets.get(0)));
}
public void submitAndScheduleFeedUsingColoHelper(ColoHelper coloHelper) throws Exception {
submitFeed();
- AssertUtil.assertSucceeded(
- coloHelper.getFeedHelper().schedule(Util.URLS.SCHEDULE_URL, dataSets.get(0)));
+ AssertUtil.assertSucceeded(coloHelper.getFeedHelper().schedule(dataSets.get(0)));
}
public void submitAndScheduleAllFeeds()
@@ -103,8 +99,7 @@ public class Bundle {
submitClusters(prismHelper);
for (String feed : dataSets) {
- AssertUtil.assertSucceeded(
- prismHelper.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prismHelper.getFeedHelper().submitAndSchedule(feed));
}
}
@@ -112,8 +107,7 @@ public class Bundle {
IOException, URISyntaxException, AuthenticationException {
submitClusters(prismHelper);
submitFeeds(prismHelper);
- ServiceResponse r = prismHelper.getProcessHelper().submitEntity(URLS.SUBMIT_URL,
- processData);
+ ServiceResponse r = prismHelper.getProcessHelper().submitEntity(processData);
if (shouldSucceed) {
AssertUtil.assertSucceeded(r);
}
@@ -128,23 +122,20 @@ public class Bundle {
submitFeeds(prismHelper);
- AssertUtil.assertSucceeded(prismHelper.getProcessHelper().submitAndSchedule(
- URLS.SUBMIT_AND_SCHEDULE_URL, processData));
+ AssertUtil.assertSucceeded(prismHelper.getProcessHelper().submitAndSchedule(processData));
}
public void submitAndScheduleProcess() throws Exception {
submitAndScheduleAllFeeds();
- AssertUtil.assertSucceeded(prismHelper.getProcessHelper().submitAndSchedule(
- URLS.SUBMIT_AND_SCHEDULE_URL, processData));
+ AssertUtil.assertSucceeded(prismHelper.getProcessHelper().submitAndSchedule(processData));
}
public void submitAndScheduleProcessUsingColoHelper(ColoHelper coloHelper) throws Exception {
submitProcess(true);
- AssertUtil.assertSucceeded(
- coloHelper.getProcessHelper().schedule(URLS.SCHEDULE_URL, processData));
+ AssertUtil.assertSucceeded(coloHelper.getProcessHelper().schedule(processData));
}
public List<String> getClusters() {
@@ -271,7 +262,7 @@ public class Bundle {
//lets submit all data first
submitFeeds(helper);
- return helper.getProcessHelper().submitEntity(URLS.SUBMIT_URL, getProcessData());
+ return helper.getProcessHelper().submitEntity(getProcessData());
}
/**
@@ -293,8 +284,7 @@ public class Bundle {
}
//lets schedule the damn thing now :)
- ServiceResponse scheduleResult =
- helper.getProcessHelper().schedule(URLS.SCHEDULE_URL, getProcessData());
+ ServiceResponse scheduleResult = helper.getProcessHelper().schedule(getProcessData());
AssertUtil.assertSucceeded(scheduleResult);
TimeUtil.sleepSeconds(7);
return scheduleResult.getMessage();
@@ -696,16 +686,14 @@ public class Bundle {
public void submitClusters(ColoHelper helper, String user)
throws JAXBException, IOException, URISyntaxException, AuthenticationException {
for (String cluster : this.clusters) {
- AssertUtil.assertSucceeded(
- helper.getClusterHelper().submitEntity(URLS.SUBMIT_URL, cluster, user));
+ AssertUtil.assertSucceeded(helper.getClusterHelper().submitEntity(cluster, user));
}
}
public void submitFeeds(ColoHelper helper)
throws JAXBException, IOException, URISyntaxException, AuthenticationException {
for (String feed : this.dataSets) {
- AssertUtil.assertSucceeded(
- helper.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed));
+ AssertUtil.assertSucceeded(helper.getFeedHelper().submitEntity(feed));
}
}
@@ -757,14 +745,14 @@ public class Bundle {
public void deleteBundle(ColoHelper helper) {
try {
- helper.getProcessHelper().delete(URLS.DELETE_URL, getProcessData());
+ helper.getProcessHelper().delete(getProcessData());
} catch (Exception e) {
e.getStackTrace();
}
for (String dataset : getDataSets()) {
try {
- helper.getFeedHelper().delete(URLS.DELETE_URL, dataset);
+ helper.getFeedHelper().delete(dataset);
} catch (Exception e) {
e.getStackTrace();
}
@@ -772,7 +760,7 @@ public class Bundle {
for (String cluster : this.getClusters()) {
try {
- helper.getClusterHelper().delete(URLS.DELETE_URL, cluster);
+ helper.getClusterHelper().delete(cluster);
} catch (Exception e) {
e.getStackTrace();
}
@@ -807,8 +795,7 @@ public class Bundle {
for (Bundle bundle : bundles) {
ServiceResponse r =
- prismHelper.getClusterHelper()
- .submitEntity(URLS.SUBMIT_URL, bundle.getClusters().get(0));
+ prismHelper.getClusterHelper().submitEntity(bundle.getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"), r.getMessage());
}
@@ -871,21 +858,18 @@ public class Bundle {
throws IOException, JAXBException, URISyntaxException, AuthenticationException {
for (int i = 0; i < getClusters().size(); i++) {
- ServiceResponse r = helper.getClusterHelper()
- .submitEntity(URLS.SUBMIT_URL, getClusters().get(i));
+ ServiceResponse r = helper.getClusterHelper().submitEntity(getClusters().get(i));
if (checkSuccess) {
AssertUtil.assertSucceeded(r);
}
}
for (int i = 0; i < getDataSets().size(); i++) {
- ServiceResponse r = helper.getFeedHelper().submitAndSchedule(
- URLS.SUBMIT_AND_SCHEDULE_URL, getDataSets().get(i));
+ ServiceResponse r = helper.getFeedHelper().submitAndSchedule(getDataSets().get(i));
if (checkSuccess) {
AssertUtil.assertSucceeded(r);
}
}
- ServiceResponse r = helper.getProcessHelper().submitAndSchedule(
- URLS.SUBMIT_AND_SCHEDULE_URL, getProcessData());
+ ServiceResponse r = helper.getProcessHelper().submitAndSchedule(getProcessData());
if (checkSuccess) {
AssertUtil.assertSucceeded(r);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/ClusterEntityHelperImpl.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/ClusterEntityHelperImpl.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/ClusterEntityHelperImpl.java
index babf178..49e4b06 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/ClusterEntityHelperImpl.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/helpers/ClusterEntityHelperImpl.java
@@ -23,7 +23,6 @@ import org.apache.falcon.regression.core.response.InstancesSummaryResult;
import org.apache.falcon.regression.core.response.InstancesResult;
import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.Util;
-import org.apache.falcon.regression.core.util.Util.URLS;
import java.io.IOException;
import java.net.URISyntaxException;
@@ -46,29 +45,28 @@ public class ClusterEntityHelperImpl extends IEntityManagerHelper {
return Util.readEntityName(entity);
}
- public ServiceResponse getStatus(URLS url, String data, String user) {
+ public ServiceResponse getStatus(String data, String user) {
throw new UnsupportedOperationException(INVALID_ERR);
}
- public ServiceResponse resume(URLS url, String data, String user) {
+ public ServiceResponse resume(String data, String user) {
throw new UnsupportedOperationException(INVALID_ERR);
}
- public ServiceResponse schedule(URLS url, String data, String user) {
+ public ServiceResponse schedule(String data, String user) {
throw new UnsupportedOperationException(INVALID_ERR);
}
- public ServiceResponse submitAndSchedule(URLS url, String data, String user) {
+ public ServiceResponse submitAndSchedule(String data, String user) {
throw new UnsupportedOperationException(INVALID_ERR);
}
- public ServiceResponse suspend(URLS url, String data, String user) {
+ public ServiceResponse suspend(String data, String user) {
throw new UnsupportedOperationException(INVALID_ERR);
}
@Override
- public InstancesResult getRunningInstance(
- URLS processRunningInstance, String name, String user) {
+ public InstancesResult getRunningInstance(String name, String user) {
throw new UnsupportedOperationException(INVALID_ERR);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/IEntityManagerHelper.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/IEntityManagerHelper.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/IEntityManagerHelper.java
index bf99740..7f8ac6a 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/IEntityManagerHelper.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/interfaces/IEntityManagerHelper.java
@@ -253,130 +253,122 @@ public abstract class IEntityManagerHelper {
return StringUtils.join(parts, "/");
}
- public ServiceResponse listEntities(URLS url)
+ public ServiceResponse listEntities()
throws IOException, URISyntaxException, AuthenticationException {
- return listEntities(url, null);
+ return listEntities(null);
}
- public ServiceResponse listEntities(Util.URLS url, String user)
+ public ServiceResponse listEntities(String user)
throws IOException, URISyntaxException, AuthenticationException {
LOGGER.info("fetching " + getEntityType() + " list");
- return Util.sendRequest(createUrl(this.hostname + url.getValue(), getEntityType() + colo),
- "get", null, user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.LIST_URL.getValue(),
+ getEntityType() + colo), "get", null, user);
}
- public ServiceResponse submitEntity(URLS url, String data)
+ public ServiceResponse submitEntity(String data)
throws IOException, URISyntaxException, AuthenticationException {
- return submitEntity(url, data, null);
+ return submitEntity(data, null);
}
- public ServiceResponse submitEntity(URLS url, String data, String user)
+ public ServiceResponse submitEntity(String data, String user)
throws IOException, URISyntaxException, AuthenticationException {
LOGGER.info("Submitting " + getEntityType() + ": \n" + Util.prettyPrintXml(data));
- return Util.sendRequest(createUrl(this.hostname + url.getValue(), getEntityType() + colo),
- "post", data, user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.SUBMIT_URL.getValue(),
+ getEntityType() + colo), "post", data, user);
}
- public ServiceResponse schedule(URLS scheduleUrl, String processData)
+ public ServiceResponse schedule(String processData)
throws IOException, URISyntaxException, AuthenticationException {
- return schedule(scheduleUrl, processData, null);
+ return schedule(processData, null);
}
- public ServiceResponse schedule(URLS scheduleUrl, String processData, String user)
+ public ServiceResponse schedule(String processData, String user)
throws IOException, URISyntaxException, AuthenticationException {
- return Util.sendRequest(createUrl(this.hostname + scheduleUrl.getValue(), getEntityType(),
- getEntityName(processData) + colo), "post", user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.SCHEDULE_URL.getValue(),
+ getEntityType(), getEntityName(processData) + colo), "post", user);
}
- public ServiceResponse submitAndSchedule(URLS url, String data)
+ public ServiceResponse submitAndSchedule(String data)
throws IOException, URISyntaxException, AuthenticationException {
- return submitAndSchedule(url, data, null);
+ return submitAndSchedule(data, null);
}
- public ServiceResponse submitAndSchedule(URLS url, String data, String user)
+ public ServiceResponse submitAndSchedule(String data, String user)
throws IOException, URISyntaxException, AuthenticationException {
LOGGER.info("Submitting " + getEntityType() + ": \n" + Util.prettyPrintXml(data));
- return Util.sendRequest(createUrl(this.hostname + url.getValue(), getEntityType()), "post",
- data, user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.SUBMIT_AND_SCHEDULE_URL.getValue(),
+ getEntityType()), "post", data, user);
}
- public ServiceResponse deleteByName(URLS deleteUrl, String entityName, String user)
+ public ServiceResponse deleteByName(String entityName, String user)
throws AuthenticationException, IOException, URISyntaxException {
- return Util.sendRequest(
- createUrl(this.hostname + deleteUrl.getValue(), getEntityType(), entityName + colo),
- "delete", user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.DELETE_URL.getValue(),
+ getEntityType(), entityName + colo), "delete", user);
}
- public ServiceResponse delete(URLS deleteUrl, String data)
+ public ServiceResponse delete(String data)
throws IOException, URISyntaxException, AuthenticationException {
- return delete(deleteUrl, data, null);
+ return delete(data, null);
}
- public ServiceResponse delete(URLS deleteUrl, String data, String user)
+ public ServiceResponse delete(String data, String user)
throws IOException, URISyntaxException, AuthenticationException {
- return Util.sendRequest(
- createUrl(this.hostname + deleteUrl.getValue(), getEntityType(),
- getEntityName(data) + colo),
- "delete", user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.DELETE_URL.getValue(),
+ getEntityType(), getEntityName(data) + colo), "delete", user);
}
- public ServiceResponse suspend(URLS suspendUrl, String data)
+ public ServiceResponse suspend(String data)
throws IOException, URISyntaxException, AuthenticationException {
- return suspend(suspendUrl, data, null);
+ return suspend(data, null);
}
- public ServiceResponse suspend(URLS url, String data, String user)
+ public ServiceResponse suspend(String data, String user)
throws IOException, URISyntaxException, AuthenticationException {
- return Util.sendRequest(
- createUrl(this.hostname + url.getValue(), getEntityType(), getEntityName(data) + colo),
- "post", user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.SUSPEND_URL.getValue(),
+ getEntityType(), getEntityName(data) + colo), "post", user);
}
- public ServiceResponse resume(URLS url, String data)
+ public ServiceResponse resume(String data)
throws IOException, URISyntaxException, AuthenticationException {
- return resume(url, data, null);
+ return resume(data, null);
}
- public ServiceResponse resume(URLS url, String data, String user)
+ public ServiceResponse resume(String data, String user)
throws IOException, URISyntaxException, AuthenticationException {
- return Util.sendRequest(
- createUrl(this.hostname + url.getValue(), getEntityType(), getEntityName(data) + colo),
- "post", user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.RESUME_URL.getValue(),
+ getEntityType(), getEntityName(data) + colo), "post", user);
}
- public ServiceResponse getStatus(URLS url, String data)
+ public ServiceResponse getStatus(String data)
throws IOException, URISyntaxException, AuthenticationException {
- return getStatus(url, data, null);
+ return getStatus(data, null);
}
- public ServiceResponse getStatus(Util.URLS url, String data, String user)
+ public ServiceResponse getStatus(String data, String user)
throws IOException, URISyntaxException, AuthenticationException {
- return Util.sendRequest(
- createUrl(this.hostname + url.getValue(), getEntityType(), getEntityName(data) + colo),
- "get", user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.STATUS_URL.getValue(),
+ getEntityType(), getEntityName(data) + colo), "get", user);
}
- public ServiceResponse getEntityDefinition(URLS url, String data)
+ public ServiceResponse getEntityDefinition(String data)
throws IOException, URISyntaxException, AuthenticationException {
- return getEntityDefinition(url, data, null);
+ return getEntityDefinition(data, null);
}
- public ServiceResponse getEntityDefinition(URLS url, String data, String user)
+ public ServiceResponse getEntityDefinition(String data, String user)
throws IOException, URISyntaxException, AuthenticationException {
- return Util.sendRequest(
- createUrl(this.hostname + url.getValue(), getEntityType(), getEntityName(data) + colo),
- "get", user);
+ return Util.sendRequest(createUrl(this.hostname + URLS.GET_ENTITY_DEFINITION.getValue(),
+ getEntityType(), getEntityName(data) + colo), "get", user);
}
- public InstancesResult getRunningInstance(URLS processRunningInstance, String name)
+ public InstancesResult getRunningInstance(String name)
throws IOException, URISyntaxException, AuthenticationException {
- return getRunningInstance(processRunningInstance, name, null);
+ return getRunningInstance(name, null);
}
- public InstancesResult getRunningInstance(
- URLS processRunningInstance, String name, String user)
+ public InstancesResult getRunningInstance(String name, String user)
throws IOException, URISyntaxException, AuthenticationException {
- String url = createUrl(this.hostname + processRunningInstance.getValue(), getEntityType(),
+ String url = createUrl(this.hostname + URLS.INSTANCE_RUNNING.getValue(), getEntityType(),
name + allColo);
return (InstancesResult) InstanceUtil.sendRequestProcessInstance(url, user);
}
@@ -389,8 +381,8 @@ public abstract class IEntityManagerHelper {
public InstancesResult getProcessInstanceStatus(
String entityName, String params, String user)
throws IOException, URISyntaxException, AuthenticationException {
- String url = createUrl(this.hostname + Util.URLS.INSTANCE_STATUS.getValue(),
- getEntityType(), entityName, "");
+ String url = createUrl(this.hostname + URLS.INSTANCE_STATUS.getValue(), getEntityType(),
+ entityName, "");
return (InstancesResult) InstanceUtil
.createAndSendRequestProcessInstance(url, params, allColo, user);
}
@@ -404,8 +396,8 @@ public abstract class IEntityManagerHelper {
public InstancesResult getProcessInstanceSuspend(
String entityName, String params, String user)
throws IOException, URISyntaxException, AuthenticationException {
- String url = createUrl(this.hostname + Util.URLS.INSTANCE_SUSPEND.getValue(),
- getEntityType(), entityName, "");
+ String url = createUrl(this.hostname + URLS.INSTANCE_SUSPEND.getValue(), getEntityType(),
+ entityName, "");
return (InstancesResult) InstanceUtil
.createAndSendRequestProcessInstance(url, params, allColo, user);
}
@@ -417,7 +409,7 @@ public abstract class IEntityManagerHelper {
public ServiceResponse update(String oldEntity, String newEntity, String user)
throws IOException, URISyntaxException, AuthenticationException {
- String url = createUrl(this.hostname + Util.URLS.UPDATE.getValue(), getEntityType(),
+ String url = createUrl(this.hostname + URLS.UPDATE.getValue(), getEntityType(),
getEntityName(oldEntity));
return Util.sendRequest(url + colo, "post", newEntity, user);
}
@@ -468,8 +460,8 @@ public abstract class IEntityManagerHelper {
public InstancesResult getProcessInstanceResume(String entityName, String params,
String user)
throws IOException, URISyntaxException, AuthenticationException {
- String url = createUrl(this.hostname + Util.URLS.INSTANCE_RESUME.getValue(),
- getEntityType(), entityName, "");
+ String url = createUrl(this.hostname + URLS.INSTANCE_RESUME.getValue(), getEntityType(),
+ entityName, "");
return (InstancesResult) InstanceUtil
.createAndSendRequestProcessInstance(url, params, allColo, user);
}
@@ -504,8 +496,8 @@ public abstract class IEntityManagerHelper {
public InstancesResult getInstanceParams(String entityName, String params)
throws AuthenticationException, IOException, URISyntaxException {
- String url = createUrl(this.hostname + Util.URLS.INSTANCE_PARAMS.getValue(),
- getEntityType(), entityName, "");
+ String url = createUrl(this.hostname + URLS.INSTANCE_PARAMS.getValue(), getEntityType(),
+ entityName, "");
return (InstancesResult) InstanceUtil
.createAndSendRequestProcessInstance(url, params, allColo, null);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/Brother.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/Brother.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/Brother.java
index 3fa17e2..5d2708a 100755
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/Brother.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/supportClasses/Brother.java
@@ -76,28 +76,28 @@ public class Brother extends Thread {
try {
switch (url) {
case SUBMIT_URL:
- output = entityManagerHelper.submitEntity(url, data);
+ output = entityManagerHelper.submitEntity(data);
break;
case GET_ENTITY_DEFINITION:
- output = entityManagerHelper.getEntityDefinition(url, data);
+ output = entityManagerHelper.getEntityDefinition(data);
break;
case DELETE_URL:
- output = entityManagerHelper.delete(url, data);
+ output = entityManagerHelper.delete(data);
break;
case SUSPEND_URL:
- output = entityManagerHelper.suspend(url, data);
+ output = entityManagerHelper.suspend(data);
break;
case SCHEDULE_URL:
- output = entityManagerHelper.schedule(url, data);
+ output = entityManagerHelper.schedule(data);
break;
case RESUME_URL:
- output = entityManagerHelper.resume(url, data);
+ output = entityManagerHelper.resume(data);
break;
case SUBMIT_AND_SCHEDULE_URL:
- output = entityManagerHelper.submitAndSchedule(url, data);
+ output = entityManagerHelper.submitAndSchedule(data);
break;
case STATUS_URL:
- output = entityManagerHelper.getStatus(url, data);
+ output = entityManagerHelper.getStatus(data);
break;
default:
LOGGER.error("Unexpected url: " + url);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
index a069dc5..922c030 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
@@ -118,8 +118,7 @@ public final class BundleUtil {
public static void submitAllClusters(ColoHelper prismHelper, Bundle... b)
throws IOException, URISyntaxException, AuthenticationException {
for (Bundle aB : b) {
- ServiceResponse r = prismHelper.getClusterHelper()
- .submitEntity(Util.URLS.SUBMIT_URL, aB.getClusters().get(0));
+ ServiceResponse r = prismHelper.getClusterHelper().submitEntity(aB.getClusters().get(0));
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java
index 5415083..bf99291 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/CleanupUtil.java
@@ -73,8 +73,7 @@ public final class CleanupUtil {
private static EntitiesResult getEntitiesResultOfOneType(
IEntityManagerHelper iEntityManagerHelper)
throws IOException, URISyntaxException, AuthenticationException, JAXBException {
- final ServiceResponse clusterResponse =
- iEntityManagerHelper.listEntities(Util.URLS.LIST_URL);
+ final ServiceResponse clusterResponse = iEntityManagerHelper.listEntities();
JAXBContext jc = JAXBContext.newInstance(EntitiesResult.class);
Unmarshaller u = jc.createUnmarshaller();
return (EntitiesResult) u.unmarshal(
@@ -86,7 +85,7 @@ public final class CleanupUtil {
final List<String> clusters = getAllClusters(prism);
for (String cluster : clusters) {
try {
- prism.getClusterHelper().deleteByName(Util.URLS.DELETE_URL, cluster, null);
+ prism.getClusterHelper().deleteByName(cluster, null);
} catch (Exception e) {
LOGGER.warn("Caught exception: " + ExceptionUtils.getStackTrace(e));
}
@@ -103,7 +102,7 @@ public final class CleanupUtil {
final List<String> feeds = getAllFeeds(prism);
for (String feed : feeds) {
try {
- prism.getFeedHelper().deleteByName(Util.URLS.DELETE_URL, feed, null);
+ prism.getFeedHelper().deleteByName(feed, null);
} catch (Exception e) {
LOGGER.warn("Caught exception: " + ExceptionUtils.getStackTrace(e));
}
@@ -121,7 +120,7 @@ public final class CleanupUtil {
final List<String> processes = getAllProcesses(prism);
for (String process : processes) {
try {
- entityManagerHelper.deleteByName(Util.URLS.DELETE_URL, process, null);
+ entityManagerHelper.deleteByName(process, null);
} catch (Exception e) {
LOGGER.warn("Caught exception: " + ExceptionUtils.getStackTrace(e));
}
@@ -141,7 +140,7 @@ public final class CleanupUtil {
public static void deleteQuietly(IEntityManagerHelper helper, String feed) {
try {
- helper.delete(Util.URLS.DELETE_URL, feed);
+ helper.delete(feed);
} catch (Exception e) {
LOGGER.info("Caught exception: " + ExceptionUtils.getStackTrace(e));
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java
index 6485784..8fdf65a 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/Util.java
@@ -608,8 +608,7 @@ public final class Util {
} else {
helper = cluster.getClusterHelper();
}
- ServiceResponse response = helper.getEntityDefinition(URLS
- .GET_ENTITY_DEFINITION, entity);
+ ServiceResponse response = helper.getEntityDefinition(entity);
if (shouldReturn) {
AssertUtil.assertSucceeded(response);
} else {
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java
index 49b13b5..b309ea7 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java
@@ -96,7 +96,7 @@ public class AuthorizationTest extends BaseTestClass {
bundles[0].submitClusters(prism);
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
final ServiceResponse serviceResponse = prism.getClusterHelper().delete(
- Util.URLS.DELETE_URL, bundles[0].getClusters().get(0), MerlinConstants.USER2_NAME);
+ bundles[0].getClusters().get(0), MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Entity submitted by first user should not be deletable by second user");
}
@@ -109,7 +109,7 @@ public class AuthorizationTest extends BaseTestClass {
bundles[0].submitProcess(true);
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
final ServiceResponse serviceResponse = prism.getProcessHelper().delete(
- Util.URLS.DELETE_URL, bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
+ bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Entity submitted by first user should not be deletable by second user");
}
@@ -122,7 +122,7 @@ public class AuthorizationTest extends BaseTestClass {
bundles[0].submitFeed();
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
final ServiceResponse serviceResponse = prism.getFeedHelper().delete(
- Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0), MerlinConstants.USER2_NAME);
+ bundles[0].getDataSets().get(0), MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Entity submitted by first user should not be deletable by second user");
}
@@ -138,8 +138,8 @@ public class AuthorizationTest extends BaseTestClass {
Job.Status.RUNNING);
//try to delete process by U2
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
- final ServiceResponse serviceResponse = prism.getProcessHelper().delete(Util.URLS
- .DELETE_URL, bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
+ final ServiceResponse serviceResponse = prism.getProcessHelper()
+ .delete(bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Process scheduled by first user should not be deleted by second user");
}
@@ -151,13 +151,11 @@ public class AuthorizationTest extends BaseTestClass {
String feed = bundles[0].getInputFeedFromBundle();
//submit, schedule feed by U1
bundles[0].submitClusters(prism);
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(
- Util.URLS.SUBMIT_AND_SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
//delete feed by U2
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
- final ServiceResponse serviceResponse = prism.getFeedHelper().delete(Util.URLS
- .DELETE_URL, feed, MerlinConstants.USER2_NAME);
+ final ServiceResponse serviceResponse = prism.getFeedHelper().delete(feed, MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Feed scheduled by first user should not be deleted by second user");
}
@@ -170,14 +168,13 @@ public class AuthorizationTest extends BaseTestClass {
bundles[0].submitFeedsScheduleProcess(prism);
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, bundles[0].getProcessData(),
Job.Status.RUNNING);
- AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL,
- bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, bundles[0].getProcessData(),
Job.Status.SUSPENDED);
//try to delete process by U2
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
- final ServiceResponse serviceResponse = prism.getProcessHelper().delete(Util.URLS
- .DELETE_URL, bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
+ final ServiceResponse serviceResponse = prism.getProcessHelper()
+ .delete(bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Process suspended by first user should not be deleted by second user");
}
@@ -189,14 +186,13 @@ public class AuthorizationTest extends BaseTestClass {
String feed = bundles[0].getInputFeedFromBundle();
//submit, schedule, suspend feed by U1
bundles[0].submitClusters(prism);
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(
- Util.URLS.SUBMIT_AND_SCHEDULE_URL, feed));
- AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(Util.URLS.SUSPEND_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
//delete feed by U2
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
- final ServiceResponse serviceResponse = prism.getFeedHelper().delete(Util.URLS
- .DELETE_URL, feed, MerlinConstants.USER2_NAME);
+ final ServiceResponse serviceResponse = prism.getFeedHelper()
+ .delete(feed, MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Feed scheduled by first user should not be deleted by second user");
}
@@ -211,13 +207,12 @@ public class AuthorizationTest extends BaseTestClass {
String feed = bundles[0].getInputFeedFromBundle();
//submit, schedule by U1
bundles[0].submitClusters(prism);
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(
- Util.URLS.SUBMIT_AND_SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
//try to suspend by U2
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
- final ServiceResponse serviceResponse = prism.getFeedHelper().suspend(Util.URLS
- .SUSPEND_URL, feed, MerlinConstants.USER2_NAME);
+ final ServiceResponse serviceResponse = prism.getFeedHelper()
+ .suspend(feed, MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Feed scheduled by first user should not be suspended by second user");
}
@@ -231,8 +226,8 @@ public class AuthorizationTest extends BaseTestClass {
Job.Status.RUNNING);
//try to suspend process by U2
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
- final ServiceResponse serviceResponse = prism.getProcessHelper().suspend(Util.URLS
- .SUSPEND_URL, bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
+ final ServiceResponse serviceResponse = prism.getProcessHelper()
+ .suspend(bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Process scheduled by first user should not be suspended by second user");
}
@@ -247,14 +242,13 @@ public class AuthorizationTest extends BaseTestClass {
String feed = bundles[0].getInputFeedFromBundle();
//submit, schedule and then suspend feed by User1
bundles[0].submitClusters(prism);
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(
- Util.URLS.SUBMIT_AND_SCHEDULE_URL, feed));
- AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(Util.URLS.SUSPEND_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
//try to resume feed by User2
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
- final ServiceResponse serviceResponse = prism.getFeedHelper().resume(Util.URLS
- .RESUME_URL, feed, MerlinConstants.USER2_NAME);
+ final ServiceResponse serviceResponse = prism.getFeedHelper()
+ .resume(feed, MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Feed suspended by first user should not be resumed by second user");
}
@@ -265,14 +259,13 @@ public class AuthorizationTest extends BaseTestClass {
public void u1SuspendU2ResumeProcess() throws Exception {
//submit, schedule, suspend process by U1
bundles[0].submitFeedsScheduleProcess(prism);
- AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(Util.URLS.SUSPEND_URL,
- bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, bundles[0].getProcessData(),
Job.Status.SUSPENDED);
//try to resume process by U2
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
- final ServiceResponse serviceResponse = prism.getProcessHelper().resume(Util.URLS
- .RESUME_URL, bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
+ final ServiceResponse serviceResponse = prism.getProcessHelper()
+ .resume(bundles[0].getProcessData(), MerlinConstants.USER2_NAME);
AssertUtil.assertFailedWithStatus(serviceResponse, HttpStatus.SC_BAD_REQUEST,
"Process suspended by first user should not be resumed by second user");
}
@@ -529,10 +522,8 @@ public class AuthorizationTest extends BaseTestClass {
String feed = bundles[0].getInputFeedFromBundle();
//submit feed
bundles[0].submitClusters(prism);
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(Util.URLS.SUBMIT_URL, feed));
- String definition = prism.getFeedHelper()
- .getEntityDefinition(Util.URLS.GET_ENTITY_DEFINITION,
- feed).getMessage();
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(feed));
+ String definition = prism.getFeedHelper().getEntityDefinition(feed).getMessage();
Assert.assertTrue(definition.contains(Util
.readEntityName(feed)) && !definition.contains("(feed) not found"),
"Feed should be already submitted");
@@ -555,8 +546,7 @@ public class AuthorizationTest extends BaseTestClass {
String feed = bundles[0].getInputFeedFromBundle();
//submit and schedule feed
bundles[0].submitClusters(prism);
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(
- Util.URLS.SUBMIT_AND_SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
//update feed definition
String newFeed = Util.setFeedPathValue(feed, baseHDFSDir + "/randomPath" +
@@ -579,8 +569,7 @@ public class AuthorizationTest extends BaseTestClass {
//submit process
bundles[0].submitBundle(prism);
String definition = prism.getProcessHelper()
- .getEntityDefinition(Util.URLS.GET_ENTITY_DEFINITION,
- bundles[0].getProcessData()).getMessage();
+ .getEntityDefinition(bundles[0].getProcessData()).getMessage();
Assert.assertTrue(definition.contains(processName)
&&
!definition.contains("(process) not found"), "Process should be already submitted");
@@ -627,14 +616,13 @@ public class AuthorizationTest extends BaseTestClass {
bundles[0].submitClusters(prism);
bundles[0].submitFeeds(prism);
//schedule input feed by U1
- AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(
- Util.URLS.SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
//by U2 schedule process dependant on scheduled feed by U1
KerberosHelper.loginFromKeytab(MerlinConstants.USER2_NAME);
- ServiceResponse serviceResponse = prism.getProcessHelper().submitAndSchedule(Util
- .URLS.SUBMIT_AND_SCHEDULE_URL, process, MerlinConstants.USER2_NAME);
+ ServiceResponse serviceResponse = prism.getProcessHelper()
+ .submitAndSchedule(process, MerlinConstants.USER2_NAME);
AssertUtil.assertSucceeded(serviceResponse);
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.RUNNING);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
index a0986fa..99ffe37 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
@@ -37,7 +37,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.log4j.Logger;
@@ -126,41 +125,37 @@ public class EmbeddedPigScriptTest extends BaseTestClass {
@Test(groups = {"singleCluster"})
public void getResumedProcessInstance() throws Exception {
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.RUNNING);
- prism.getProcessHelper().suspend(URLS.SUSPEND_URL, process);
+ prism.getProcessHelper().suspend(process);
TimeUtil.sleepSeconds(TIMEOUT);
- ServiceResponse status = prism.getProcessHelper().getStatus(URLS.STATUS_URL, process);
+ ServiceResponse status = prism.getProcessHelper().getStatus(process);
Assert.assertTrue(status.getMessage().contains("SUSPENDED"), "Process not suspended.");
- prism.getProcessHelper().resume(URLS.RESUME_URL, process);
+ prism.getProcessHelper().resume(process);
TimeUtil.sleepSeconds(TIMEOUT);
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.RUNNING);
- InstancesResult r = prism.getProcessHelper()
- .getRunningInstance(URLS.INSTANCE_RUNNING, processName);
+ InstancesResult r = prism.getProcessHelper().getRunningInstance(processName);
InstanceUtil.validateSuccess(r, bundles[0], WorkflowStatus.RUNNING);
}
@Test(groups = {"singleCluster"})
public void getSuspendedProcessInstance() throws Exception {
- prism.getProcessHelper().suspend(URLS.SUSPEND_URL, process);
+ prism.getProcessHelper().suspend(process);
TimeUtil.sleepSeconds(TIMEOUT);
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.SUSPENDED);
- InstancesResult r = prism.getProcessHelper()
- .getRunningInstance(URLS.INSTANCE_RUNNING, processName);
+ InstancesResult r = prism.getProcessHelper().getRunningInstance(processName);
InstanceUtil.validateSuccessWOInstances(r);
}
@Test(groups = {"singleCluster"})
public void getRunningProcessInstance() throws Exception {
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.RUNNING);
- InstancesResult r = prism.getProcessHelper()
- .getRunningInstance(URLS.INSTANCE_RUNNING, processName);
+ InstancesResult r = prism.getProcessHelper().getRunningInstance(processName);
InstanceUtil.validateSuccess(r, bundles[0], WorkflowStatus.RUNNING);
}
@Test(groups = {"singleCluster"})
public void getKilledProcessInstance() throws Exception {
- prism.getProcessHelper().delete(URLS.DELETE_URL, process);
- InstancesResult r = prism.getProcessHelper()
- .getRunningInstance(URLS.INSTANCE_RUNNING, processName);
+ prism.getProcessHelper().delete(process);
+ InstancesResult r = prism.getProcessHelper().getRunningInstance(processName);
Assert.assertEquals(r.getStatusCode(), ResponseKeys.PROCESS_NOT_FOUND,
"Unexpected status code");
}
@@ -168,13 +163,12 @@ public class EmbeddedPigScriptTest extends BaseTestClass {
@Test(groups = {"singleCluster"})
public void getSucceededProcessInstance() throws Exception {
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, process, Job.Status.RUNNING);
- InstancesResult r = prism.getProcessHelper()
- .getRunningInstance(URLS.INSTANCE_RUNNING, processName);
+ InstancesResult r = prism.getProcessHelper().getRunningInstance(processName);
InstanceUtil.validateSuccess(r, bundles[0], WorkflowStatus.RUNNING);
int counter = OSUtil.IS_WINDOWS ? 100 : 50;
InstanceUtil.waitForBundleToReachState(cluster, Util.getProcessName(bundles[0]
.getProcessData()), Job.Status.SUCCEEDED, counter);
- r = prism.getProcessHelper().getRunningInstance(URLS.INSTANCE_RUNNING, processName);
+ r = prism.getProcessHelper().getRunningInstance(processName);
InstanceUtil.validateSuccessWOInstances(r);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
index 17120e9..3499a4b 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
@@ -30,7 +30,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.hadoop.fs.FileSystem;
@@ -126,13 +125,12 @@ public class FeedClusterUpdateTest extends BaseTestClass {
logger.info("Feed: " + Util.prettyPrintXml(feedOriginalSubmit));
- ServiceResponse response =
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feedOriginalSubmit);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feedOriginalSubmit);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(response);
//schedule on source
- response = cluster2.getFeedHelper().schedule(URLS.SCHEDULE_URL, feedOriginalSubmit);
+ response = cluster2.getFeedHelper().schedule(feedOriginalSubmit);
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
@@ -184,8 +182,7 @@ public class FeedClusterUpdateTest extends BaseTestClass {
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
- prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feedUpdated);
+ prism.getFeedHelper().submitAndSchedule(feedUpdated);
Assert.assertEquals(InstanceUtil
.checkIfFeedCoordExist(cluster2.getFeedHelper(), Util.readEntityName(feedUpdated),
"REPLICATION"), 0);
@@ -224,13 +221,12 @@ public class FeedClusterUpdateTest extends BaseTestClass {
logger.info("Feed: " + Util.prettyPrintXml(feedOriginalSubmit));
- ServiceResponse response =
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feedOriginalSubmit);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feedOriginalSubmit);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(response);
//schedule on source
- response = cluster2.getFeedHelper().schedule(URLS.SCHEDULE_URL, feedOriginalSubmit);
+ response = cluster2.getFeedHelper().schedule(feedOriginalSubmit);
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
@@ -284,8 +280,7 @@ public class FeedClusterUpdateTest extends BaseTestClass {
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
- prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feedUpdated);
+ prism.getFeedHelper().submitAndSchedule(feedUpdated);
Assert.assertEquals(InstanceUtil
.checkIfFeedCoordExist(cluster2.getFeedHelper(), Util.readEntityName(feedUpdated),
@@ -319,13 +314,12 @@ public class FeedClusterUpdateTest extends BaseTestClass {
logger.info("Feed: " + Util.prettyPrintXml(feedOriginalSubmit));
- ServiceResponse response =
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feedOriginalSubmit);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feedOriginalSubmit);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(response);
//schedule on source
- response = cluster2.getFeedHelper().schedule(URLS.SCHEDULE_URL, feedOriginalSubmit);
+ response = cluster2.getFeedHelper().schedule(feedOriginalSubmit);
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
@@ -379,8 +373,7 @@ public class FeedClusterUpdateTest extends BaseTestClass {
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
- prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feedUpdated);
+ prism.getFeedHelper().submitAndSchedule(feedUpdated);
Assert.assertEquals(InstanceUtil
.checkIfFeedCoordExist(cluster2.getFeedHelper(), Util.readEntityName(feedUpdated),
@@ -414,14 +407,13 @@ public class FeedClusterUpdateTest extends BaseTestClass {
logger.info("Feed: " + Util.prettyPrintXml(feedOriginalSubmit));
- ServiceResponse response =
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feedOriginalSubmit);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feedOriginalSubmit);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(response);
//schedule on source
- response = cluster2.getFeedHelper().schedule(URLS.SCHEDULE_URL, feedOriginalSubmit);
+ response = cluster2.getFeedHelper().schedule(feedOriginalSubmit);
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
@@ -473,8 +465,7 @@ public class FeedClusterUpdateTest extends BaseTestClass {
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
- prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feedUpdated);
+ prism.getFeedHelper().submitAndSchedule(feedUpdated);
Assert.assertEquals(InstanceUtil
.checkIfFeedCoordExist(cluster2.getFeedHelper(), Util.readEntityName(feedUpdated),
@@ -508,13 +499,12 @@ public class FeedClusterUpdateTest extends BaseTestClass {
logger.info("Feed: " + Util.prettyPrintXml(feedOriginalSubmit));
- ServiceResponse response =
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feedOriginalSubmit);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feedOriginalSubmit);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(response);
//schedule on source
- response = cluster2.getFeedHelper().schedule(URLS.SCHEDULE_URL, feedOriginalSubmit);
+ response = cluster2.getFeedHelper().schedule(feedOriginalSubmit);
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
@@ -568,8 +558,7 @@ public class FeedClusterUpdateTest extends BaseTestClass {
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
- prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feedUpdated);
+ prism.getFeedHelper().submitAndSchedule(feedUpdated);
Assert.assertEquals(InstanceUtil
.checkIfFeedCoordExist(cluster2.getFeedHelper(), Util.readEntityName(feedUpdated),
@@ -614,14 +603,13 @@ public class FeedClusterUpdateTest extends BaseTestClass {
logger.info("Feed: " + Util.prettyPrintXml(feedOriginalSubmit));
- ServiceResponse response =
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feedOriginalSubmit);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feedOriginalSubmit);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(response);
//schedule on source
- response = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feedOriginalSubmit);
+ response = prism.getFeedHelper().schedule(feedOriginalSubmit);
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
@@ -667,12 +655,10 @@ public class FeedClusterUpdateTest extends BaseTestClass {
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
- response =
- cluster3.getFeedHelper().getEntityDefinition(URLS.GET_ENTITY_DEFINITION, feedUpdated);
+ response = cluster3.getFeedHelper().getEntityDefinition(feedUpdated);
AssertUtil.assertFailed(response);
- prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feedUpdated);
+ prism.getFeedHelper().submitAndSchedule(feedUpdated);
Assert.assertEquals(InstanceUtil
.checkIfFeedCoordExist(cluster2.getFeedHelper(), Util.readEntityName(feedUpdated),
"REPLICATION"), 0);
@@ -746,14 +732,12 @@ public class FeedClusterUpdateTest extends BaseTestClass {
logger.info("Feed: " + Util.prettyPrintXml(feedOriginalSubmit));
- ServiceResponse response =
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feedOriginalSubmit);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feedOriginalSubmit);
TimeUtil.sleepSeconds(10);
AssertUtil.assertSucceeded(response);
//schedule on source
- response = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL,
- feedOriginalSubmit);
+ response = prism.getFeedHelper().schedule(feedOriginalSubmit);
TimeUtil.sleepSeconds(20);
AssertUtil.assertSucceeded(response);
@@ -805,20 +789,14 @@ public class FeedClusterUpdateTest extends BaseTestClass {
//verify xmls definitions
- response =
- cluster1.getFeedHelper().getEntityDefinition(URLS.GET_ENTITY_DEFINITION, feedUpdated);
+ response = cluster1.getFeedHelper().getEntityDefinition(feedUpdated);
AssertUtil.assertFailed(response);
- response = cluster2.getFeedHelper().getEntityDefinition(URLS
- .GET_ENTITY_DEFINITION, feedUpdated);
+ response = cluster2.getFeedHelper().getEntityDefinition(feedUpdated);
AssertUtil.assertFailed(response);
- response = cluster3.getFeedHelper().getEntityDefinition(URLS
- .GET_ENTITY_DEFINITION, feedUpdated);
- Assert.assertTrue(XmlUtil.isIdentical(feedUpdated,
- response.getMessage()));
- response = prism.getFeedHelper().getEntityDefinition(URLS
- .GET_ENTITY_DEFINITION, feedUpdated);
- Assert.assertTrue(XmlUtil.isIdentical(feedUpdated,
- response.getMessage()));
+ response = cluster3.getFeedHelper().getEntityDefinition(feedUpdated);
+ Assert.assertTrue(XmlUtil.isIdentical(feedUpdated, response.getMessage()));
+ response = prism.getFeedHelper().getEntityDefinition(feedUpdated);
+ Assert.assertTrue(XmlUtil.isIdentical(feedUpdated, response.getMessage()));
Assert.assertEquals(InstanceUtil
.checkIfFeedCoordExist(cluster2.getFeedHelper(), Util.readEntityName(feedUpdated),
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
index 1e01101..33a81d0 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
@@ -30,7 +30,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.hadoop.fs.FileSystem;
@@ -93,15 +92,15 @@ public class FeedInstanceStatusTest extends BaseTestClass {
logger.info("cluster bundle1: " + Util.prettyPrintXml(bundles[0].getClusters().get(0)));
AssertUtil.assertSucceeded(prism.getClusterHelper()
- .submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0)));
+ .submitEntity(bundles[0].getClusters().get(0)));
logger.info("cluster bundle2: " + Util.prettyPrintXml(bundles[1].getClusters().get(0)));
AssertUtil.assertSucceeded(prism.getClusterHelper()
- .submitEntity(URLS.SUBMIT_URL, bundles[1].getClusters().get(0)));
+ .submitEntity(bundles[1].getClusters().get(0)));
logger.info("cluster bundle3: " + Util.prettyPrintXml(bundles[2].getClusters().get(0)));
AssertUtil.assertSucceeded(prism.getClusterHelper()
- .submitEntity(URLS.SUBMIT_URL, bundles[2].getClusters().get(0)));
+ .submitEntity(bundles[2].getClusters().get(0)));
String feed = bundles[0].getDataSets().get(0);
String feedName = Util.readEntityName(feed);
@@ -135,11 +134,11 @@ public class FeedInstanceStatusTest extends BaseTestClass {
"?start=" + TimeUtil.addMinsToTime(startTime, 100)
+ "&end=" + TimeUtil.addMinsToTime(startTime, 120));
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(feed));
prism.getFeedHelper().getProcessInstanceStatus(feedName,
"?start=" + startTime + "&end=" + TimeUtil.addMinsToTime(startTime, 100));
- AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(feed));
// both replication instances
prism.getFeedHelper().getProcessInstanceStatus(feedName,
@@ -215,7 +214,7 @@ public class FeedInstanceStatusTest extends BaseTestClass {
.addMinsToTime(startTime, 20) + "&end=" + TimeUtil.addMinsToTime(startTime, 40));
//get running instances
- prism.getFeedHelper().getRunningInstance(URLS.INSTANCE_RUNNING, feedName);
+ prism.getFeedHelper().getRunningInstance(feedName);
//rerun succeeded instance
prism.getFeedHelper().getProcessInstanceRerun(feedName, "?start=" + startTime);
@@ -237,7 +236,7 @@ public class FeedInstanceStatusTest extends BaseTestClass {
+ "&end=" + TimeUtil.addMinsToTime(startTime, 110));
//kill feed
- prism.getFeedHelper().delete(URLS.DELETE_URL, feed);
+ prism.getFeedHelper().delete(feed);
InstancesResult responseInstance = prism.getFeedHelper().getProcessInstanceStatus(feedName,
"?start=" + startTime + "&end=" + TimeUtil.addMinsToTime(startTime, 110));
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
index fa28a01..197c3c6 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
@@ -134,9 +134,7 @@ public class FeedReplicationTest extends BaseTestClass {
//submit and schedule feed
LOGGER.info("Feed : " + Util.prettyPrintXml(feed));
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitAndSchedule(Util.URLS.SUBMIT_AND_SCHEDULE_URL,
- feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
//upload necessary data
DateTime date = new DateTime(startTime, DateTimeZone.UTC);
@@ -213,9 +211,7 @@ public class FeedReplicationTest extends BaseTestClass {
//submit and schedule feed
LOGGER.info("Feed : " + Util.prettyPrintXml(feed));
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitAndSchedule(Util.URLS.SUBMIT_AND_SCHEDULE_URL,
- feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
//upload necessary data
DateTime date = new DateTime(startTime, DateTimeZone.UTC);
@@ -305,9 +301,7 @@ public class FeedReplicationTest extends BaseTestClass {
//submit and schedule feed
LOGGER.info("Feed : " + Util.prettyPrintXml(feed));
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitAndSchedule(Util.URLS.SUBMIT_AND_SCHEDULE_URL,
- feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
//upload necessary data
DateTime date = new DateTime(startTime, DateTimeZone.UTC);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
index a3f37ab..bb629b8 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
@@ -26,7 +26,6 @@ import org.apache.falcon.regression.core.interfaces.IEntityManagerHelper;
import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
-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;
@@ -74,12 +73,11 @@ public class FeedResumeTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void resumeSuspendedFeed() throws Exception {
- AssertUtil
- .assertSucceeded(feedHelper.submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed));
- AssertUtil.assertSucceeded(feedHelper.suspend(URLS.SUSPEND_URL, feed));
+ AssertUtil.assertSucceeded(feedHelper.submitAndSchedule(feed));
+ AssertUtil.assertSucceeded(feedHelper.suspend(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
- AssertUtil.assertSucceeded(feedHelper.resume(URLS.RESUME_URL, feed));
- ServiceResponse response = feedHelper.getStatus(URLS.STATUS_URL, feed);
+ AssertUtil.assertSucceeded(feedHelper.resume(feed));
+ ServiceResponse response = feedHelper.getStatus(feed);
String colo = feedHelper.getColo();
Assert.assertTrue(response.getMessage().contains(colo + "/RUNNING"));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
@@ -93,7 +91,7 @@ public class FeedResumeTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void resumeNonExistentFeed() throws Exception {
- AssertUtil.assertFailed(feedHelper.resume(URLS.RESUME_URL, feed));
+ AssertUtil.assertFailed(feedHelper.resume(feed));
}
/**
@@ -103,10 +101,9 @@ public class FeedResumeTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void resumeDeletedFeed() throws Exception {
- AssertUtil
- .assertSucceeded(feedHelper.submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed));
- AssertUtil.assertSucceeded(feedHelper.delete(URLS.DELETE_URL, feed));
- AssertUtil.assertFailed(feedHelper.resume(URLS.RESUME_URL, feed));
+ AssertUtil.assertSucceeded(feedHelper.submitAndSchedule(feed));
+ AssertUtil.assertSucceeded(feedHelper.delete(feed));
+ AssertUtil.assertFailed(feedHelper.resume(feed));
}
/**
@@ -116,11 +113,10 @@ public class FeedResumeTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void resumeScheduledFeed() throws Exception {
- AssertUtil
- .assertSucceeded(feedHelper.submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(feedHelper.submitAndSchedule(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
- AssertUtil.assertSucceeded(feedHelper.resume(URLS.RESUME_URL, feed));
- ServiceResponse response = feedHelper.getStatus(URLS.STATUS_URL, feed);
+ AssertUtil.assertSucceeded(feedHelper.resume(feed));
+ ServiceResponse response = feedHelper.getStatus(feed);
String colo = feedHelper.getColo();
Assert.assertTrue(response.getMessage().contains(colo + "/RUNNING"));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java
index 5d87e6e..8500d84 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java
@@ -24,7 +24,6 @@ import org.apache.falcon.regression.core.helpers.ColoHelper;
import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
-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;
@@ -71,15 +70,15 @@ public class FeedScheduleTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void scheduleAlreadyScheduledFeed() throws Exception {
- ServiceResponse response = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed);
+ response = prism.getFeedHelper().schedule(feed);
AssertUtil.assertSucceeded(response);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
//now try re-scheduling again
- response = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed);
+ response = prism.getFeedHelper().schedule(feed);
AssertUtil.assertSucceeded(response);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
}
@@ -92,11 +91,11 @@ public class FeedScheduleTest extends BaseTestClass {
@Test(groups = {"singleCluster"})
public void scheduleValidFeed() throws Exception {
//submit feed
- ServiceResponse response = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(response);
//now schedule the thing
- response = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed);
+ response = prism.getFeedHelper().schedule(feed);
AssertUtil.assertSucceeded(response);
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.RUNNING);
}
@@ -108,14 +107,13 @@ public class FeedScheduleTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void scheduleSuspendedFeed() throws Exception {
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
//now suspend
- AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
//now schedule this!
- AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().schedule(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.SUSPENDED);
}
@@ -126,14 +124,13 @@ public class FeedScheduleTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void scheduleKilledFeed() throws Exception {
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed));
//now suspend
- AssertUtil.assertSucceeded(prism.getFeedHelper().delete(URLS.DELETE_URL, feed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(feed));
AssertUtil.checkStatus(clusterOC, EntityType.FEED, feed, Job.Status.KILLED);
//now schedule this!
- AssertUtil.assertFailed(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ AssertUtil.assertFailed(prism.getFeedHelper().schedule(feed));
}
/**
@@ -143,7 +140,7 @@ public class FeedScheduleTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void scheduleNonExistentFeed() throws Exception {
- AssertUtil.assertFailed(prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed));
+ AssertUtil.assertFailed(prism.getFeedHelper().schedule(feed));
}
@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/FeedStatusTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java
index 8ce88d4..6278513 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java
@@ -26,7 +26,6 @@ import org.apache.falcon.regression.core.response.ServiceResponse;
import org.apache.falcon.regression.core.util.AssertUtil;
import org.apache.falcon.regression.core.util.BundleUtil;
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;
@@ -61,7 +60,7 @@ public class FeedStatusTest extends BaseTestClass {
//submit the cluster
ServiceResponse response =
- prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, bundles[0].getClusters().get(0));
+ prism.getClusterHelper().submitEntity(bundles[0].getClusters().get(0));
AssertUtil.assertSucceeded(response);
feed = bundles[0].getInputFeedFromBundle();
}
@@ -79,12 +78,11 @@ public class FeedStatusTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void getStatusForScheduledFeed() throws Exception {
- ServiceResponse response =
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitAndSchedule(feed);
LOGGER.info("Feed: " + Util.prettyPrintXml(feed));
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().getStatus(URLS.STATUS_URL, feed);
+ response = prism.getFeedHelper().getStatus(feed);
AssertUtil.assertSucceeded(response);
@@ -101,15 +99,14 @@ public class FeedStatusTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void getStatusForSuspendedFeed() throws Exception {
- ServiceResponse response =
- prism.getFeedHelper().submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitAndSchedule(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed);
+ response = prism.getFeedHelper().suspend(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().getStatus(URLS.STATUS_URL, feed);
+ response = prism.getFeedHelper().getStatus(feed);
AssertUtil.assertSucceeded(response);
String colo = prism.getFeedHelper().getColo();
@@ -125,11 +122,11 @@ public class FeedStatusTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void getStatusForSubmittedFeed() throws Exception {
- ServiceResponse response = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().getStatus(URLS.STATUS_URL, feed);
+ response = prism.getFeedHelper().getStatus(feed);
AssertUtil.assertSucceeded(response);
String colo = prism.getFeedHelper().getColo();
@@ -144,14 +141,13 @@ public class FeedStatusTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void getStatusForDeletedFeed() throws Exception {
- ServiceResponse response =
- prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().delete(URLS.DELETE_URL, feed);
+ response = prism.getFeedHelper().delete(feed);
AssertUtil.assertSucceeded(response);
- response = prism.getFeedHelper().getStatus(URLS.STATUS_URL, feed);
+ response = prism.getFeedHelper().getStatus(feed);
AssertUtil.assertFailed(response);
Assert.assertTrue(
@@ -166,7 +162,7 @@ public class FeedStatusTest extends BaseTestClass {
*/
@Test(groups = {"singleCluster"})
public void getStatusForNonExistentFeed() throws Exception {
- ServiceResponse response = prism.getFeedHelper().getStatus(URLS.STATUS_URL, feed);
+ ServiceResponse response = prism.getFeedHelper().getStatus(feed);
AssertUtil.assertFailed(response);
Assert.assertTrue(
response.getMessage().contains(Util.readEntityName(feed) + " (FEED) not found"));
[2/5] FALCON-675 Request URLS moved from parameters into methods in
falcon-regression
Posted by ro...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java
index 71f3751..e97ac37 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java
@@ -31,7 +31,6 @@ import org.apache.falcon.regression.core.util.InstanceUtil;
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.core.util.XmlUtil;
import org.apache.falcon.regression.testHelper.BaseTestClass;
import org.apache.log4j.Logger;
@@ -120,13 +119,11 @@ public class PrismFeedSnSTest extends BaseTestClass {
AssertUtil.checkNotStatus(cluster1OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
AssertUtil.checkNotStatus(cluster2OC, EntityType.FEED, bundles[0], Job.Status.RUNNING);
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed1));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed1));
//ensure only one bundle is there
Assert.assertEquals(OozieUtil.getBundles(cluster1OC,
Util.readEntityName(feed1), EntityType.FEED).size(), 1);
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed2));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed2));
//ensure only one bundle is there
Assert.assertEquals(OozieUtil.getBundles(cluster2OC,
Util.readEntityName(feed2), EntityType.FEED).size(), 1);
@@ -146,28 +143,26 @@ public class PrismFeedSnSTest extends BaseTestClass {
bundles[0].submitAndScheduleFeed();
bundles[1].submitAndScheduleFeed();
- AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed1));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(feed1));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.SUSPENDED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed1));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed1));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.SUSPENDED);
Assert.assertEquals(OozieUtil.getBundles(cluster1OC,
Util.readEntityName(feed1), EntityType.FEED).size(), 1);
- AssertUtil.assertSucceeded(cluster1.getFeedHelper().resume(URLS.RESUME_URL, feed1));
+ AssertUtil.assertSucceeded(cluster1.getFeedHelper().resume(feed1));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.RUNNING);
- AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(URLS.SUSPEND_URL, feed2));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(feed2));
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.SUSPENDED);
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.RUNNING);
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed2));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed2));
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.SUSPENDED);
Assert.assertEquals(OozieUtil.getBundles(cluster2OC,
Util.readEntityName(feed2), EntityType.FEED).size(), 1);
- AssertUtil.assertSucceeded(cluster2.getFeedHelper().resume(URLS.RESUME_URL, feed2));
+ AssertUtil.assertSucceeded(cluster2.getFeedHelper().resume(feed2));
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
}
@@ -181,18 +176,16 @@ public class PrismFeedSnSTest extends BaseTestClass {
bundles[0].submitAndScheduleFeed();
bundles[1].submitAndScheduleFeed();
- AssertUtil.assertSucceeded(prism.getFeedHelper().delete(URLS.DELETE_URL, feed1));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(feed1));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
- AssertUtil.assertSucceeded(prism.getFeedHelper().delete(URLS.DELETE_URL, feed2));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(feed2));
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.KILLED);
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed1));
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed2));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed1));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed2));
}
/**
@@ -200,10 +193,8 @@ public class PrismFeedSnSTest extends BaseTestClass {
*/
@Test(groups = {"prism", "0.2", "embedded"})
public void testScheduleNonExistentFeedOnBothColos() throws Exception {
- AssertUtil.assertFailed(prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed1));
- AssertUtil.assertFailed(prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed2));
+ AssertUtil.assertFailed(prism.getFeedHelper().submitAndSchedule(feed1));
+ AssertUtil.assertFailed(prism.getFeedHelper().submitAndSchedule(feed2));
}
/**
@@ -213,12 +204,11 @@ public class PrismFeedSnSTest extends BaseTestClass {
@Test(groups = {"prism", "0.2", "distributed"})
public void testFeedSnSOn1ColoWhileOtherColoIsDown() throws Exception {
restartRequired = true;
- AssertUtil.assertSucceeded(prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL,
+ AssertUtil.assertSucceeded(prism.getClusterHelper().submitEntity(
bundles[1].getClusters().get(0)));
Util.shutDownService(cluster1.getFeedHelper());
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed2));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed2));
//now check if they have been scheduled correctly or not
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
@@ -235,8 +225,7 @@ public class PrismFeedSnSTest extends BaseTestClass {
restartRequired = true;
bundles[0].submitFeed();
Util.shutDownService(cluster1.getFeedHelper());
- AssertUtil.assertFailed(prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed1));
+ AssertUtil.assertFailed(prism.getFeedHelper().submitAndSchedule(feed1));
AssertUtil.checkNotStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
}
@@ -247,8 +236,7 @@ public class PrismFeedSnSTest extends BaseTestClass {
@Test(groups = {"prism", "0.2", "embedded"})
public void testFeedSnSOn1ColoWhileAnotherColoHasSuspendedFeed() throws Exception {
bundles[0].submitAndScheduleFeed();
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .suspend(URLS.SUSPEND_URL, feed1));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().suspend(feed1));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.SUSPENDED);
bundles[1].submitAndScheduleFeed();
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
@@ -264,8 +252,7 @@ public class PrismFeedSnSTest extends BaseTestClass {
@Test(groups = {"prism", "0.2", "embedded"})
public void testFeedSnSOn1ColoWhileAnotherColoHasKilledFeed() throws Exception {
bundles[0].submitAndScheduleFeed();
- AssertUtil.assertSucceeded(
- prism.getFeedHelper().delete(URLS.DELETE_URL, feed1));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(feed1));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
bundles[1].submitAndScheduleFeed();
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
@@ -282,13 +269,11 @@ public class PrismFeedSnSTest extends BaseTestClass {
public void testFeedSnSOnBothColosUsingColoHelper() throws Exception {
//schedule both bundles
bundles[0].submitFeed();
- APIResult result = Util.parseResponse((cluster1.getFeedHelper()
- .submitEntity(URLS.SUBMIT_AND_SCHEDULE_URL, feed1)));
+ APIResult result = Util.parseResponse((cluster1.getFeedHelper().submitEntity(feed1)));
Assert.assertEquals(result.getStatusCode(), 404);
AssertUtil.checkNotStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.RUNNING);
bundles[1].submitFeed();
- result = Util.parseResponse(cluster2.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed2));
+ result = Util.parseResponse(cluster2.getFeedHelper().submitAndSchedule(feed2));
Assert.assertEquals(result.getStatusCode(), 404);
AssertUtil.checkNotStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
}
@@ -302,24 +287,20 @@ public class PrismFeedSnSTest extends BaseTestClass {
public void testSnSSuspendedFeedOnBothColosUsingColoHelper() throws Exception {
//schedule both bundles
bundles[0].submitFeed();
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed1));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed1));
bundles[1].submitFeed();
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed2));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed2));
- AssertUtil.assertSucceeded(cluster1.getFeedHelper().suspend(URLS.SUSPEND_URL, feed1));
+ AssertUtil.assertSucceeded(cluster1.getFeedHelper().suspend(feed1));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.SUSPENDED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
//now check if they have been scheduled correctly or not
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed1));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed1));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.SUSPENDED);
- AssertUtil.assertSucceeded(cluster1.getFeedHelper().resume(URLS.RESUME_URL, feed1));
+ AssertUtil.assertSucceeded(cluster1.getFeedHelper().resume(feed1));
- AssertUtil.assertSucceeded(cluster2.getFeedHelper().suspend(URLS.SUSPEND_URL, feed2));
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed1));
+ AssertUtil.assertSucceeded(cluster2.getFeedHelper().suspend(feed2));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed1));
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.SUSPENDED);
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.RUNNING);
}
@@ -334,21 +315,19 @@ public class PrismFeedSnSTest extends BaseTestClass {
bundles[0].submitAndScheduleFeed();
bundles[1].submitAndScheduleFeed();
- AssertUtil.assertSucceeded(prism.getFeedHelper().delete(URLS.DELETE_URL, feed1));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(feed1));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
- AssertUtil.assertSucceeded(prism.getFeedHelper().delete(URLS.DELETE_URL, feed2));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(feed2));
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.KILLED);
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed1));
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed2));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed1));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed2));
- Assert.assertEquals(Util.parseResponse(prism.getFeedHelper().getStatus(URLS.STATUS_URL,
+ Assert.assertEquals(Util.parseResponse(prism.getFeedHelper().getStatus(
feed1)).getMessage(), cluster1.getClusterHelper().getColoName() + "/RUNNING");
- Assert.assertEquals(Util.parseResponse(prism.getFeedHelper().getStatus(URLS.STATUS_URL,
+ Assert.assertEquals(Util.parseResponse(prism.getFeedHelper().getStatus(
feed2)).getMessage(), cluster2.getClusterHelper().getColoName() + "/RUNNING");
}
@@ -357,11 +336,9 @@ public class PrismFeedSnSTest extends BaseTestClass {
*/
@Test(groups = {"prism", "0.2", "distributed"})
public void testSNSNonExistentFeedOnBothColosUsingColoHelper() throws Exception {
- Assert.assertEquals(Util.parseResponse(cluster1.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed1))
+ Assert.assertEquals(Util.parseResponse(cluster1.getFeedHelper().submitAndSchedule(feed1))
.getStatusCode(), 404);
- Assert.assertEquals(Util.parseResponse(cluster2.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed2))
+ Assert.assertEquals(Util.parseResponse(cluster2.getFeedHelper().submitAndSchedule(feed2))
.getStatusCode(), 404);
}
@@ -372,12 +349,11 @@ public class PrismFeedSnSTest extends BaseTestClass {
@Test(groups = {"prism", "0.2", "distributed"})
public void testFeedSnSOn1ColoWhileOtherColoIsDownUsingColoHelper() throws Exception {
restartRequired = true;
- AssertUtil.assertSucceeded(prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL,
+ AssertUtil.assertSucceeded(prism.getClusterHelper().submitEntity(
bundles[1].getClusters().get(0)));
Util.shutDownService(cluster1.getFeedHelper());
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, feed2));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed2));
//now check if they have been scheduled correctly or not
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
@@ -397,12 +373,12 @@ public class PrismFeedSnSTest extends BaseTestClass {
bundles[0].setCLusterColo(cluster1.getClusterHelper().getColoName());
logger.info("cluster bundles[0]: " + Util.prettyPrintXml(clust1));
- ServiceResponse r = prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, clust1);
+ ServiceResponse r = prism.getClusterHelper().submitEntity(clust1);
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
bundles[1].setCLusterColo(cluster2.getClusterHelper().getColoName());
logger.info("cluster bundles[1]: " + Util.prettyPrintXml(clust2));
- r = prism.getClusterHelper().submitEntity(URLS.SUBMIT_URL, clust2);
+ r = prism.getClusterHelper().submitEntity(clust2);
Assert.assertTrue(r.getMessage().contains("SUCCEEDED"));
String startTimeUA1 = "2012-10-01T12:00Z";
@@ -428,13 +404,13 @@ public class PrismFeedSnSTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
- r = prism.getFeedHelper().submitEntity(URLS.SUBMIT_URL, feed);
+ r = prism.getFeedHelper().submitEntity(feed);
AssertUtil.assertPartial(r);
- r = prism.getFeedHelper().schedule(URLS.SCHEDULE_URL, feed);
+ r = prism.getFeedHelper().schedule(feed);
AssertUtil.assertPartial(r);
Util.startService(cluster1.getFeedHelper());
- prism.getClusterHelper().delete(URLS.DELETE_URL, clust1);
- prism.getClusterHelper().delete(URLS.DELETE_URL, clust2);
+ prism.getClusterHelper().delete(clust1);
+ prism.getClusterHelper().delete(clust2);
}
/**
@@ -445,7 +421,7 @@ public class PrismFeedSnSTest extends BaseTestClass {
public void testFeedSnSOn1ColoWhileAnotherColoHasSuspendedFeedUsingColoHelper()
throws Exception {
bundles[0].submitAndScheduleFeed();
- AssertUtil.assertSucceeded(cluster1.getFeedHelper().suspend(URLS.SUSPEND_URL, feed1));
+ AssertUtil.assertSucceeded(cluster1.getFeedHelper().suspend(feed1));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.SUSPENDED);
bundles[1].submitAndScheduleFeed();
@@ -462,7 +438,7 @@ public class PrismFeedSnSTest extends BaseTestClass {
@Test(groups = {"prism", "0.2", "embedded"})
public void testFeedSnSOn1ColoWhileAnotherColoHasKilledFeedUsingColoHelper() throws Exception {
bundles[0].submitAndScheduleFeed();
- AssertUtil.assertSucceeded(prism.getFeedHelper().delete(URLS.DELETE_URL, feed1));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(feed1));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
bundles[1].submitAndScheduleFeed();
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSuspendTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSuspendTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSuspendTest.java
index 843990f..1b4ad35 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSuspendTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSuspendTest.java
@@ -82,20 +82,16 @@ public class PrismFeedSuspendTest extends BaseTestClass {
bundles[1].submitAndScheduleFeed();
//delete using prism
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
//suspend using prism
- AssertUtil.assertFailed(prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
//verify
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
- AssertUtil.assertSucceeded(prism.getFeedHelper()
- .delete(Util.URLS.DELETE_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().delete(bundles[1].getDataSets().get(0)));
//suspend on the other one
- AssertUtil.assertFailed(prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().suspend(bundles[1].getDataSets().get(0)));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.KILLED);
}
@@ -114,9 +110,7 @@ public class PrismFeedSuspendTest extends BaseTestClass {
for (int i = 0; i < 2; i++) {
//suspend using prism
AssertUtil.assertSucceeded(
- prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0))
- );
+ prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
//verify
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.SUSPENDED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
@@ -124,9 +118,7 @@ public class PrismFeedSuspendTest extends BaseTestClass {
for (int i = 0; i < 2; i++) {
//suspend on the other one
AssertUtil.assertSucceeded(
- prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getDataSets().get(0))
- );
+ prism.getFeedHelper().suspend(bundles[1].getDataSets().get(0)));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.SUSPENDED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.SUSPENDED);
}
@@ -139,15 +131,11 @@ public class PrismFeedSuspendTest extends BaseTestClass {
*/
@Test(groups = "embedded")
public void testSuspendNonExistentFeedOnBothColos() throws Exception {
- AssertUtil.assertFailed(prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertFailed(prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getDataSets().get(0)));
-
- AssertUtil.assertFailed(cluster1.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertFailed(cluster2.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().suspend(bundles[1].getDataSets().get(0)));
+
+ AssertUtil.assertFailed(cluster1.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster2.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
}
/**
@@ -160,15 +148,11 @@ public class PrismFeedSuspendTest extends BaseTestClass {
bundles[0].submitFeed();
bundles[1].submitFeed();
- AssertUtil.assertFailed(prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertFailed(prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().suspend(bundles[1].getDataSets().get(0)));
- AssertUtil.assertFailed(cluster1.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertFailed(cluster2.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster1.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(cluster2.getFeedHelper().suspend(bundles[1].getDataSets().get(0)));
}
/**
@@ -188,17 +172,13 @@ public class PrismFeedSuspendTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
//suspend using prism
- AssertUtil.assertFailed(
- prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0))
- );
+ AssertUtil.assertFailed(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
//verify
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
//suspend on the other one
AssertUtil.assertSucceeded(
- prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getDataSets().get(0)));
+ prism.getFeedHelper().suspend(bundles[1].getDataSets().get(0)));
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.SUSPENDED);
} catch (Exception e) {
e.printStackTrace();
@@ -224,28 +204,19 @@ public class PrismFeedSuspendTest extends BaseTestClass {
//delete using coloHelpers
AssertUtil.assertSucceeded(
- prism.getFeedHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getDataSets().get(0))
- );
+ prism.getFeedHelper().delete(bundles[0].getDataSets().get(0)));
Util.shutDownService(cluster1.getFeedHelper());
//suspend using prism
- AssertUtil.assertFailed(
- prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
//verify
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
AssertUtil.assertSucceeded(
- prism.getFeedHelper()
- .delete(Util.URLS.DELETE_URL, bundles[1].getDataSets().get(0))
- );
+ prism.getFeedHelper().delete(bundles[1].getDataSets().get(0)));
//suspend on the other one
- AssertUtil.assertFailed(
- prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getDataSets().get(0))
- );
+ AssertUtil.assertFailed(prism.getFeedHelper().suspend(bundles[1].getDataSets().get(0)));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.KILLED);
} catch (Exception e) {
@@ -272,23 +243,17 @@ public class PrismFeedSuspendTest extends BaseTestClass {
//suspend using prism
AssertUtil.assertSucceeded(
- prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0))
- );
+ prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
//verify
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.SUSPENDED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.RUNNING);
Util.shutDownService(cluster1.getFeedHelper());
- AssertUtil.assertFailed(
- prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0))
- );
+ AssertUtil.assertFailed(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
//suspend on the other one
AssertUtil.assertSucceeded(
- prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getDataSets().get(0)));
+ prism.getFeedHelper().suspend(bundles[1].getDataSets().get(0)));
AssertUtil.checkStatus(cluster1OC, EntityType.FEED, bundles[0], Job.Status.SUSPENDED);
AssertUtil.checkStatus(cluster2OC, EntityType.FEED, bundles[1], Job.Status.SUSPENDED);
} catch (Exception e) {
@@ -309,16 +274,10 @@ public class PrismFeedSuspendTest extends BaseTestClass {
throws Exception {
try {
Util.shutDownService(cluster1.getFeedHelper());
+ AssertUtil.assertFailed(prism.getFeedHelper().suspend(bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
AssertUtil.assertFailed(
- prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getDataSets().get(0))
- );
- AssertUtil.assertFailed(
- prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
- AssertUtil.assertFailed(
- cluster2.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0)));
+ cluster2.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
} catch (Exception e) {
e.printStackTrace();
throw new TestNGException(e.getCause());
@@ -341,17 +300,11 @@ public class PrismFeedSuspendTest extends BaseTestClass {
Util.shutDownService(cluster1.getFeedHelper());
- AssertUtil.assertFailed(
- prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getDataSets().get(0))
- );
- AssertUtil.assertFailed(
- prism.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
+ AssertUtil.assertFailed(prism.getFeedHelper().suspend(bundles[1].getDataSets().get(0)));
AssertUtil.assertFailed(
- cluster2.getFeedHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getDataSets().get(0)));
+ cluster2.getFeedHelper().suspend(bundles[1].getDataSets().get(0)));
} catch (Exception e) {
e.printStackTrace();
throw new TestNGException(e.getCause());
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java
index 1225525..9c71375 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java
@@ -107,10 +107,8 @@ public class PrismFeedUpdateTest extends BaseTestClass {
logger.info("cluster bundles[1]: " + Util.prettyPrintXml(cluster2Def));
//submit 2 clusters
- AssertUtil.assertSucceeded(prism.getClusterHelper().submitEntity(Util.URLS.SUBMIT_URL,
- cluster1Def));
- AssertUtil.assertSucceeded(prism.getClusterHelper().submitEntity(Util.URLS.SUBMIT_URL,
- cluster2Def));
+ AssertUtil.assertSucceeded(prism.getClusterHelper().submitEntity(cluster1Def));
+ AssertUtil.assertSucceeded(prism.getClusterHelper().submitEntity(cluster2Def));
//get 2 unique feeds
String feed01 = bundles[0].getInputFeedFromBundle();
@@ -162,10 +160,8 @@ public class PrismFeedUpdateTest extends BaseTestClass {
//submit and schedule feeds
logger.info("feed01: " + Util.prettyPrintXml(feed01));
logger.info("outputFeed: " + Util.prettyPrintXml(outputFeed));
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(Util.URLS
- .SUBMIT_AND_SCHEDULE_URL, feed01));
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(Util.URLS
- .SUBMIT_AND_SCHEDULE_URL, outputFeed));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(feed01));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitAndSchedule(outputFeed));
/* create 2 process with 2 clusters */
//get first process
@@ -197,10 +193,8 @@ public class PrismFeedUpdateTest extends BaseTestClass {
//submit and schedule both process
logger.info("process: " + Util.prettyPrintXml(process01));
logger.info("process: " + Util.prettyPrintXml(process02));
- AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(Util.URLS
- .SUBMIT_AND_SCHEDULE_URL, process01));
- AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(Util.URLS
- .SUBMIT_AND_SCHEDULE_URL, process02));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(process01));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(process02));
logger.info("Wait till process goes into running ");
InstanceUtil.waitTillInstanceReachState(cluster1OC, Util.readEntityName(process01), 1,
CoordinatorAction.Status.RUNNING, EntityType.PROCESS, 1);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessDeleteTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessDeleteTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessDeleteTest.java
index 18c29f3..1bc61b3 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessDeleteTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessDeleteTest.java
@@ -26,7 +26,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.testng.Assert;
@@ -95,8 +94,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
List<String> initialUA2ArchiveStore = cluster1.getProcessHelper().getArchiveInfo();
//lets now delete the cluster from both colos
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().delete(bundles[0].getProcessData()));
//now lets get the final states
List<String> finalPrismStore = prism.getProcessHelper().getStoreInfo();
@@ -147,8 +145,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
Util.shutDownService(cluster2.getClusterHelper());
//lets now delete the cluster from both colos
- AssertUtil.assertFailed(prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().delete(bundles[0].getProcessData()));
//now lets get the final states
List<String> finalPrismStore = prism.getProcessHelper().getStoreInfo();
@@ -180,8 +177,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
//bring service up
Util.startService(cluster2.getProcessHelper());
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().delete(bundles[0].getProcessData()));
HashMap<String, List<String>> systemPostUp = getSystemState(EntityType.PROCESS);
@@ -210,9 +206,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
//now submit the thing to prism
bundles[0].submitFeedsScheduleProcess();
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData())
- );
+ prism.getProcessHelper().delete(bundles[0].getProcessData()));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getProcessHelper().getStoreInfo();
List<String> initialPrismArchiveStore = prism.getProcessHelper().getArchiveInfo();
@@ -225,9 +219,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
List<String> initialUA2ArchiveStore = cluster1.getProcessHelper().getArchiveInfo();
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData())
- );
+ prism.getProcessHelper().delete(bundles[0].getProcessData()));
//now lets get the final states
List<String> finalPrismStore = prism.getProcessHelper().getStoreInfo();
@@ -268,8 +260,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
Util.shutDownService(cluster2.getClusterHelper());
//lets now delete the cluster from both colos
- AssertUtil.assertFailed(prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().delete(bundles[0].getProcessData()));
//now lets get the final states
List<String> initialPrismStore = prism.getProcessHelper().getStoreInfo();
@@ -287,8 +278,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
//delete again
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().delete(bundles[0].getProcessData()));
//get final states
List<String> finalPrismStore = prism.getProcessHelper().getStoreInfo();
@@ -341,8 +331,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
//delete
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().delete(bundles[0].getProcessData()));
//get final states
List<String> finalPrismStore = prism.getProcessHelper().getStoreInfo();
@@ -396,9 +385,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
//delete
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData())
- );
+ prism.getProcessHelper().delete(bundles[0].getProcessData()));
//get final states
List<String> finalPrismStore = prism.getProcessHelper().getStoreInfo();
@@ -428,9 +415,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
Util.startService(cluster2.getClusterHelper());
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData())
- );
+ prism.getProcessHelper().delete(bundles[0].getProcessData()));
} catch (Exception e) {
logger.info(e.getMessage());
@@ -458,8 +443,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
List<String> initialUA2ArchiveStore = cluster1.getProcessHelper().getArchiveInfo();
//lets now delete the cluster from both colos
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().delete(bundles[0].getProcessData()));
//now lets get the final states
List<String> finalPrismStore = prism.getProcessHelper().getStoreInfo();
@@ -496,8 +480,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
bundles[1].submitFeedsScheduleProcess();
//suspend UA1 colo thingy
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .suspend(URLS.SUSPEND_URL, bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getProcessHelper().getStoreInfo();
@@ -511,8 +494,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
List<String> initialUA2ArchiveStore = cluster1.getProcessHelper().getArchiveInfo();
//lets now delete the cluster from both colos
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().delete(bundles[0].getProcessData()));
//now lets get the final states
List<String> finalPrismStore = prism.getProcessHelper().getStoreInfo();
@@ -550,10 +532,8 @@ public class PrismProcessDeleteTest extends BaseTestClass {
bundles[1].submitFeedsScheduleProcess();
//suspend UA1 colo thingy
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .suspend(URLS.SUSPEND_URL, bundles[0].getProcessData()));
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .suspend(URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(bundles[1].getProcessData()));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getProcessHelper().getStoreInfo();
@@ -567,8 +547,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
List<String> initialUA2ArchiveStore = cluster1.getProcessHelper().getArchiveInfo();
//lets now delete the cluster from both colos
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().delete(bundles[0].getProcessData()));
//now lets get the final states
List<String> finalPrismStore = prism.getProcessHelper().getStoreInfo();
@@ -606,9 +585,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
bundles[1].submitFeedsScheduleProcess();
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData())
- );
+ prism.getProcessHelper().suspend(bundles[0].getProcessData()));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getProcessHelper().getStoreInfo();
@@ -625,8 +602,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
Util.shutDownService(cluster2.getFeedHelper());
//lets now delete the cluster from both colos
- AssertUtil.assertFailed(prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().delete(bundles[0].getProcessData()));
//now lets get the final states
List<String> finalPrismStore = prism.getProcessHelper().getStoreInfo();
@@ -684,8 +660,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
Util.shutDownService(cluster2.getFeedHelper());
//lets now delete the cluster from both colos
- AssertUtil.assertFailed(prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().delete(bundles[0].getProcessData()));
//now lets get the final states
List<String> finalPrismStore = prism.getProcessHelper().getStoreInfo();
@@ -716,9 +691,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
Util.startService(cluster2.getClusterHelper());
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData())
- );
+ prism.getProcessHelper().delete(bundles[0].getProcessData()));
HashMap<String, List<String>> systemPostUp = getSystemState(EntityType.PROCESS);
@@ -750,9 +723,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
//now submit the thing to prism
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getProcessData())
- );
+ prism.getProcessHelper().suspend(bundles[1].getProcessData()));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getProcessHelper().getStoreInfo();
List<String> initialPrismArchiveStore = prism.getProcessHelper().getArchiveInfo();
@@ -769,9 +740,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
//lets now delete the cluster from both colos
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[1].getProcessData())
- );
+ prism.getProcessHelper().delete(bundles[1].getProcessData()));
//now lets get the final states
List<String> finalPrismStore = prism.getProcessHelper().getStoreInfo();
@@ -817,12 +786,9 @@ public class PrismProcessDeleteTest extends BaseTestClass {
//now submit the thing to prism
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getProcessData())
- );
+ prism.getProcessHelper().suspend(bundles[1].getProcessData()));
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().suspend(bundles[0].getProcessData()));
//fetch the initial store and archive state for prism
List<String> initialPrismStore = prism.getProcessHelper().getStoreInfo();
List<String> initialPrismArchiveStore = prism.getProcessHelper().getArchiveInfo();
@@ -839,9 +805,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
//lets now delete the cluster from both colos
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[1].getProcessData())
- );
+ prism.getProcessHelper().delete(bundles[1].getProcessData()));
//now lets get the final states
List<String> finalPrismStore = prism.getProcessHelper().getStoreInfo();
@@ -900,9 +864,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
//lets now delete the cluster from both colos
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[1].getProcessData())
- );
+ prism.getProcessHelper().delete(bundles[1].getProcessData()));
//now lets get the final states
List<String> finalPrismStore = prism.getProcessHelper().getStoreInfo();
@@ -935,9 +897,7 @@ public class PrismProcessDeleteTest extends BaseTestClass {
Util.startService(cluster2.getClusterHelper());
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData())
- );
+ prism.getProcessHelper().delete(bundles[0].getProcessData()));
HashMap<String, List<String>> systemPostUp = getSystemState(EntityType.PROCESS);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessResumeTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessResumeTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessResumeTest.java
index 4ac57fc..c2b9681 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessResumeTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessResumeTest.java
@@ -82,46 +82,38 @@ public class PrismProcessResumeTest extends BaseTestClass {
bundles[1].submitAndScheduleProcessUsingColoHelper(cluster1);
//suspend using prism
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
//verify
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.SUSPENDED);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
//resume using prism
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().resume(bundles[0].getProcessData()));
//verify
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
//suspend using the colohelper
AssertUtil.assertSucceeded(
- cluster2.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData())
- );
+ cluster2.getProcessHelper().suspend(bundles[0].getProcessData()));
//verify
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.SUSPENDED);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
//resume using colohelper
- AssertUtil.assertSucceeded(cluster2.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(cluster2.getProcessHelper().resume(bundles[0].getProcessData()));
//verify
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
//suspend on the other one
AssertUtil.assertSucceeded(
- cluster1.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getProcessData())
- );
+ cluster1.getProcessHelper().suspend(bundles[1].getProcessData()));
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.SUSPENDED);
//resume using colohelper
- AssertUtil.assertSucceeded(cluster1.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(cluster1.getProcessHelper().resume(bundles[1].getProcessData()));
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
}
@@ -139,33 +131,27 @@ public class PrismProcessResumeTest extends BaseTestClass {
bundles[1].submitAndScheduleProcessUsingColoHelper(cluster1);
//delete using prism
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().delete(bundles[0].getProcessData()));
//try to resume it through prism
- AssertUtil.assertFailed(prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().resume(bundles[0].getProcessData()));
//verify
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
//delete using prism
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().delete(bundles[1].getProcessData()));
//try to resume it through prism
- AssertUtil.assertFailed(prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().resume(bundles[1].getProcessData()));
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.KILLED);
//try to resume process through colohelper
- AssertUtil.assertFailed(cluster2.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getProcessData()));
+ AssertUtil.assertFailed(cluster2.getProcessHelper().resume(bundles[0].getProcessData()));
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.KILLED);
//try to resume process through colohelper
- AssertUtil.assertFailed(cluster1.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getProcessData()));
+ AssertUtil.assertFailed(cluster1.getProcessHelper().resume(bundles[1].getProcessData()));
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.KILLED);
}
@@ -181,30 +167,25 @@ public class PrismProcessResumeTest extends BaseTestClass {
bundles[0].submitAndScheduleProcessUsingColoHelper(cluster2);
bundles[1].submitAndScheduleProcessUsingColoHelper(cluster1);
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(bundles[0].getProcessData()));
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.SUSPENDED);
for (int i = 0; i < 2; i++) {
//resume suspended process using prism
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getProcessData()));
+ prism.getProcessHelper().resume(bundles[0].getProcessData()));
//verify
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
}
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().suspend(bundles[1].getProcessData()));
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.SUSPENDED);
for (int i = 0; i < 2; i++) {
//resume resumed process
AssertUtil.assertSucceeded(
- cluster2.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getProcessData())
- );
+ cluster2.getProcessHelper().resume(bundles[0].getProcessData()));
//verify
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
AssertUtil
@@ -214,9 +195,7 @@ public class PrismProcessResumeTest extends BaseTestClass {
for (int i = 0; i < 2; i++) {
//resume on the other one
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getProcessData())
- );
+ prism.getProcessHelper().resume(bundles[1].getProcessData()));
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
}
@@ -224,9 +203,7 @@ public class PrismProcessResumeTest extends BaseTestClass {
for (int i = 0; i < 2; i++) {
//resume another resumed process
AssertUtil.assertSucceeded(
- cluster1.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getProcessData())
- );
+ cluster1.getProcessHelper().resume(bundles[1].getProcessData()));
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
}
@@ -239,15 +216,11 @@ public class PrismProcessResumeTest extends BaseTestClass {
*/
@Test
public void testResumeNonExistentProcessOnBothColos() throws Exception {
- AssertUtil.assertFailed(prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getProcessData()));
- AssertUtil.assertFailed(prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getProcessData()));
-
- AssertUtil.assertFailed(cluster2.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getProcessData()));
- AssertUtil.assertFailed(cluster1.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().resume(bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().resume(bundles[1].getProcessData()));
+
+ AssertUtil.assertFailed(cluster2.getProcessHelper().resume(bundles[0].getProcessData()));
+ AssertUtil.assertFailed(cluster1.getProcessHelper().resume(bundles[0].getProcessData()));
}
/**
@@ -260,15 +233,11 @@ public class PrismProcessResumeTest extends BaseTestClass {
bundles[0].submitProcess(true);
bundles[1].submitProcess(true);
- AssertUtil.assertFailed(prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getProcessData()));
- AssertUtil.assertFailed(prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().resume(bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().resume(bundles[1].getProcessData()));
- AssertUtil.assertFailed(cluster2.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getProcessData()));
- AssertUtil.assertFailed(cluster1.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getProcessData()));
+ AssertUtil.assertFailed(cluster2.getProcessHelper().resume(bundles[0].getProcessData()));
+ AssertUtil.assertFailed(cluster1.getProcessHelper().resume(bundles[1].getProcessData()));
}
@@ -287,26 +256,20 @@ public class PrismProcessResumeTest extends BaseTestClass {
bundles[0].submitAndScheduleProcessUsingColoHelper(cluster2);
bundles[1].submitAndScheduleProcessUsingColoHelper(cluster1);
AssertUtil.assertSucceeded(
- cluster2.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData())
- );
+ cluster2.getProcessHelper().suspend(bundles[0].getProcessData()));
AssertUtil.assertSucceeded(
- cluster1.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getProcessData())
- );
+ cluster1.getProcessHelper().suspend(bundles[1].getProcessData()));
Util.shutDownService(cluster2.getProcessHelper());
- AssertUtil.assertFailed(prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().resume(bundles[0].getProcessData()));
//verify
AssertUtil
.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.SUSPENDED);
//resume on the other one
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getProcessData()));
+ prism.getProcessHelper().resume(bundles[1].getProcessData()));
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
AssertUtil
.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.SUSPENDED);
@@ -335,42 +298,32 @@ public class PrismProcessResumeTest extends BaseTestClass {
//delete using coloHelpers
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[0].getProcessData())
- );
+ prism.getProcessHelper().delete(bundles[0].getProcessData()));
Util.shutDownService(cluster2.getProcessHelper());
//try to resume using prism
- AssertUtil.assertFailed(prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().resume(bundles[0].getProcessData()));
//verify
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
//try to resume using colohelper
AssertUtil.assertFailed(
- cluster2.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getProcessData())
- );
+ cluster2.getProcessHelper().resume(bundles[0].getProcessData()));
//verify
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .delete(Util.URLS.DELETE_URL, bundles[1].getProcessData())
- );
+ prism.getProcessHelper().delete(bundles[1].getProcessData()));
//suspend on the other one
- AssertUtil.assertFailed(prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().resume(bundles[1].getProcessData()));
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.KILLED);
AssertUtil.assertFailed(
- cluster1.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getProcessData())
- );
+ cluster1.getProcessHelper().resume(bundles[1].getProcessData()));
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.KILLED);
} catch (Exception e) {
@@ -397,34 +350,28 @@ public class PrismProcessResumeTest extends BaseTestClass {
//suspend using prism
AssertUtil.assertSucceeded(
- cluster2.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[0].getProcessData())
- );
+ cluster2.getProcessHelper().suspend(bundles[0].getProcessData()));
//verify
AssertUtil
.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.SUSPENDED);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
AssertUtil.assertSucceeded(
- cluster2.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getProcessData()));
+ cluster2.getProcessHelper().resume(bundles[0].getProcessData()));
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
Util.shutDownService(cluster2.getProcessHelper());
- AssertUtil.assertFailed(prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().resume(bundles[0].getProcessData()));
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .suspend(Util.URLS.SUSPEND_URL, bundles[1].getProcessData()));
+ prism.getProcessHelper().suspend(bundles[1].getProcessData()));
AssertUtil
.checkStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.SUSPENDED);
for (int i = 0; i < 2; i++) {
//suspend on the other one
AssertUtil.assertSucceeded(
- prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getProcessData()));
+ prism.getProcessHelper().resume(bundles[1].getProcessData()));
AssertUtil
.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
AssertUtil
@@ -434,8 +381,7 @@ public class PrismProcessResumeTest extends BaseTestClass {
for (int i = 0; i < 2; i++) {
//suspend on the other one
AssertUtil.assertSucceeded(
- cluster1.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getProcessData()));
+ cluster1.getProcessHelper().resume(bundles[1].getProcessData()));
AssertUtil
.checkStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
AssertUtil
@@ -462,13 +408,10 @@ public class PrismProcessResumeTest extends BaseTestClass {
try {
Util.shutDownService(cluster2.getProcessHelper());
- AssertUtil.assertFailed(prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getProcessData()));
- AssertUtil.assertFailed(prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().resume(bundles[1].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().resume(bundles[0].getProcessData()));
AssertUtil.assertFailed(
- cluster1.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getProcessData()));
+ cluster1.getProcessHelper().resume(bundles[1].getProcessData()));
} catch (Exception e) {
e.printStackTrace();
@@ -493,14 +436,10 @@ public class PrismProcessResumeTest extends BaseTestClass {
Util.shutDownService(cluster2.getProcessHelper());
- AssertUtil.assertFailed(prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[0].getProcessData()));
- AssertUtil.assertFailed(prism.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().resume(bundles[0].getProcessData()));
+ AssertUtil.assertFailed(prism.getProcessHelper().resume(bundles[1].getProcessData()));
AssertUtil.assertFailed(
- cluster1.getProcessHelper()
- .resume(Util.URLS.RESUME_URL, bundles[1].getProcessData())
- );
+ cluster1.getProcessHelper().resume(bundles[1].getProcessData()));
} catch (Exception e) {
e.printStackTrace();
throw new TestNGException(e.getCause());
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java
index 5590c54..e0c25d0 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java
@@ -30,7 +30,6 @@ import org.apache.falcon.regression.core.util.OSUtil;
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.log4j.Logger;
import org.apache.oozie.client.CoordinatorAction;
@@ -125,10 +124,8 @@ public class PrismProcessScheduleTest extends BaseTestClass {
AssertUtil.checkNotStatus(cluster1OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
AssertUtil.checkNotStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
- AssertUtil.assertSucceeded(cluster2.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, process1));
- AssertUtil.assertSucceeded(cluster1.getProcessHelper()
- .schedule(URLS.SCHEDULE_URL, process2));
+ AssertUtil.assertSucceeded(cluster2.getProcessHelper().schedule(process1));
+ AssertUtil.assertSucceeded(cluster1.getProcessHelper().schedule(process2));
//now check if they have been scheduled correctly or not
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
@@ -151,25 +148,25 @@ public class PrismProcessScheduleTest extends BaseTestClass {
bundles[1].submitAndScheduleProcess();
//suspend process on colo-1
- 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);
//now check if it has been scheduled correctly or not
- AssertUtil.assertSucceeded(cluster2.getProcessHelper().schedule(URLS.SCHEDULE_URL, process1));
+ AssertUtil.assertSucceeded(cluster2.getProcessHelper().schedule(process1));
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.SUSPENDED);
- AssertUtil.assertSucceeded(cluster2.getProcessHelper().resume(URLS.RESUME_URL, process1));
+ AssertUtil.assertSucceeded(cluster2.getProcessHelper().resume(process1));
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
//suspend process on colo-2
- AssertUtil.assertSucceeded(cluster1.getProcessHelper().suspend(URLS.SUSPEND_URL, process2));
+ AssertUtil.assertSucceeded(cluster1.getProcessHelper().suspend(process2));
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.SUSPENDED);
AssertUtil.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
//now check if it has been scheduled correctly or not
- AssertUtil.assertSucceeded(cluster2.getProcessHelper().schedule(URLS.SCHEDULE_URL, process2));
+ AssertUtil.assertSucceeded(cluster2.getProcessHelper().schedule(process2));
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.SUSPENDED);
- AssertUtil.assertSucceeded(cluster2.getProcessHelper().resume(URLS.RESUME_URL, process2));
+ AssertUtil.assertSucceeded(cluster2.getProcessHelper().resume(process2));
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
}
@@ -185,16 +182,16 @@ public class PrismProcessScheduleTest extends BaseTestClass {
bundles[0].submitAndScheduleProcess();
bundles[1].submitAndScheduleProcess();
- 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(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.KILLED);
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.KILLED);
- AssertUtil.assertFailed(cluster2.getProcessHelper().schedule(URLS.SCHEDULE_URL, process1));
- AssertUtil.assertFailed(cluster1.getProcessHelper().schedule(URLS.SCHEDULE_URL, process2));
+ AssertUtil.assertFailed(cluster2.getProcessHelper().schedule(process1));
+ AssertUtil.assertFailed(cluster1.getProcessHelper().schedule(process2));
}
/**
@@ -204,8 +201,8 @@ public class PrismProcessScheduleTest extends BaseTestClass {
*/
@Test(groups = {"prism", "0.2", "embedded"})
public void testScheduleNonExistentProcessOnBothColos() throws Exception {
- AssertUtil.assertFailed(cluster2.getProcessHelper().schedule(URLS.SCHEDULE_URL, process1));
- AssertUtil.assertFailed(cluster1.getProcessHelper().schedule(URLS.SCHEDULE_URL, process2));
+ AssertUtil.assertFailed(cluster2.getProcessHelper().schedule(process1));
+ AssertUtil.assertFailed(cluster1.getProcessHelper().schedule(process2));
}
/**
@@ -220,8 +217,7 @@ public class PrismProcessScheduleTest extends BaseTestClass {
try {
bundles[1].submitProcess(true);
Util.shutDownService(cluster2.getProcessHelper());
- AssertUtil.assertSucceeded(prism.getProcessHelper()
- .submitAndSchedule(URLS.SUBMIT_AND_SCHEDULE_URL, process2));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(process2));
//now check if they have been scheduled correctly or not
AssertUtil.checkStatus(cluster2OC, EntityType.PROCESS, bundles[1], Job.Status.RUNNING);
@@ -248,7 +244,7 @@ public class PrismProcessScheduleTest extends BaseTestClass {
try {
bundles[0].submitProcess(true);
Util.shutDownService(cluster2.getProcessHelper());
- AssertUtil.assertFailed(prism.getProcessHelper().schedule(URLS.SCHEDULE_URL, process1));
+ AssertUtil.assertFailed(prism.getProcessHelper().schedule(process1));
AssertUtil
.checkNotStatus(cluster2OC, EntityType.PROCESS, bundles[0], Job.Status.RUNNING);
} catch (Exception e) {
@@ -271,8 +267,7 @@ public class PrismProcessScheduleTest extends BaseTestClass {
throws Exception {
try {
bundles[0].submitAndScheduleProcess();
- AssertUtil.assertSucceeded(cluster1.getProcessHelper()
- .suspend(URLS.SUSPEND_URL, process1));
+ AssertUtil.assertSucceeded(cluster1.getProcessHelper().suspend(process1));
AssertUtil
.checkStatus(cluster1OC, EntityType.PROCESS, bundles[0], Job.Status.SUSPENDED);
@@ -302,7 +297,7 @@ public class PrismProcessScheduleTest extends BaseTestClass {
throws Exception {
try {
bundles[0].submitAndScheduleProcess();
- 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);
bundles[1].submitAndScheduleProcess();
@@ -344,7 +339,7 @@ public class PrismProcessScheduleTest extends BaseTestClass {
Util.readEntityName(process),Job.Status.KILLED);
String oldBundleID = InstanceUtil.getLatestBundleID(cluster1,
Util.readEntityName(process), EntityType.PROCESS);
- prism.getProcessHelper().delete(URLS.DELETE_URL, process);
+ prism.getProcessHelper().delete(process);
bundles[0].submitAndScheduleProcess();
OozieUtil.verifyNewBundleCreation(cluster1, oldBundleID,
@@ -368,9 +363,9 @@ public class PrismProcessScheduleTest extends BaseTestClass {
ProcessMerlin processObj = new ProcessMerlin(bundles[0].getProcessData());
processObj.setInputs(null);
processObj.setLateProcess(null);
- AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(Util.URLS.SUBMIT_URL, bundles[0].getOutputFeedFromBundle()));
- AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(Util.URLS.SUBMIT_AND_SCHEDULE_URL,
- processObj.toString()));
+ AssertUtil.assertSucceeded(prism.getFeedHelper().submitEntity(bundles[0].getOutputFeedFromBundle()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(
+ processObj.toString()));
InstanceUtil.waitTillInstanceReachState(cluster1OC, Util.readEntityName(processObj.toString()), 2,
CoordinatorAction.Status.SUCCEEDED, EntityType.PROCESS, 10);
}
@@ -388,8 +383,8 @@ public class PrismProcessScheduleTest extends BaseTestClass {
processObj.setInputs(null);
processObj.setOutputs(null);
processObj.setLateProcess(null);
- AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(Util.URLS.SUBMIT_AND_SCHEDULE_URL,
- processObj.toString()));
+ AssertUtil.assertSucceeded(prism.getProcessHelper().submitAndSchedule(
+ processObj.toString()));
InstanceUtil.waitTillInstanceReachState(cluster1OC, Util.readEntityName(processObj.toString()), 2,
CoordinatorAction.Status.SUCCEEDED, EntityType.PROCESS, 10);
}