svn commit: r1434467 - in /pig/trunk: CHANGES.txt test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java

[ga...@apache.org]

Author: gates
Date: Wed Jan 16 23:03:36 2013
New Revision: 1434467

URL: http://svn.apache.org/viewvc?rev=1434467&view=rev
Log:
PIG-3029 TestTypeCheckingValidatorNewLP has some path reference issues for cross-platform execution

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

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1434467&r1=1434466&r2=1434467&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Wed Jan 16 23:03:36 2013
@@ -66,6 +66,8 @@ PIG-3013: BinInterSedes improve chararra
 
 BUG FIXES
 
+PIG-3029 TestTypeCheckingValidatorNewLP has some path reference issues for cross-platform execution (jgordon via gates)
+
 PIG-3120: setStoreFuncUDFContextSignature called with null signature (jdler via cheolsoo)
 
 PIG-3115: Distinct Build-in Function Doesn't Handle Null Bags (njw45 via daijy)

Modified: pig/trunk/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java?rev=1434467&r1=1434466&r2=1434467&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java Wed Jan 16 23:03:36 2013
@@ -3738,16 +3738,17 @@ public class TestTypeCheckingValidatorNe
         public void testMapLookupCast() throws Exception {
              String input[] = { "[k1#hello,k2#bye]",
                      "[k1#good,k2#morning]" };
+             PigServer ps = new PigServer(ExecType.LOCAL);
              File f = org.apache.pig.test.Util.createInputFile("test", ".txt", input);
-             String inputFileName = f.getAbsolutePath();
+             String inputFileName = Util.generateURI(Util.encodeEscape(f.getAbsolutePath()), ps.getPigContext());
              // load as bytearray and use as map
-             String query = "a= load 'file://" + inputFileName + "' as (m);"
+             String query = "a= load '" + inputFileName + "' as (m);"
              + " b = foreach a generate m#'k1';";
 
              checkLastForeachCastLoadFunc(query, "org.apache.pig.builtin.PigStorage", 0);
 
              // load as map and use as map
-             query = "a= load 'file://" + inputFileName + "' as (m:[]);"
+             query = "a= load '" + inputFileName + "' as (m:[]);"
              + "b = foreach a generate m#'k1';";
 
              LOForEach foreach = getForeachFromPlan(query);
@@ -3755,9 +3756,8 @@ public class TestTypeCheckingValidatorNe
              Operator outExp = loGen.getOutputPlans().get(0).getSources().get(0);
              assertFalse("outExp is not cast", outExp instanceof CastExpression);
 
-             PigServer ps = new PigServer(ExecType.LOCAL);
              // load as bytearray and use as map
-             ps.registerQuery("a = load 'file://" + inputFileName + "' as (m);");
+             ps.registerQuery("a = load '" + inputFileName + "' as (m);");
              ps.registerQuery("b = foreach a generate m#'k1';");
              Iterator<Tuple> it = ps.openIterator("b");
              String[] expectedResults = new String[] {"(hello)", "(good)"};
@@ -3767,7 +3767,7 @@ public class TestTypeCheckingValidatorNe
              }
 
              // load as map and use as map
-             ps.registerQuery("a = load 'file://" + inputFileName + "' as (m:[]);");
+             ps.registerQuery("a = load '"+ inputFileName + "' as (m:[]);");
              ps.registerQuery("b = foreach a generate m#'k1';");
              it = ps.openIterator("b");
              expectedResults = new String[] {"(hello)", "(good)"};
@@ -4112,4 +4112,4 @@ public class TestTypeCheckingValidatorNe
                 " corresponding column in earlier relation(s) in the statement";
             Util.checkExceptionMessage(query, "c", msg);
         }
-}
\ No newline at end of file
+}