Return-Path: X-Original-To: apmail-falcon-commits-archive@minotaur.apache.org Delivered-To: apmail-falcon-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CCADD179E6 for ; Mon, 22 Jun 2015 09:32:04 +0000 (UTC) Received: (qmail 64394 invoked by uid 500); 22 Jun 2015 09:32:04 -0000 Delivered-To: apmail-falcon-commits-archive@falcon.apache.org Received: (qmail 64355 invoked by uid 500); 22 Jun 2015 09:32:04 -0000 Mailing-List: contact commits-help@falcon.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@falcon.apache.org Delivered-To: mailing list commits@falcon.apache.org Received: (qmail 64336 invoked by uid 99); 22 Jun 2015 09:32:04 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Jun 2015 09:32:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 09CC7E04BE; Mon, 22 Jun 2015 09:32:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: pisaychuk@apache.org To: commits@falcon.apache.org Message-Id: <87b372f8b5a7400fb5150140cccdfaab@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: falcon git commit: FALCON-1288 Fortify expressionLanguageTest. Contributed by Ruslan Ostafiychuk Date: Mon, 22 Jun 2015 09:32:04 +0000 (UTC) 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 Authored: Mon Jun 22 12:26:40 2015 +0300 Committer: pisaychuk 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 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);