svn commit: r1707695 - in /pig/trunk: contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/ src/org/apache/pig/

[ro...@apache.org]

Author: rohini
Date: Fri Oct  9 11:29:18 2015
New Revision: 1707695

URL: http://svn.apache.org/viewvc?rev=1707695&view=rev
Log:
Fix unit test failures for PIG-4673

Added:
    pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestReplaceMulti.java
      - copied, changed from r1707692, pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestBuiltinReplaceMulti.java
Removed:
    pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestBuiltinReplaceMulti.java
Modified:
    pig/trunk/src/org/apache/pig/Main.java

Copied: pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestReplaceMulti.java (from r1707692, pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestBuiltinReplaceMulti.java)
URL: http://svn.apache.org/viewvc/pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestReplaceMulti.java?p2=pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestReplaceMulti.java&p1=pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestBuiltinReplaceMulti.java&r1=1707692&r2=1707695&rev=1707695&view=diff
==============================================================================
--- pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestBuiltinReplaceMulti.java (original)
+++ pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/string/TestReplaceMulti.java Fri Oct  9 11:29:18 2015
@@ -17,6 +17,10 @@
  */
 package org.apache.pig.piggybank.test.evaluation.string;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.File;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -31,18 +35,18 @@ import org.apache.pig.data.Tuple;
 import org.apache.pig.data.TupleFactory;
 import org.apache.pig.piggybank.evaluation.string.REPLACE_MULTI;
 import org.apache.pig.test.Util;
-import org.junit.Test;
 import org.junit.Before;
+import org.junit.Test;
 
-import static junit.framework.Assert.*;
-
-public class TestBuiltinReplaceMulti {
+public class TestReplaceMulti {
 
     private static PigServer pigServer;
 
     @Before
     public void setUp() throws Exception {
-        pigServer = new PigServer(Util.getLocalTestMode(), new Properties());
+        Properties properties = new Properties();
+        properties.put("udf.import.list", "org.apache.pig.builtin:org.apache.pig.piggybank.evaluation.string");
+        pigServer = new PigServer(Util.getLocalTestMode(), properties);
     }
 
     @Test
@@ -138,7 +142,7 @@ public class TestBuiltinReplaceMulti {
                 + Util.encodeEscape(inputFile.getAbsolutePath())
                 + "' AS (name: chararray);");
         pigServer
-                .registerQuery("B = FOREACH A GENERATE REPLACE_MULTI(NULL, NULL);");
+                .registerQuery("B = FOREACH A GENERATE org.apache.pig.piggybank.evaluation.string.REPLACE_MULTI(NULL, NULL);");
 
         Iterator<Tuple> it = pigServer.openIterator("B");
         assertTrue(it.hasNext());

Modified: pig/trunk/src/org/apache/pig/Main.java
URL: http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/Main.java?rev=1707695&r1=1707694&r2=1707695&view=diff
==============================================================================
--- pig/trunk/src/org/apache/pig/Main.java (original)
+++ pig/trunk/src/org/apache/pig/Main.java Fri Oct  9 11:29:18 2015
@@ -17,11 +17,6 @@
  */
 package org.apache.pig;
 
-import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Strings;
-import com.google.common.io.Closeables;
-import com.google.common.io.InputSupplier;
-import com.google.common.io.Resources;
 import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -93,6 +88,10 @@ import org.joda.time.Period;
 import org.joda.time.PeriodType;
 import org.joda.time.format.PeriodFormat;
 
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Strings;
+import com.google.common.io.Closeables;
+
 /**
  * Main class for Pig engine.
  */
@@ -963,7 +962,7 @@ public class Main {
             System.out.println("    Miscellaneous:");
             System.out.println("        exectype=mapreduce|tez|local; default is mapreduce. This property is the same as -x switch");
             System.out.println("        pig.additional.jars.uris=<comma seperated list of jars>. Used in place of register command.");
-            System.out.println("        udf.import.list=<comma seperated list of imports>. Used to avoid package names in UDF.");
+            System.out.println("        udf.import.list=<Colon seperated list of imports>. Used to avoid package names in UDF.");
             System.out.println("        stop.on.failure=true|false; default is false. Set to true to terminate on the first error.");
             System.out.println("        pig.datetime.default.tz=<UTC time offset>. e.g. +08:00. Default is the default timezone of the host.");
             System.out.println("            Determines the timezone used to handle datetime datatype and UDFs. ");