You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ch...@apache.org on 2012/11/07 06:58:06 UTC
svn commit: r1406469 [10/10] - in /pig/trunk: ./ test/org/apache/pig/test/
Modified: pig/trunk/test/org/apache/pig/test/TestStreamingLocal.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestStreamingLocal.java?rev=1406469&r1=1406468&r2=1406469&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestStreamingLocal.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestStreamingLocal.java Wed Nov 7 05:58:04 2012
@@ -17,12 +17,12 @@
*/
package org.apache.pig.test;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
-import junit.framework.TestCase;
-
import org.apache.pig.ExecType;
import org.apache.pig.PigServer;
import org.apache.pig.backend.executionengine.ExecException;
@@ -34,7 +34,7 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-public class TestStreamingLocal extends TestCase {
+public class TestStreamingLocal {
private TupleFactory tf = TupleFactory.getInstance();
PigServer pigServer;
@@ -50,14 +50,12 @@ public class TestStreamingLocal extends
}
@Before
- @Override
- protected void setUp() throws Exception {
- pigServer = new PigServer("local");
+ public void setUp() throws Exception {
+ pigServer = new PigServer(ExecType.LOCAL);
}
@After
- @Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
pigServer.shutdown();
}
@@ -76,9 +74,9 @@ public class TestStreamingLocal extends
}
@Test
- public void testSimpleMapSideStreaming()
+ public void testSimpleMapSideStreaming()
throws Exception {
- File input = Util.createInputFile("tmp", "",
+ File input = Util.createInputFile("tmp", "",
new String[] {"A,1", "B,2", "C,3", "D,2",
"A,5", "B,5", "C,8", "A,8",
"D,8", "A,9"});
@@ -90,7 +88,7 @@ public class TestStreamingLocal extends
for (int i = 0; i < withTypes.length; i++) {
Tuple[] expectedResults = null;
if(withTypes[i] == true) {
- expectedResults =
+ expectedResults =
setupExpectedResults(expectedFirstFields, expectedSecondFields);
} else {
expectedResults = setupExpectedResults(Util
@@ -119,9 +117,9 @@ public class TestStreamingLocal extends
}
@Test
- public void testSimpleMapSideStreamingWithOutputSchema()
+ public void testSimpleMapSideStreamingWithOutputSchema()
throws Exception {
- File input = Util.createInputFile("tmp", "",
+ File input = Util.createInputFile("tmp", "",
new String[] {"A,1", "B,2", "C,3", "D,2",
"A,5", "B,5", "C,8", "A,8",
"D,8", "A,9"});
@@ -134,7 +132,7 @@ public class TestStreamingLocal extends
for (int i = 0; i < withTypes.length; i++) {
Tuple[] expectedResults = null;
if(withTypes[i] == true) {
- expectedResults =
+ expectedResults =
setupExpectedResults(expectedFirstFields, expectedSecondFields);
} else {
expectedResults = setupExpectedResults(Util
@@ -161,9 +159,9 @@ public class TestStreamingLocal extends
}
@Test
- public void testSimpleReduceSideStreamingAfterFlatten()
+ public void testSimpleReduceSideStreamingAfterFlatten()
throws Exception {
- File input = Util.createInputFile("tmp", "",
+ File input = Util.createInputFile("tmp", "",
new String[] {"A,1", "B,2", "C,3", "D,2",
"A,5", "B,5", "C,8", "A,8",
"D,8", "A,9"});
@@ -175,7 +173,7 @@ public class TestStreamingLocal extends
for (int i = 0; i < withTypes.length; i++) {
Tuple[] expectedResults = null;
if(withTypes[i] == true) {
- expectedResults =
+ expectedResults =
setupExpectedResults(expectedFirstFields, expectedSecondFields);
} else {
expectedResults = setupExpectedResults(Util
@@ -208,7 +206,7 @@ public class TestStreamingLocal extends
@Test
public void testSimpleOrderedReduceSideStreamingAfterFlatten() throws Exception {
- File input = Util.createInputFile("tmp", "",
+ File input = Util.createInputFile("tmp", "",
new String[] {"A,1,2,3", "B,2,4,5",
"C,3,1,2", "D,2,5,2",
"A,5,5,1", "B,5,7,4",
@@ -217,7 +215,7 @@ public class TestStreamingLocal extends
);
// Expected results
- String[] expectedFirstFields =
+ String[] expectedFirstFields =
new String[] {"A", "A", "A", "A", "B", "B", "C", "C", "D", "D"};
Integer[] expectedSecondFields = new Integer[] {1, 9, 8, 5, 2, 5, 3, 8, 2, 8};
Integer[] expectedThirdFields = new Integer[] {2, 2, 4, 5, 4, 7, 1, 9, 5, 8};
@@ -256,30 +254,30 @@ public class TestStreamingLocal extends
}
@Test
- public void testSimpleMapSideStreamingWithUnixPipes()
+ public void testSimpleMapSideStreamingWithUnixPipes()
throws Exception {
- File input = Util.createInputFile("tmp", "",
+ File input = Util.createInputFile("tmp", "",
new String[] {"A,1", "B,2", "C,3", "D,2",
"A,5", "B,5", "C,8", "A,8",
"D,8", "A,9"});
// Expected results
- String[] expectedFirstFields =
+ String[] expectedFirstFields =
new String[] {"A", "B", "C", "D", "A", "B", "C", "A", "D", "A"};
Integer[] expectedSecondFields = new Integer[] {1, 2, 3, 2, 5, 5, 8, 8, 8, 9};
boolean[] withTypes = {true, false};
for (int i = 0; i < withTypes.length; i++) {
Tuple[] expectedResults = null;
if(withTypes[i] == true) {
- expectedResults =
+ expectedResults =
setupExpectedResults(expectedFirstFields, expectedSecondFields);
} else {
- expectedResults =
+ expectedResults =
setupExpectedResults(Util.toDataByteArrays(expectedFirstFields), Util.toDataByteArrays(expectedSecondFields));
}
// Pig query to run
- pigServer.registerQuery("define CMD `" + simpleEchoStreamingCommand +
+ pigServer.registerQuery("define CMD `" + simpleEchoStreamingCommand +
" | " + simpleEchoStreamingCommand + "`;");
pigServer.registerQuery("IP = load '" +
Util.generateURI(Util.encodeEscape(input.toString()), pigServer.getPigContext()) +
@@ -287,7 +285,7 @@ public class TestStreamingLocal extends
if(withTypes[i] == true) {
pigServer.registerQuery("OP = stream IP through CMD as (f0:chararray, f1:int);");
} else {
- pigServer.registerQuery("OP = stream IP through CMD;");
+ pigServer.registerQuery("OP = stream IP through CMD;");
}
// Run the query and check the results
@@ -335,9 +333,9 @@ public class TestStreamingLocal extends
testNegativeLoadStoreOptimization(ExecType.LOCAL);
}
- private void testNegativeLoadStoreOptimization(ExecType execType)
+ private void testNegativeLoadStoreOptimization(ExecType execType)
throws Exception {
- File input = Util.createInputFile("tmp", "",
+ File input = Util.createInputFile("tmp", "",
new String[] {"A,1", "B,2", "C,3", "D,2",
"A,5", "B,5", "C,8", "A,8",
"D,8", "A,9"});
@@ -349,7 +347,7 @@ public class TestStreamingLocal extends
for (int i = 0; i < withTypes.length; i++) {
Tuple[] expectedResults = null;
if(withTypes[i] == true) {
- expectedResults =
+ expectedResults =
setupExpectedResults(expectedFirstFields, expectedSecondFields);
} else {
expectedResults = setupExpectedResults(Util
@@ -358,7 +356,7 @@ public class TestStreamingLocal extends
}
// Pig query to run
- pigServer.registerQuery("define CMD `"+ simpleEchoStreamingCommand +
+ pigServer.registerQuery("define CMD `"+ simpleEchoStreamingCommand +
"` input(stdin);");
pigServer.registerQuery("IP = load '" +
Util.generateURI(Util.encodeEscape(input.toString()), pigServer.getPigContext()) +
@@ -369,7 +367,7 @@ public class TestStreamingLocal extends
simpleEchoStreamingCommand + "` as (f0:chararray, f1:int);");
} else {
pigServer.registerQuery("OP = stream FILTERED_DATA through `" +
- simpleEchoStreamingCommand + "`;");
+ simpleEchoStreamingCommand + "`;");
}
// Run the query and check the results
Modified: pig/trunk/test/org/apache/pig/test/TestToolsPigServer.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestToolsPigServer.java?rev=1406469&r1=1406468&r2=1406469&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestToolsPigServer.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestToolsPigServer.java Wed Nov 7 05:58:04 2012
@@ -18,59 +18,51 @@
package org.apache.pig.test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.File;
-import java.io.IOException;
import java.util.Iterator;
import java.util.List;
-import junit.framework.TestCase;
-
import org.apache.pig.ExecType;
import org.apache.pig.backend.executionengine.ExecJob;
import org.apache.pig.backend.executionengine.ExecJob.JOB_STATUS;
import org.apache.pig.builtin.PigStorage;
import org.apache.pig.data.Tuple;
import org.apache.pig.tools.ToolsPigServer;
-
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-@RunWith(JUnit4.class)
-public class TestToolsPigServer extends TestCase {
+public class TestToolsPigServer {
private ToolsPigServer pig = null;
static MiniCluster cluster = MiniCluster.buildCluster();
private File stdOutRedirectedFile;
@Before
- @Override
public void setUp() throws Exception{
pig = new ToolsPigServer(ExecType.MAPREDUCE, cluster.getProperties());
stdOutRedirectedFile = new File("stdout.redirected");
// Create file if it does not exist
- try {
- if(!stdOutRedirectedFile.createNewFile())
- fail("Unable to create input files");
- } catch (IOException e) {
- fail("Unable to create input files:" + e.getMessage());
- }
+ if(!stdOutRedirectedFile.createNewFile())
+ fail("Unable to create input files");
}
-
+
@After
- @Override
public void tearDown() throws Exception{
pig = null;
stdOutRedirectedFile.delete();
}
-
+
@AfterClass
public static void oneTimeTearDown() throws Exception {
cluster.shutDown();
}
-
+
@Test
public void testToolsPigServer() throws Exception {
Util.createInputFile(cluster, "input", new String[] {
@@ -137,6 +129,4 @@ public class TestToolsPigServer extends
assertEquals("abc", t.get(0).toString());
assertTrue(results.hasNext());
}
-
-
-}
+}
\ No newline at end of file
Modified: pig/trunk/test/org/apache/pig/test/TestUDF.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestUDF.java?rev=1406469&r1=1406468&r2=1406469&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestUDF.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestUDF.java Wed Nov 7 05:58:04 2012
@@ -18,19 +18,20 @@
package org.apache.pig.test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.List;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
-import junit.framework.TestCase;
-
-import org.apache.pig.ExecType;
import org.apache.pig.EvalFunc;
+import org.apache.pig.ExecType;
import org.apache.pig.FuncSpec;
import org.apache.pig.PigServer;
import org.apache.pig.data.DataType;
@@ -43,154 +44,120 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-@RunWith(JUnit4.class)
-public class TestUDF extends TestCase {
+public class TestUDF {
+
+ static String[] ScriptStatement = {
+ "A = LOAD 'test/org/apache/pig/test/data/passwd' USING PigStorage();",
+ "B = FOREACH A GENERATE org.apache.pig.test.utils.MyUDFReturnMap(1);" };
+
+ static File TempScriptFile = null;
+
+ static MiniCluster cluster = MiniCluster.buildCluster();
+
+ @Before
+ public void setUp() throws Exception {
+ FileLocalizer.setInitialized(false);
+ TempScriptFile = File.createTempFile("temp_jira_851", ".pig");
+ FileWriter writer = new FileWriter(TempScriptFile);
+ for (String line : ScriptStatement) {
+ writer.write(line + "\n");
+ }
+ writer.close();
+
+ }
+
+ @AfterClass
+ public static void oneTimeTearDown() throws Exception {
+ cluster.shutDown();
+ }
- static String[] ScriptStatement = {
- "A = LOAD 'test/org/apache/pig/test/data/passwd' USING PigStorage();",
- "B = FOREACH A GENERATE org.apache.pig.test.utils.MyUDFReturnMap(1);" };
-
- static File TempScriptFile = null;
-
- static MiniCluster cluster = MiniCluster.buildCluster();
-
- @Override
- @Before
- public void setUp() throws Exception {
- FileLocalizer.setInitialized(false);
- TempScriptFile = File.createTempFile("temp_jira_851", ".pig");
- FileWriter writer = new FileWriter(TempScriptFile);
- for (String line : ScriptStatement) {
- writer.write(line + "\n");
- }
- writer.close();
-
- }
-
- @AfterClass
- public static void oneTimeTearDown() throws Exception {
- cluster.shutDown();
- }
-
- @Test
- public void testUDFReturnMap_LocalMode() {
- try {
- PigServer pig = new PigServer(ExecType.LOCAL);
- pig.registerScript(TempScriptFile.getAbsolutePath());
-
- Iterator<Tuple> iterator = pig.openIterator("B");
- int index = 0;
- while (iterator.hasNext()) {
- Tuple tuple = iterator.next();
- index++;
- Map<Object, Object> result = (Map<Object, Object>) tuple.get(0);
- assertEquals(result, MyUDFReturnMap.map);
- }
- } catch (IOException e) {
- e.printStackTrace();
- fail();
- }
- }
-
- @Test
- public void testUDFReturnMap_MapReduceMode() {
- try {
- Util.createInputFile(cluster, "a.txt", new String[] { "dummy",
- "dummy" });
- FileLocalizer.deleteTempFiles();
- PigServer pig = new PigServer(ExecType.MAPREDUCE, cluster
- .getProperties());
- pig.registerQuery("A = LOAD 'a.txt';");
- pig
- .registerQuery("B = FOREACH A GENERATE org.apache.pig.test.utils.MyUDFReturnMap();");
-
- Iterator<Tuple> iterator = pig.openIterator("B");
- int index = 0;
- while (iterator.hasNext()) {
- Tuple tuple = iterator.next();
- index++;
- Map<Object, Object> result = (Map<Object, Object>) tuple.get(0);
- assertEquals(result, MyUDFReturnMap.map);
- }
- } catch (IOException e) {
- e.printStackTrace();
- fail();
- }
- }
-
- @Test
- public void testUDFMultiLevelOutputSchema() {
- try {
- PigServer pig = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
- pig.registerQuery("A = LOAD 'a.txt';");
- pig.registerQuery("B = FOREACH A GENERATE org.apache.pig.test.utils.MultiLevelDerivedUDF1();");
- pig.registerQuery("C = FOREACH A GENERATE org.apache.pig.test.utils.MultiLevelDerivedUDF2();");
- pig.registerQuery("D = FOREACH A GENERATE org.apache.pig.test.utils.MultiLevelDerivedUDF3();");
- Schema s = pig.dumpSchema("B");
- assertTrue(s.getField(0).type == DataType.DOUBLE);
- s = pig.dumpSchema("C");
- assertTrue(s.getField(0).type == DataType.DOUBLE);
- s = pig.dumpSchema("D");
- assertTrue(s.getField(0).type == DataType.DOUBLE);
- } catch (IOException e) {
- e.printStackTrace();
- fail();
+ @Test
+ public void testUDFReturnMap_LocalMode() throws Exception {
+ PigServer pig = new PigServer(ExecType.LOCAL);
+ pig.registerScript(TempScriptFile.getAbsolutePath());
+
+ Iterator<Tuple> iterator = pig.openIterator("B");
+ while (iterator.hasNext()) {
+ Tuple tuple = iterator.next();
+ Map<Object, Object> result = (Map<Object, Object>) tuple.get(0);
+ assertEquals(result, MyUDFReturnMap.map);
}
}
+ @Test
+ public void testUDFReturnMap_MapReduceMode() throws Exception {
+ Util.createInputFile(cluster, "a.txt", new String[] { "dummy",
+ "dummy" });
+ FileLocalizer.deleteTempFiles();
+ PigServer pig = new PigServer(ExecType.MAPREDUCE, cluster
+ .getProperties());
+ pig.registerQuery("A = LOAD 'a.txt';");
+ pig.registerQuery("B = FOREACH A GENERATE org.apache.pig.test.utils.MyUDFReturnMap();");
+
+ Iterator<Tuple> iterator = pig.openIterator("B");
+ while (iterator.hasNext()) {
+ Tuple tuple = iterator.next();
+ Map<Object, Object> result = (Map<Object, Object>) tuple.get(0);
+ assertEquals(result, MyUDFReturnMap.map);
+ }
+ }
+
+ @Test
+ public void testUDFMultiLevelOutputSchema() throws Exception {
+ PigServer pig = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());
+ pig.registerQuery("A = LOAD 'a.txt';");
+ pig.registerQuery("B = FOREACH A GENERATE org.apache.pig.test.utils.MultiLevelDerivedUDF1();");
+ pig.registerQuery("C = FOREACH A GENERATE org.apache.pig.test.utils.MultiLevelDerivedUDF2();");
+ pig.registerQuery("D = FOREACH A GENERATE org.apache.pig.test.utils.MultiLevelDerivedUDF3();");
+ Schema s = pig.dumpSchema("B");
+ assertTrue(s.getField(0).type == DataType.DOUBLE);
+ s = pig.dumpSchema("C");
+ assertTrue(s.getField(0).type == DataType.DOUBLE);
+ s = pig.dumpSchema("D");
+ assertTrue(s.getField(0).type == DataType.DOUBLE);
+ }
+
//see PIG-2430
@Test
- public void testEvalFuncGetArgToFunc() throws Throwable {
+ public void testEvalFuncGetArgToFunc() throws Exception {
String input = "udf_test_jira_2430.txt";
Util.createLocalInputFile(input, new String[]{"1,hey"});
- try {
- PigServer pigServer = new PigServer(ExecType.LOCAL);
- pigServer.registerQuery("A = LOAD '"+input+"' USING PigStorage(',') AS (x:int,y:chararray);");
- pigServer.registerQuery("B = FOREACH A GENERATE org.apache.pig.test.TestUDF$UdfWithFuncSpecWithArgs(x);");
- pigServer.registerQuery("C = FOREACH A GENERATE org.apache.pig.test.TestUDF$UdfWithFuncSpecWithArgs(y);");
- pigServer.registerQuery("D = FOREACH A GENERATE org.apache.pig.test.TestUDF$UdfWithFuncSpecWithArgs((long)x);");
- pigServer.registerQuery("E = FOREACH A GENERATE org.apache.pig.test.TestUDF$UdfWithFuncSpecWithArgs((double)x);");
- pigServer.registerQuery("F = FOREACH A GENERATE org.apache.pig.test.TestUDF$UdfWithFuncSpecWithArgs((float)x);");
- Iterator<Tuple> it = pigServer.openIterator("B");
- assertEquals(Integer.valueOf(2),(Integer)it.next().get(0));
- it = pigServer.openIterator("C");
- assertEquals(Integer.valueOf(1), (Integer)it.next().get(0));
- it = pigServer.openIterator("D");
- assertEquals(Integer.valueOf(3),(Integer)it.next().get(0));
- it = pigServer.openIterator("E");
- assertEquals(Integer.valueOf(4),(Integer)it.next().get(0));
- it = pigServer.openIterator("F");
- assertEquals(Integer.valueOf(5),(Integer)it.next().get(0));
- } catch (IOException e) {
- e.printStackTrace();
- fail();
- }
+ PigServer pigServer = new PigServer(ExecType.LOCAL);
+ pigServer.registerQuery("A = LOAD '"+input+"' USING PigStorage(',') AS (x:int,y:chararray);");
+ pigServer.registerQuery("B = FOREACH A GENERATE org.apache.pig.test.TestUDF$UdfWithFuncSpecWithArgs(x);");
+ pigServer.registerQuery("C = FOREACH A GENERATE org.apache.pig.test.TestUDF$UdfWithFuncSpecWithArgs(y);");
+ pigServer.registerQuery("D = FOREACH A GENERATE org.apache.pig.test.TestUDF$UdfWithFuncSpecWithArgs((long)x);");
+ pigServer.registerQuery("E = FOREACH A GENERATE org.apache.pig.test.TestUDF$UdfWithFuncSpecWithArgs((double)x);");
+ pigServer.registerQuery("F = FOREACH A GENERATE org.apache.pig.test.TestUDF$UdfWithFuncSpecWithArgs((float)x);");
+ Iterator<Tuple> it = pigServer.openIterator("B");
+ assertEquals(Integer.valueOf(2),(Integer)it.next().get(0));
+ it = pigServer.openIterator("C");
+ assertEquals(Integer.valueOf(1), (Integer)it.next().get(0));
+ it = pigServer.openIterator("D");
+ assertEquals(Integer.valueOf(3),(Integer)it.next().get(0));
+ it = pigServer.openIterator("E");
+ assertEquals(Integer.valueOf(4),(Integer)it.next().get(0));
+ it = pigServer.openIterator("F");
+ assertEquals(Integer.valueOf(5),(Integer)it.next().get(0));
}
//see PIG-2430
@Test
- public void testNormalDefine() throws Throwable {
+ public void testNormalDefine() throws Exception {
String input = "udf_test_jira_2430_2.txt";
Util.createLocalInputFile(input, new String[]{"1"});
- try {
- PigServer pigServer = new PigServer(ExecType.LOCAL);
- pigServer.registerQuery("A = LOAD '"+input+"' as (x:int);");
- pigServer.registerQuery("DEFINE udftest1 org.apache.pig.test.TestUDF$UdfWithFuncSpecWithArgs('1');");
- pigServer.registerQuery("DEFINE udftest2 org.apache.pig.test.TestUDF$UdfWithFuncSpecWithArgs('2');");
- pigServer.registerQuery("DEFINE udftest3 org.apache.pig.test.TestUDF$UdfWithFuncSpecWithArgs('3');");
- pigServer.registerQuery("B = FOREACH A GENERATE udftest1(x), udftest2(x), udftest3(x);");
- Iterator<Tuple> its = pigServer.openIterator("B");
- Tuple t = its.next();
- assertEquals(Integer.valueOf(1),t.get(0));
- assertEquals(Integer.valueOf(2),t.get(1));
- assertEquals(Integer.valueOf(3),t.get(2));
- } catch (IOException e) {
- e.printStackTrace();
- fail();
- }
+ PigServer pigServer = new PigServer(ExecType.LOCAL);
+ pigServer.registerQuery("A = LOAD '"+input+"' as (x:int);");
+ pigServer.registerQuery("DEFINE udftest1 org.apache.pig.test.TestUDF$UdfWithFuncSpecWithArgs('1');");
+ pigServer.registerQuery("DEFINE udftest2 org.apache.pig.test.TestUDF$UdfWithFuncSpecWithArgs('2');");
+ pigServer.registerQuery("DEFINE udftest3 org.apache.pig.test.TestUDF$UdfWithFuncSpecWithArgs('3');");
+ pigServer.registerQuery("B = FOREACH A GENERATE udftest1(x), udftest2(x), udftest3(x);");
+ Iterator<Tuple> its = pigServer.openIterator("B");
+ Tuple t = its.next();
+ assertEquals(Integer.valueOf(1),t.get(0));
+ assertEquals(Integer.valueOf(2),t.get(1));
+ assertEquals(Integer.valueOf(3),t.get(2));
}
@Test
@@ -228,11 +195,10 @@ public class TestUDF extends TestCase {
}
}
- @Override
- @After
- public void tearDown() throws Exception {
- TempScriptFile.delete();
- }
+ @After
+ public void tearDown() throws Exception {
+ TempScriptFile.delete();
+ }
public static class UdfWithFuncSpecWithArgs extends EvalFunc<Integer> {
private Integer ret = 0;
Modified: pig/trunk/test/org/apache/pig/test/TestUDFGroovy.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestUDFGroovy.java?rev=1406469&r1=1406468&r2=1406469&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestUDFGroovy.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestUDFGroovy.java Wed Nov 7 05:58:04 2012
@@ -21,6 +21,11 @@ package org.apache.pig.test;
import static org.apache.pig.builtin.mock.Storage.bag;
import static org.apache.pig.builtin.mock.Storage.resetData;
import static org.apache.pig.builtin.mock.Storage.tuple;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.FileWriter;
@@ -34,8 +39,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import junit.framework.TestCase;
-
import org.apache.pig.ExecType;
import org.apache.pig.PigServer;
import org.apache.pig.builtin.mock.Storage.Data;
@@ -45,202 +48,198 @@ import org.apache.pig.data.DefaultDataBa
import org.apache.pig.data.Tuple;
import org.apache.pig.data.TupleFactory;
import org.apache.pig.scripting.groovy.GroovyUtils;
-import org.junit.Assert;
import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
-@RunWith(JUnit4.class)
-public class TestUDFGroovy extends TestCase {
+public class TestUDFGroovy {
@Test
public void testPigToGroovy() throws Exception {
Object pigObject = Boolean.TRUE;
Object groovyObject = GroovyUtils.pigToGroovy(pigObject);
- Assert.assertTrue(groovyObject instanceof Boolean);
- Assert.assertEquals(true, groovyObject);
+ assertTrue(groovyObject instanceof Boolean);
+ assertEquals(true, groovyObject);
pigObject = Integer.valueOf(42);
groovyObject = GroovyUtils.pigToGroovy(pigObject);
- Assert.assertTrue(groovyObject instanceof Integer);
- Assert.assertEquals(42, groovyObject);
+ assertTrue(groovyObject instanceof Integer);
+ assertEquals(42, groovyObject);
pigObject = Long.valueOf(0x100000000L);
groovyObject = GroovyUtils.pigToGroovy(pigObject);
- Assert.assertTrue(groovyObject instanceof Long);
- Assert.assertEquals(0x100000000L, groovyObject);
+ assertTrue(groovyObject instanceof Long);
+ assertEquals(0x100000000L, groovyObject);
pigObject = Float.MIN_VALUE;
groovyObject = GroovyUtils.pigToGroovy(pigObject);
- Assert.assertTrue(groovyObject instanceof Float);
- Assert.assertEquals(Float.MIN_VALUE, groovyObject);
+ assertTrue(groovyObject instanceof Float);
+ assertEquals(Float.MIN_VALUE, groovyObject);
pigObject = Double.MAX_VALUE;
groovyObject = GroovyUtils.pigToGroovy(pigObject);
- Assert.assertTrue(groovyObject instanceof Double);
- Assert.assertEquals(Double.MAX_VALUE, groovyObject);
+ assertTrue(groovyObject instanceof Double);
+ assertEquals(Double.MAX_VALUE, groovyObject);
pigObject = "Dans le cochon tout est bon !";
groovyObject = GroovyUtils.pigToGroovy(pigObject);
- Assert.assertTrue(groovyObject instanceof String);
- Assert.assertEquals("Dans le cochon tout est bon !", groovyObject);
+ assertTrue(groovyObject instanceof String);
+ assertEquals("Dans le cochon tout est bon !", groovyObject);
pigObject = new DataByteArray("Surtout le jambon".getBytes("UTF-8"));
groovyObject = GroovyUtils.pigToGroovy(pigObject);
- Assert.assertTrue(groovyObject instanceof byte[]);
- Assert.assertArrayEquals("Surtout le jambon".getBytes("UTF-8"), (byte[]) groovyObject);
+ assertTrue(groovyObject instanceof byte[]);
+ assertArrayEquals("Surtout le jambon".getBytes("UTF-8"), (byte[]) groovyObject);
pigObject = tuple("a","b","c");
groovyObject = GroovyUtils.pigToGroovy(pigObject);
- Assert.assertTrue(groovyObject instanceof groovy.lang.Tuple);
- Assert.assertEquals(3, ((groovy.lang.Tuple) groovyObject).size());
- Assert.assertEquals("a", ((groovy.lang.Tuple) groovyObject).get(0));
- Assert.assertEquals("b", ((groovy.lang.Tuple) groovyObject).get(1));
- Assert.assertEquals("c", ((groovy.lang.Tuple) groovyObject).get(2));
+ assertTrue(groovyObject instanceof groovy.lang.Tuple);
+ assertEquals(3, ((groovy.lang.Tuple) groovyObject).size());
+ assertEquals("a", ((groovy.lang.Tuple) groovyObject).get(0));
+ assertEquals("b", ((groovy.lang.Tuple) groovyObject).get(1));
+ assertEquals("c", ((groovy.lang.Tuple) groovyObject).get(2));
pigObject = bag(tuple("a"), tuple("b"));
groovyObject = GroovyUtils.pigToGroovy(pigObject);
- Assert.assertTrue(groovyObject instanceof groovy.lang.Tuple);
- Assert.assertEquals(2, ((groovy.lang.Tuple) groovyObject).size());
- Assert.assertEquals(2L, ((groovy.lang.Tuple) groovyObject).get(0));
- Assert.assertTrue(((groovy.lang.Tuple) groovyObject).get(1) instanceof Iterator);
+ assertTrue(groovyObject instanceof groovy.lang.Tuple);
+ assertEquals(2, ((groovy.lang.Tuple) groovyObject).size());
+ assertEquals(2L, ((groovy.lang.Tuple) groovyObject).get(0));
+ assertTrue(((groovy.lang.Tuple) groovyObject).get(1) instanceof Iterator);
Iterator<groovy.lang.Tuple> iter = (Iterator) ((groovy.lang.Tuple) groovyObject).get(1);
groovy.lang.Tuple t = iter.next();
- Assert.assertEquals(1, t.size());
- Assert.assertEquals("a", t.get(0));
+ assertEquals(1, t.size());
+ assertEquals("a", t.get(0));
t = iter.next();
- Assert.assertEquals(1, t.size());
- Assert.assertEquals("b", t.get(0));
+ assertEquals(1, t.size());
+ assertEquals("b", t.get(0));
pigObject = new HashMap<String, String>();
((Map) pigObject).put("Pate", "Henaff");
((Map) pigObject).put("Rillettes", "Bordeau Chesnel");
groovyObject = GroovyUtils.pigToGroovy(pigObject);
- Assert.assertTrue(groovyObject instanceof Map);
- Assert.assertEquals(2, ((Map) groovyObject).size());
- Assert.assertEquals("Henaff", ((Map) groovyObject).get("Pate"));
- Assert.assertEquals("Bordeau Chesnel", ((Map) groovyObject).get("Rillettes"));
+ assertTrue(groovyObject instanceof Map);
+ assertEquals(2, ((Map) groovyObject).size());
+ assertEquals("Henaff", ((Map) groovyObject).get("Pate"));
+ assertEquals("Bordeau Chesnel", ((Map) groovyObject).get("Rillettes"));
pigObject = null;
groovyObject = GroovyUtils.pigToGroovy(pigObject);
- Assert.assertNull(groovyObject);
+ assertNull(groovyObject);
}
@Test
public void testGroovyToPig() throws Exception {
Object groovyObject = Boolean.TRUE;
Object pigObject = GroovyUtils.groovyToPig(groovyObject);
- Assert.assertTrue(pigObject instanceof Boolean);
- Assert.assertEquals(true, pigObject);
+ assertTrue(pigObject instanceof Boolean);
+ assertEquals(true, pigObject);
groovyObject = Byte.MIN_VALUE;
pigObject = GroovyUtils.groovyToPig(groovyObject);
- Assert.assertTrue(pigObject instanceof Integer);
- Assert.assertEquals((int) Byte.MIN_VALUE, pigObject);
+ assertTrue(pigObject instanceof Integer);
+ assertEquals((int) Byte.MIN_VALUE, pigObject);
groovyObject = Short.MIN_VALUE;
pigObject = GroovyUtils.groovyToPig(groovyObject);
- Assert.assertTrue(pigObject instanceof Integer);
- Assert.assertEquals((int) Short.MIN_VALUE, pigObject);
+ assertTrue(pigObject instanceof Integer);
+ assertEquals((int) Short.MIN_VALUE, pigObject);
groovyObject = Integer.MIN_VALUE;
pigObject = GroovyUtils.groovyToPig(groovyObject);
- Assert.assertTrue(pigObject instanceof Integer);
- Assert.assertEquals(Integer.MIN_VALUE, pigObject);
+ assertTrue(pigObject instanceof Integer);
+ assertEquals(Integer.MIN_VALUE, pigObject);
groovyObject = Long.MIN_VALUE;
pigObject = GroovyUtils.groovyToPig(groovyObject);
- Assert.assertTrue(pigObject instanceof Long);
- Assert.assertEquals(Long.MIN_VALUE, pigObject);
+ assertTrue(pigObject instanceof Long);
+ assertEquals(Long.MIN_VALUE, pigObject);
groovyObject = BigInteger.TEN;
pigObject = GroovyUtils.groovyToPig(groovyObject);
- Assert.assertTrue(pigObject instanceof Long);
- Assert.assertEquals(10L, pigObject);
+ assertTrue(pigObject instanceof Long);
+ assertEquals(10L, pigObject);
groovyObject = Float.MIN_NORMAL;
pigObject = GroovyUtils.groovyToPig(groovyObject);
- Assert.assertTrue(pigObject instanceof Float);
- Assert.assertEquals(Float.MIN_NORMAL, pigObject);
+ assertTrue(pigObject instanceof Float);
+ assertEquals(Float.MIN_NORMAL, pigObject);
groovyObject = Double.MIN_VALUE;
pigObject = GroovyUtils.groovyToPig(groovyObject);
- Assert.assertTrue(pigObject instanceof Double);
- Assert.assertEquals(Double.MIN_VALUE, pigObject);
+ assertTrue(pigObject instanceof Double);
+ assertEquals(Double.MIN_VALUE, pigObject);
groovyObject = new BigDecimal("42.42");
pigObject = GroovyUtils.groovyToPig(groovyObject);
- Assert.assertTrue(pigObject instanceof Double);
- Assert.assertEquals(42.42D, pigObject);
+ assertTrue(pigObject instanceof Double);
+ assertEquals(42.42D, pigObject);
groovyObject = "Dans le cochon tout est bon !";
pigObject = GroovyUtils.groovyToPig(groovyObject);
- Assert.assertTrue(pigObject instanceof String);
- Assert.assertEquals("Dans le cochon tout est bon !", pigObject);
+ assertTrue(pigObject instanceof String);
+ assertEquals("Dans le cochon tout est bon !", pigObject);
groovyObject = "Surtout le jambon".getBytes("UTF-8");
pigObject = GroovyUtils.groovyToPig(groovyObject);
- Assert.assertTrue(pigObject instanceof DataByteArray);
- Assert.assertArrayEquals("Surtout le jambon".getBytes("UTF-8"), ((DataByteArray) pigObject).get());
+ assertTrue(pigObject instanceof DataByteArray);
+ assertArrayEquals("Surtout le jambon".getBytes("UTF-8"), ((DataByteArray) pigObject).get());
groovyObject = new Object[2];
((Object[]) groovyObject)[0] = "Pate";
((Object[]) groovyObject)[1] = "Henaff";
pigObject = GroovyUtils.groovyToPig(groovyObject);
- Assert.assertTrue(pigObject instanceof Tuple);
- Assert.assertEquals(2, ((Tuple) pigObject).size());
- Assert.assertEquals("Pate", ((Tuple) pigObject).get(0));
- Assert.assertEquals("Henaff", ((Tuple) pigObject).get(1));
+ assertTrue(pigObject instanceof Tuple);
+ assertEquals(2, ((Tuple) pigObject).size());
+ assertEquals("Pate", ((Tuple) pigObject).get(0));
+ assertEquals("Henaff", ((Tuple) pigObject).get(1));
groovyObject = new Object[2];
((Object[]) groovyObject)[0] = "Rillettes";
((Object[]) groovyObject)[1] = "Bordeau Chesnel";
groovyObject = new groovy.lang.Tuple((Object[]) groovyObject);
pigObject = GroovyUtils.groovyToPig(groovyObject);
- Assert.assertTrue(pigObject instanceof Tuple);
- Assert.assertEquals(2, ((Tuple) pigObject).size());
- Assert.assertEquals("Rillettes", ((Tuple) pigObject).get(0));
- Assert.assertEquals("Bordeau Chesnel", ((Tuple) pigObject).get(1));
+ assertTrue(pigObject instanceof Tuple);
+ assertEquals(2, ((Tuple) pigObject).size());
+ assertEquals("Rillettes", ((Tuple) pigObject).get(0));
+ assertEquals("Bordeau Chesnel", ((Tuple) pigObject).get(1));
groovyObject = new ArrayList<Object>();
((List<Object>) groovyObject).add("Jaret");
((List<Object>) groovyObject).add("Filet Mignon");
pigObject = GroovyUtils.groovyToPig(groovyObject);
- Assert.assertTrue(pigObject instanceof DataBag);
- Assert.assertEquals(2, ((DataBag) pigObject).size());
+ assertTrue(pigObject instanceof DataBag);
+ assertEquals(2, ((DataBag) pigObject).size());
Iterator<Tuple> iter = ((DataBag) pigObject).iterator();
Set<String> values = new HashSet<String>();
while (iter.hasNext()) {
Tuple t = iter.next();
- Assert.assertEquals(1, t.size());
+ assertEquals(1, t.size());
values.add((String) t.get(0));
}
- Assert.assertEquals(2, values.size());
- Assert.assertTrue(values.contains("Jaret"));
- Assert.assertTrue(values.contains("Filet Mignon"));
+ assertEquals(2, values.size());
+ assertTrue(values.contains("Jaret"));
+ assertTrue(values.contains("Filet Mignon"));
groovyObject = new HashMap<String, String>();
((Map) groovyObject).put("Henaff", "a bord");
((Map) groovyObject).put("Copains", "comme cochons");
pigObject = GroovyUtils.groovyToPig(groovyObject);
- Assert.assertTrue(pigObject instanceof Map);
- Assert.assertEquals(2, ((Map) pigObject).size());
- Assert.assertEquals("a bord", ((Map) pigObject).get("Henaff"));
- Assert.assertEquals("comme cochons", ((Map) pigObject).get("Copains"));
+ assertTrue(pigObject instanceof Map);
+ assertEquals(2, ((Map) pigObject).size());
+ assertEquals("a bord", ((Map) pigObject).get("Henaff"));
+ assertEquals("comme cochons", ((Map) pigObject).get("Copains"));
groovyObject = TupleFactory.getInstance().newTuple(2);
((Tuple) groovyObject).set(0, "jambon");
((Tuple) groovyObject).set(1, "blanc");
pigObject = GroovyUtils.groovyToPig(groovyObject);
- Assert.assertSame(groovyObject, pigObject);
+ assertSame(groovyObject, pigObject);
groovyObject = new DefaultDataBag();
pigObject = GroovyUtils.groovyToPig(groovyObject);
- Assert.assertSame(groovyObject, pigObject);
+ assertSame(groovyObject, pigObject);
groovyObject = null;
pigObject = GroovyUtils.groovyToPig(groovyObject);
- Assert.assertNull(pigObject);
+ assertNull(pigObject);
}
@Test
@@ -280,10 +279,10 @@ public class TestUDFGroovy extends TestC
pigServer.registerQuery("STORE B INTO 'bar0' USING mock.Storage();");
List<Tuple> out = data.get("bar0");
- Assert.assertEquals(tuple(1L), out.get(0));
- Assert.assertEquals(tuple(4L), out.get(1));
- Assert.assertEquals(tuple(9L), out.get(2));
- Assert.assertEquals(tuple(16L), out.get(3));
+ assertEquals(tuple(1L), out.get(0));
+ assertEquals(tuple(4L), out.get(1));
+ assertEquals(tuple(9L), out.get(2));
+ assertEquals(tuple(16L), out.get(3));
}
@Test
@@ -324,7 +323,7 @@ public class TestUDFGroovy extends TestC
pigServer.registerQuery("STORE B INTO 'bar1' USING mock.Storage();");
List<Tuple> out = data.get("bar1");
- Assert.assertEquals(tuple(42L), out.get(0));
+ assertEquals(tuple(42L), out.get(0));
}
@Test
@@ -387,7 +386,7 @@ public class TestUDFGroovy extends TestC
pigServer.registerQuery("STORE C INTO 'bar2' USING mock.Storage();");
List<Tuple> out = data.get("bar2");
- Assert.assertEquals(tuple(10L), out.get(0));
+ assertEquals(tuple(10L), out.get(0));
}
@Test
@@ -443,7 +442,7 @@ public class TestUDFGroovy extends TestC
pigServer.registerQuery("STORE C INTO 'bar3' USING mock.Storage();");
List<Tuple> out = data.get("bar3");
- Assert.assertEquals(tuple(10L,10L), out.get(0));
+ assertEquals(tuple(10L,10L), out.get(0));
}
@Test
@@ -485,7 +484,7 @@ public class TestUDFGroovy extends TestC
List<Tuple> out = data.get("bar4");
// Multiplying two floats leads to a double in Groovy, this is reflected here.
- Assert.assertEquals(tuple(1,1L,1.0D,1.0D), out.get(0));
- Assert.assertEquals(tuple(4,4L,4.0D,4.0D), out.get(1));
+ assertEquals(tuple(1,1L,1.0D,1.0D), out.get(0));
+ assertEquals(tuple(4,4L,4.0D,4.0D), out.get(1));
}
}
Modified: pig/trunk/test/org/apache/pig/test/TestUDFWithoutParameter.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestUDFWithoutParameter.java?rev=1406469&r1=1406468&r2=1406469&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestUDFWithoutParameter.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestUDFWithoutParameter.java Wed Nov 7 05:58:04 2012
@@ -17,55 +17,53 @@
*/
package org.apache.pig.test;
+import static org.junit.Assert.assertEquals;
+
import java.io.File;
import java.io.FileWriter;
-import java.io.IOException;
import java.util.Iterator;
-import junit.framework.TestCase;
-
import org.apache.pig.ExecType;
import org.apache.pig.PigServer;
import org.apache.pig.data.Tuple;
-
-public class TestUDFWithoutParameter extends TestCase {
-
- static String[] ScriptStatement = { "A = LOAD 'test/org/apache/pig/test/data/passwd' USING PigStorage();",
- "B = FOREACH A GENERATE org.apache.pig.test.utils.MyUDFWithoutParameter();" };
-
- static File TempScriptFile = null;
-
- @Override
- protected void setUp() throws Exception {
- TempScriptFile = File.createTempFile("temp_jira_753", ".pig");
- FileWriter writer=new FileWriter(TempScriptFile);
- for (String line:ScriptStatement){
- writer.write(line+"\n");
- }
- writer.close();
- }
-
- public void testUDFWithoutParameter() {
- try {
- PigServer pig = new PigServer(ExecType.LOCAL);
- pig.registerScript(TempScriptFile.getAbsolutePath());
-
- Iterator<Tuple> iterator=pig.openIterator("B");
- int index=0;
- while(iterator.hasNext()){
- Tuple tuple=iterator.next();
- index++;
- int result=(Integer)tuple.get(0);
- assertEquals(result, index);
- }
- } catch (IOException e) {
- e.printStackTrace();
- fail();
- }
- }
-
- @Override
- protected void tearDown() throws Exception {
- TempScriptFile.delete();
- }
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestUDFWithoutParameter {
+
+ static String[] ScriptStatement = { "A = LOAD 'test/org/apache/pig/test/data/passwd' USING PigStorage();",
+ "B = FOREACH A GENERATE org.apache.pig.test.utils.MyUDFWithoutParameter();" };
+
+ static File TempScriptFile = null;
+
+ @Before
+ public void setUp() throws Exception {
+ TempScriptFile = File.createTempFile("temp_jira_753", ".pig");
+ FileWriter writer=new FileWriter(TempScriptFile);
+ for (String line:ScriptStatement){
+ writer.write(line+"\n");
+ }
+ writer.close();
+ }
+
+ @Test
+ public void testUDFWithoutParameter() throws Exception {
+ PigServer pig = new PigServer(ExecType.LOCAL);
+ pig.registerScript(TempScriptFile.getAbsolutePath());
+
+ Iterator<Tuple> iterator=pig.openIterator("B");
+ int index=0;
+ while(iterator.hasNext()){
+ Tuple tuple=iterator.next();
+ index++;
+ int result=(Integer)tuple.get(0);
+ assertEquals(result, index);
+ }
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ TempScriptFile.delete();
+ }
}
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=1406469&r1=1406468&r2=1406469&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestUTF8.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestUTF8.java Wed Nov 7 05:58:04 2012
@@ -17,6 +17,9 @@
*/
package org.apache.pig.test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -25,29 +28,22 @@ 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;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
import org.apache.pig.ExecType;
import org.apache.pig.PigServer;
import org.apache.pig.builtin.PigStorage;
-import org.apache.pig.data.*;
+import org.apache.pig.data.DataType;
+import org.apache.pig.data.Tuple;
import org.apache.pig.tools.grunt.Grunt;
import org.apache.pig.tools.parameters.ParameterSubstitutionPreprocessor;
-
-import junit.framework.TestCase;
-@RunWith(JUnit4.class)
-public class TestUTF8 extends TestCase {
+import org.junit.Before;
+import org.junit.Test;
+public class TestUTF8 {
private PigServer pigServer;
@Before
- @Override
- public void setUp() throws Exception{
- pigServer = new PigServer(ExecType.LOCAL, new Properties());
+ public void setUp() throws Exception {
+ pigServer = new PigServer(ExecType.LOCAL);
}
@Test