Return-Path: X-Original-To: apmail-pig-commits-archive@www.apache.org Delivered-To: apmail-pig-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 13D7110399 for ; Tue, 8 Mar 2016 05:53:36 +0000 (UTC) Received: (qmail 47052 invoked by uid 500); 8 Mar 2016 05:53:35 -0000 Delivered-To: apmail-pig-commits-archive@pig.apache.org Received: (qmail 46916 invoked by uid 500); 8 Mar 2016 05:53:35 -0000 Mailing-List: contact commits-help@pig.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pig.apache.org Delivered-To: mailing list commits@pig.apache.org Received: (qmail 46907 invoked by uid 99); 8 Mar 2016 05:53:35 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Mar 2016 05:53:35 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 8E384C2B6A for ; Tue, 8 Mar 2016 05:53:34 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.799 X-Spam-Level: * X-Spam-Status: No, score=1.799 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id DiSy6X2lRqJf for ; Tue, 8 Mar 2016 05:53:33 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTP id 91BDF5F2EF for ; Tue, 8 Mar 2016 05:53:33 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 9EFE5E0057 for ; Tue, 8 Mar 2016 05:53:32 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 6FFEB3A081B for ; Tue, 8 Mar 2016 05:53:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1734023 - in /pig/branches/spark/test/org/apache/pig/test: TestMultiQuery.java Util.java Date: Tue, 08 Mar 2016 05:53:32 -0000 To: commits@pig.apache.org From: xuefu@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160308055332.6FFEB3A081B@svn01-us-west.apache.org> Author: xuefu Date: Tue Mar 8 05:53:32 2016 New Revision: 1734023 URL: http://svn.apache.org/viewvc?rev=1734023&view=rev Log: PIG-4828: TestMultiQuery test fix (Pallavi via Xuefu) Modified: pig/branches/spark/test/org/apache/pig/test/TestMultiQuery.java pig/branches/spark/test/org/apache/pig/test/Util.java Modified: pig/branches/spark/test/org/apache/pig/test/TestMultiQuery.java URL: http://svn.apache.org/viewvc/pig/branches/spark/test/org/apache/pig/test/TestMultiQuery.java?rev=1734023&r1=1734022&r2=1734023&view=diff ============================================================================== --- pig/branches/spark/test/org/apache/pig/test/TestMultiQuery.java (original) +++ pig/branches/spark/test/org/apache/pig/test/TestMultiQuery.java Tue Mar 8 05:53:32 2016 @@ -834,12 +834,12 @@ public class TestMultiQuery { List actualResults = data.get("output1"); List expectedResults = Util.getTuplesFromConstantTupleStrings( new String[] {"(1)", "(2)"}); - Util.checkQueryOutputs(actualResults.iterator(), expectedResults); + Util.checkQueryOutputsAfterSort(actualResults.iterator(), expectedResults); actualResults = data.get("output2"); expectedResults = Util.getTuplesFromConstantTupleStrings( new String[] {"(1, 'world')", "(2, 'world')"}); - Util.checkQueryOutputs(actualResults.iterator(), expectedResults); + Util.checkQueryOutputsAfterSort(actualResults.iterator(), expectedResults); } @Test Modified: pig/branches/spark/test/org/apache/pig/test/Util.java URL: http://svn.apache.org/viewvc/pig/branches/spark/test/org/apache/pig/test/Util.java?rev=1734023&r1=1734022&r2=1734023&view=diff ============================================================================== --- pig/branches/spark/test/org/apache/pig/test/Util.java (original) +++ pig/branches/spark/test/org/apache/pig/test/Util.java Tue Mar 8 05:53:32 2016 @@ -524,11 +524,10 @@ public class Util { static public void checkQueryOutputs(Iterator actualResults, List expectedResults) { int count = 0; - // Order of expected and actual can be different. - while (actualResults.hasNext()) { + for (Tuple expected : expectedResults) { Tuple actual = actualResults.next(); count++; - Assert.assertTrue(expectedResults.contains(actual)); + Assert.assertEquals(expected.toString(), actual.toString()); } Assert.assertEquals(expectedResults.size(), count); }