You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by pi...@apache.org on 2015/06/22 11:32:04 UTC

falcon git commit: FALCON-1288 Fortify expressionLanguageTest. Contributed by Ruslan Ostafiychuk

Repository: falcon
Updated Branches:
  refs/heads/master 514fa5411 -> b73e34bd9


FALCON-1288 Fortify expressionLanguageTest. Contributed by Ruslan Ostafiychuk


Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/b73e34bd
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/b73e34bd
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/b73e34bd

Branch: refs/heads/master
Commit: b73e34bd9c400f3a24a9321c3696bbdc802845bc
Parents: 514fa54
Author: pisaychuk <pi...@apache.org>
Authored: Mon Jun 22 12:26:40 2015 +0300
Committer: pisaychuk <pi...@apache.org>
Committed: Mon Jun 22 12:26:40 2015 +0300

----------------------------------------------------------------------
 falcon-regression/CHANGES.txt                                      | 2 ++
 .../test/java/org/apache/falcon/regression/ELValidationsTest.java  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/b73e34bd/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index d7deb56..7499552 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -351,6 +351,8 @@ Trunk (Unreleased)
    FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
 
   BUG FIXES
+   FALCON-1288 Fortify expressionLanguageTest (Ruslan Ostafiychuk via Paul Isaychuk)
+
    FALCON-1285 Don't reduce process name in ProcessSetupTest (Ruslan Ostafiychuk)
 
    FALCON-1277 Fix SearchApiTest according to api changes (Paul Isaychuk via Ruslan Ostafiychuk)

http://git-wip-us.apache.org/repos/asf/falcon/blob/b73e34bd/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java
index ef5d6d1..cc7ef15 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java
@@ -238,7 +238,7 @@ public class ELValidationsTest extends BaseTestClass {
         LOGGER.info("nominalTime: " + initialTime.getTime());
         LOGGER.info("finalTime: " + finalTime.getTime());
         List<String> returnList = new ArrayList<>();
-        while (!initialTime.getTime().equals(finalTime.getTime())) {
+        while (initialTime.getTime().before(finalTime.getTime())) {
             LOGGER.info("initialTime: " + initialTime.getTime());
             returnList.add(getPath(path, initialTime));
             initialTime.add(Calendar.MINUTE, frequency);