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:43 UTC
[38/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/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)