svn commit: r1649101 - in /pig/trunk: CHANGES.txt test/org/apache/pig/test/TestNestedForeach.java

[rohini]

Author: rohini
Date: Fri Jan  2 19:50:43 2015
New Revision: 1649101

URL: http://svn.apache.org/r1649101
Log:
PIG-4294: Enable unit test TestNestedForeach for spark (kellyzly via rohini)

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/test/org/apache/pig/test/TestNestedForeach.java

Modified: pig/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1649101&r1=1649100&r2=1649101&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Fri Jan  2 19:50:43 2015
@@ -30,6 +30,8 @@ PIG-4333: Split BigData tests into multi
  
 BUG FIXES
 
+PIG-4294: Enable unit test "TestNestedForeach" for spark (kellyzly via rohini)
+
 PIG-4282: Enable unit test "TestForEachNestedPlan" for spark (kellyzly via 
rohini) 
 
 PIG-4361: Fix perl script problem in TestStreaming.java (kellyzly via xuefu)

Modified: pig/trunk/test/org/apache/pig/test/TestNestedForeach.java
URL: 
http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestNestedForeach.java?rev=1649101&r1=1649100&r2=1649101&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestNestedForeach.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestNestedForeach.java Fri Jan  2 
19:50:43 2015
@@ -159,11 +159,10 @@ public class TestNestedForeach {
         " }\n");
 
         Iterator<Tuple> iter = pig.openIterator("c");
-        Tuple t = iter.next();
-        Assert.assertTrue(t.toString().equals("({(3)})"));
-
-        t = iter.next();
-        Assert.assertTrue(t.toString().equals("({(7)})"));
+        String[] expected = new String[] {
+                "({(3)})", "({(7)})" };
+        Util.checkQueryOutputsAfterSortRecursive(iter, expected,
+                
org.apache.pig.newplan.logical.Util.translateSchema(pig.dumpSchema("c")));
     }
 
     @Test
@@ -185,11 +184,11 @@ public class TestNestedForeach {
         " }\n");
 
         Iterator<Tuple> iter = pig.openIterator("c");
-        Tuple t = iter.next();
-        Assert.assertTrue(t.toString().equals("({(2),(3)})"));
+        String[] expected = new String[] {
+                "({(2),(3)})", "({(7)})" };
+        Util.checkQueryOutputsAfterSortRecursive(iter, expected,
+                
org.apache.pig.newplan.logical.Util.translateSchema(pig.dumpSchema("c")));
 
-        t = iter.next();
-        Assert.assertTrue(t.toString().equals("({(7)})"));
     }
 
     // See PIG-2563
@@ -207,10 +206,9 @@ public class TestNestedForeach {
         pig.registerQuery("C = foreach B {tmp = A.a;generate A, tmp; };");
         pig.registerQuery("D = foreach C generate A.(a,b) as v;");
         Iterator<Tuple> iter = pig.openIterator("D");
-        Tuple t = iter.next();
-        Assert.assertTrue(t.toString().equals("({(1,2)})"));
-
-        t = iter.next();
-        Assert.assertTrue(t.toString().equals("({(2,5)})"));
+        String[] expected = new String[] {
+                "({(1,2)})", "({(2,5)})" };
+        Util.checkQueryOutputsAfterSortRecursive(iter, expected,
+                
org.apache.pig.newplan.logical.Util.translateSchema(pig.dumpSchema("D")));
     }
 }