pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject svn commit: r1222932 - in /pig/trunk/test/org/apache/pig/test: TestBatchAliases.java TestDataBagAccess.java TestPONegative.java TestUTF8.java TestUnion.java
Date Sat, 24 Dec 2011 07:41:39 GMT
Author: daijy
Date: Sat Dec 24 07:41:39 2011
New Revision: 1222932

URL: http://svn.apache.org/viewvc?rev=1222932&view=rev
Log:
Fix unit test failures caused by PIG-2448

Modified:
    pig/trunk/test/org/apache/pig/test/TestBatchAliases.java
    pig/trunk/test/org/apache/pig/test/TestDataBagAccess.java
    pig/trunk/test/org/apache/pig/test/TestPONegative.java
    pig/trunk/test/org/apache/pig/test/TestUTF8.java
    pig/trunk/test/org/apache/pig/test/TestUnion.java

Modified: pig/trunk/test/org/apache/pig/test/TestBatchAliases.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestBatchAliases.java?rev=1222932&r1=1222931&r2=1222932&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestBatchAliases.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestBatchAliases.java Sat Dec 24 07:41:39 2011
@@ -19,6 +19,7 @@ package org.apache.pig.test;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Properties;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
@@ -40,7 +41,7 @@ public class TestBatchAliases extends Te
     @Before
     public void setUp() throws Exception {
         System.setProperty("opt.multiquery", ""+true);
-        myPig = new PigServer(ExecType.LOCAL, System.getProperties());
+        myPig = new PigServer(ExecType.LOCAL, new Properties());
         deleteOutputFiles();
     }
 

Modified: pig/trunk/test/org/apache/pig/test/TestDataBagAccess.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestDataBagAccess.java?rev=1222932&r1=1222931&r2=1222932&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestDataBagAccess.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestDataBagAccess.java Sat Dec 24 07:41:39 2011
@@ -25,6 +25,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Properties;
 
 import org.apache.pig.ExecType;
 import org.apache.pig.PigServer;
@@ -55,7 +56,7 @@ public class TestDataBagAccess extends T
     @Before
     @Override
     public void setUp() throws Exception{
-        pigServer = new PigServer(ExecType.LOCAL, System.getProperties());
+        pigServer = new PigServer(ExecType.LOCAL, new Properties());
     }
 
     @Test

Modified: pig/trunk/test/org/apache/pig/test/TestPONegative.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestPONegative.java?rev=1222932&r1=1222931&r2=1222932&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestPONegative.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestPONegative.java Sat Dec 24 07:41:39 2011
@@ -19,6 +19,7 @@ package org.apache.pig.test;
 
 import java.io.File;
 import java.util.Iterator;
+import java.util.Properties;
 import java.util.Random;
 
 import org.apache.pig.ExecType;
@@ -303,7 +304,7 @@ public class TestPONegative extends Test
 
     @Test
     public void testPONegType() throws Exception {
-        PigServer pig = new PigServer(ExecType.LOCAL, System.getProperties());
+        PigServer pig = new PigServer(ExecType.LOCAL, new Properties());
         File f = Util.createInputFile("tmp", "", new String[] {"a", "b", "c"});
         pig.registerQuery("a = load '"
                 + Util.generateURI(f.toString(), pig.getPigContext()) + "';");

Modified: pig/trunk/test/org/apache/pig/test/TestUTF8.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestUTF8.java?rev=1222932&r1=1222931&r2=1222932&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestUTF8.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestUTF8.java Sat Dec 24 07:41:39 2011
@@ -25,6 +25,7 @@ import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Iterator;
+import java.util.Properties;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -46,7 +47,7 @@ public class TestUTF8 extends TestCase {
     @Before
     @Override
     public void setUp() throws Exception{
-        pigServer = new PigServer(ExecType.LOCAL, System.getProperties());
+        pigServer = new PigServer(ExecType.LOCAL, new Properties());
     }
 
     @Test

Modified: pig/trunk/test/org/apache/pig/test/TestUnion.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestUnion.java?rev=1222932&r1=1222931&r2=1222932&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestUnion.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestUnion.java Sat Dec 24 07:41:39 2011
@@ -20,6 +20,7 @@ package org.apache.pig.test;
 import java.io.File;
 import java.io.IOException;
 import java.util.Iterator;
+import java.util.Properties;
 
 import org.apache.pig.ExecType;
 import org.apache.pig.FuncSpec;
@@ -80,14 +81,14 @@ import org.junit.runners.JUnit4;
 public class TestUnion extends junit.framework.TestCase {
     POUnion sp;
     DataBag expBag;
-    static MiniCluster cluster = MiniCluster.buildCluster();
-    PigContext pc = new PigContext();
+    PigContext pc;
     PigServer pigServer;
 
     @Override
     @Before
     public void setUp() throws Exception {
-        pigServer = new PigServer(ExecType.LOCAL, cluster.getProperties());
+        pigServer = new PigServer(ExecType.LOCAL, new Properties());
+        pc = pigServer.getPigContext();
         pc.connect();
         GenPhyOp.setPc(pc);
         POLoad ld1 = GenPhyOp.topLoadOp();
@@ -160,7 +161,6 @@ public class TestUnion extends junit.fra
 
     @AfterClass
     public static void oneTimeTearDown() throws Exception {
-        cluster.shutDown();
     }
 
     private Tuple castToDBA(Tuple in) throws ExecException{



Mime
View raw message