You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ra...@apache.org on 2014/09/12 00:19:41 UTC
[36/41] FALCON-675 Request URLS moved from parameters into methods in
falcon-regression
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/051a3d29/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/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);
}