svn commit: r1155457 - in /pig/trunk: CHANGES.txt test/org/apache/pig/test/TestGrunt.java

[th...@apache.org]

Author: thejas
Date: Tue Aug  9 18:35:42 2011
New Revision: 1155457

URL: http://svn.apache.org/viewvc?rev=1155457&view=rev
Log:
PIG-1907: replace use of TupleFactory.newTupleNoCopy(List) with
 newTuple(List) in some of the physical operators 

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

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1155457&r1=1155456&r2=1155457&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Tue Aug  9 18:35:42 2011
@@ -103,6 +103,9 @@ PIG-2011: Speed up TestTypedMap.java (dv
 
 BUG FIXES
 
+PIG-1907: replace use of TupleFactory.newTupleNoCopy(List) with 
+ newTuple(List) in some of the physical operators (thejas)
+
 PIG-2181: Improvement : for error message when describe misses alias (vivekp via daijy)
 
 PIG-2124: Script never ending when joining from the same source (daijy)

Modified: pig/trunk/test/org/apache/pig/test/TestGrunt.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestGrunt.java?rev=1155457&r1=1155456&r2=1155457&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestGrunt.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestGrunt.java Tue Aug  9 18:35:42 2011
@@ -17,6 +17,8 @@
  */
 package org.apache.pig.test;
 
+import static org.junit.Assert.*;
+
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -53,8 +55,7 @@ import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Properties;
 
-@RunWith(JUnit4.class)
-public class TestGrunt extends TestCase {
+public class TestGrunt {
  
     static MiniCluster cluster = MiniCluster.buildCluster();
     private String basedir = "test/org/apache/pig/test/data";
@@ -69,13 +70,13 @@ public class TestGrunt extends TestCase 
         cluster.shutDown();
     }
         
-/*    
+   
     @Test 
     public void testCopyFromLocal() throws Throwable {
         PigServer server = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
         PigContext context = server.getPigContext();
         
-        String strCmd = "copyFromLocal /bin/sh . ;";
+        String strCmd = "copyFromLocal /bin/sh sh_copy ;";
         
         ByteArrayInputStream cmd = new ByteArrayInputStream(strCmd.getBytes());
         InputStreamReader reader = new InputStreamReader(cmd);
@@ -84,7 +85,7 @@ public class TestGrunt extends TestCase 
     
         grunt.exec();
     }
-*/
+
     
     @Test 
     public void testDefine() throws Throwable {
@@ -1195,7 +1196,7 @@ public class TestGrunt extends TestCase 
         }
     }
     
-    /*
+
     // Test case for PIG-740 to report an error near the double quotes rather
     // than an unrelated EOF error message
     @Test
@@ -1212,10 +1213,10 @@ public class TestGrunt extends TestCase 
         Grunt grunt = new Grunt(new BufferedReader(reader), context);
 
         try {
-        grunt.exec();
-        } catch(Error e) {
+            grunt.exec();
+        } catch(FrontendException e) {
             e.printStackTrace();
-            assertTrue(e.getMessage().contains("Encountered: \"^\" (94), after : \"\\\"\""));
+            assertTrue(e.getMessage().contains("Error during parsing. <line 2, column 49>  Unexpected character '\"'"));
         }
     }
     
@@ -1259,7 +1260,7 @@ public class TestGrunt extends TestCase 
             msgs.add(c + " statement is ignored while processing " +
                     "'explain -script' or '-check'");
         }
-        msgs.add("Error during parsing");
+        msgs.add("Syntax error");
         validate(query, false, msgs.toArray(new String[0]));
     }
     
@@ -1279,7 +1280,7 @@ public class TestGrunt extends TestCase 
             msgs.add(c + " statement is ignored while processing " +
                     "'explain -script' or '-check'");
         }
-        msgs.add("In alias b, incompatible types in EqualTo Operator");
+        msgs.add("incompatible types in Equal Operator");
         validate(query, false, msgs.toArray(new String[0]));
     }
     
@@ -1307,7 +1308,7 @@ public class TestGrunt extends TestCase 
                     pri.stderrContents.contains("syntax OK"));
         }
     }
-    */
+
     @Test
     public void testSet() throws Throwable {