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 AA4B3119E9 for ; Sun, 14 Sep 2014 23:25:24 +0000 (UTC) Received: (qmail 17843 invoked by uid 500); 14 Sep 2014 23:25:24 -0000 Delivered-To: apmail-falcon-commits-archive@falcon.apache.org Received: (qmail 17803 invoked by uid 500); 14 Sep 2014 23:25:24 -0000 Mailing-List: contact commits-help@falcon.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@falcon.incubator.apache.org Delivered-To: mailing list commits@falcon.incubator.apache.org Received: (qmail 17794 invoked by uid 99); 14 Sep 2014 23:25:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Sep 2014 23:25:24 +0000 X-ASF-Spam-Status: No, hits=-2000.7 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 14 Sep 2014 23:25:23 +0000 Received: (qmail 17761 invoked by uid 99); 14 Sep 2014 23:25:02 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 14 Sep 2014 23:25:02 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A45BE9C5401; Sun, 14 Sep 2014 23:25:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: raghav@apache.org To: commits@falcon.incubator.apache.org Message-Id: <2843d260d5fc4664b647aafc26c64a77@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: FALCON-726 Expect less fields in messages in falcon-regression. Contributed by Ruslan Ostafiychuk Date: Sun, 14 Sep 2014 23:25:02 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-falcon Updated Branches: refs/heads/master 4ed6d855e -> 66c88efda FALCON-726 Expect less fields in messages in falcon-regression. Contributed by Ruslan Ostafiychuk Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/66c88efd Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/66c88efd Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/66c88efd Branch: refs/heads/master Commit: 66c88efda9bc57630d85d0ff169201cb263555a3 Parents: 4ed6d85 Author: Raghav Kumar Gautam Authored: Sun Sep 14 16:24:56 2014 -0700 Committer: Raghav Kumar Gautam Committed: Sun Sep 14 16:24:56 2014 -0700 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 3 +++ .../java/org/apache/falcon/regression/prism/RetentionTest.java | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/66c88efd/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index c88af6d..c2488c5 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -9,6 +9,9 @@ Trunk (Unreleased) via Samarth Gupta) IMPROVEMENTS + FALCON-726 Expect less fields in messages in falcon-regression + (Ruslan Ostafiychuk) + FALCON-720 Fix ProcessInstanceStatusTest as per FALCON-166 (Raghav Kumar Gautam) http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/66c88efd/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java index d113554..c271ecf 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java @@ -234,12 +234,8 @@ public class RetentionTest extends BaseTestClass { Assert.assertEquals(message.getString("workflowId"), workflowIds.get(0)); //verify other data also - Assert.assertEquals(message.getString("topicName"), "FALCON." + feedName); - Assert.assertEquals(message.getString("brokerImplClass"), - "org.apache.activemq.ActiveMQConnectionFactory"); + Assert.assertEquals(message.getJMSDestination().toString(), "topic://FALCON." + feedName); Assert.assertEquals(message.getString("status"), "SUCCEEDED"); - Assert.assertEquals(message.getString("brokerUrl"), - cluster.getFeedHelper().getActiveMQ()); } } Assert.assertEquals(deletedFolders.size(), missingData.size(),