You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ro...@apache.org on 2015/01/05 17:14:24 UTC
falcon git commit: FALCON-979 Fix checkstyle issues introduced by
falcon-976. Contributed by Raghav Kumar Gautam
Repository: falcon
Updated Branches:
refs/heads/master 1e44fe2c7 -> 16f9c6ecb
FALCON-979 Fix checkstyle issues introduced by falcon-976. Contributed by Raghav Kumar Gautam
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/16f9c6ec
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/16f9c6ec
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/16f9c6ec
Branch: refs/heads/master
Commit: 16f9c6ecb5009759573af7e0e174e92dbdebc286
Parents: 1e44fe2
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Mon Jan 5 18:12:15 2015 +0200
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Mon Jan 5 18:12:15 2015 +0200
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 ++
.../falcon/regression/prism/EntityDryRunTest.java | 17 +++++++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/16f9c6ec/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 0c69eaa..12b9d14 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -36,8 +36,10 @@ Trunk (Unreleased)
via Samarth Gupta)
IMPROVEMENTS
+ FALCON-979 Fix checkstyle issues introduced by falcon-976 (Raghav Kumar Gautam via Ruslan Ostafiychuk)
FALCON-976 EntityDryRunTest failing in falcon trunk (Pragya M via Samarth Gupta)
+
FALCON-942 Cleanup BaseTestClass and setUp/tearDown methods (Ruslan Ostafiychuk)
FALCON-962 Fortify ListFeedInstancesTest (Paul Isaychuk via Ruslan Ostafiychuk)
http://git-wip-us.apache.org/repos/asf/falcon/blob/16f9c6ec/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 e62edc5..92adf23 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
@@ -87,7 +87,8 @@ public class EntityDryRunTest extends BaseTestClass {
bundles[0].setProcessProperty("EntityDryRunTestProp", "${coord:someEL(1)");
bundles[0].submitProcess(true);
ServiceResponse response = prism.getProcessHelper().schedule(bundles[0].getProcessData());
- validate(response,"E1004: Expression language evaluation error, Unable to evaluate :${coord:someEL(1)");
+ validate(response,
+ "E1004: Expression language evaluation error, Unable to evaluate :${coord:someEL(1)");
}
/**
@@ -101,7 +102,8 @@ public class EntityDryRunTest extends BaseTestClass {
bundles[0].setProcessProperty("EntityDryRunTestProp", "${coord:someEL(1)");
ServiceResponse response = prism.getProcessHelper().update(bundles[0].getProcessData(),
bundles[0].getProcessData(), TimeUtil.getTimeWrtSystemTime(5), null);
- validate(response,"The new entity (process) " + bundles[0].getProcessName() + " can't be scheduled");
+ validate(response,
+ "The new entity (process) " + bundles[0].getProcessName() + " can't be scheduled");
Assert.assertEquals(
OozieUtil.getNumberOfBundle(clusterOC, EntityType.PROCESS, bundles[0].getProcessName()),
1, "more than one bundle found after failed update request");
@@ -116,7 +118,8 @@ public class EntityDryRunTest extends BaseTestClass {
feed = Util.setFeedProperty(feed, "EntityDryRunTestProp", "${coord:someEL(1)");
bundles[0].submitClusters(prism);
ServiceResponse response = prism.getFeedHelper().submitAndSchedule(feed);
- validate(response,"E1004: Expression language evaluation error, Unable to evaluate :${coord:someEL(1)");
+ validate(response,
+ "E1004: Expression language evaluation error, Unable to evaluate :${coord:someEL(1)");
}
/**
@@ -130,14 +133,16 @@ public class EntityDryRunTest extends BaseTestClass {
AssertUtil.assertSucceeded(response);
feed = Util.setFeedProperty(feed, "EntityDryRunTestProp", "${coord:someEL(1)");
response = prism.getFeedHelper().update(feed, feed);
- validate(response,"The new entity (feed) " + bundles[0].getInputFeedNameFromBundle() + " can't be scheduled");
+ validate(response, "The new entity (feed) " + bundles[0].getInputFeedNameFromBundle()
+ + " can't be scheduled");
Assert.assertEquals(
OozieUtil.getNumberOfBundle(clusterOC, EntityType.FEED, Util.readEntityName(feed)), 1,
"more than one bundle found after failed update request");
}
- private void validate(ServiceResponse response,String message) throws JAXBException {
+ private void validate(ServiceResponse response, String message) throws JAXBException {
AssertUtil.assertFailed(response);
- Assert.assertTrue(response.getMessage().contains(message), "Correct response was not present in process / feed schedule");
+ Assert.assertTrue(response.getMessage().contains(message),
+ "Correct response was not present in process / feed schedule");
}
}