You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2017/04/15 07:23:04 UTC
svn commit: r1791458 - in /pig/trunk: ./
contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/
contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/
test/org/apache/pig/ test/org/apache/pig/backend/ha...
Author: daijy
Date: Sat Apr 15 07:23:03 2017
New Revision: 1791458
URL: http://svn.apache.org/viewvc?rev=1791458&view=rev
Log:
PIG-5222: Fix Junit Deprecations
Modified:
pig/trunk/CHANGES.txt
pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestToBagToTuple.java
pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestFixedWidthStorer.java
pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestIndexedStorage.java
pig/trunk/test/org/apache/pig/TestLoadFuncMetadataWrapper.java
pig/trunk/test/org/apache/pig/TestLoadFuncWrapper.java
pig/trunk/test/org/apache/pig/TestLoadStoreFuncLifeCycle.java
pig/trunk/test/org/apache/pig/TestStoreFuncMetadataWrapper.java
pig/trunk/test/org/apache/pig/TestStoreFuncWrapper.java
pig/trunk/test/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/TestPigBytesRawComparator.java
pig/trunk/test/org/apache/pig/newplan/logical/relational/TestLocationInPhysicalPlan.java
pig/trunk/test/org/apache/pig/parser/TestAstValidator.java
pig/trunk/test/org/apache/pig/parser/TestColumnAliasConversion.java
pig/trunk/test/org/apache/pig/parser/TestErrorHandling.java
pig/trunk/test/org/apache/pig/parser/TestQueryLexer.java
pig/trunk/test/org/apache/pig/parser/TestScalarVisitor.java
pig/trunk/test/org/apache/pig/parser/TestSchemaAliasVisitor.java
pig/trunk/test/org/apache/pig/parser/TestUnionOnSchemaSetter.java
pig/trunk/test/org/apache/pig/pigunit/PigTest.java
pig/trunk/test/org/apache/pig/test/TestAssert.java
pig/trunk/test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java
pig/trunk/test/org/apache/pig/test/TestCase.java
pig/trunk/test/org/apache/pig/test/TestCubeOperator.java
pig/trunk/test/org/apache/pig/test/TestEvalPipelineLocal.java
pig/trunk/test/org/apache/pig/test/TestIn.java
pig/trunk/test/org/apache/pig/test/TestJobSubmission.java
pig/trunk/test/org/apache/pig/test/TestLineageFindRelVisitor.java
pig/trunk/test/org/apache/pig/test/TestLoadFunc.java
pig/trunk/test/org/apache/pig/test/TestLocal2.java
pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java
pig/trunk/test/org/apache/pig/test/TestOptimizeLimit.java
pig/trunk/test/org/apache/pig/test/TestPigContextClassCache.java
pig/trunk/test/org/apache/pig/test/TestPigException.java
pig/trunk/test/org/apache/pig/test/TestPlanGeneration.java
pig/trunk/test/org/apache/pig/test/TestResourceSchema.java
pig/trunk/test/org/apache/pig/test/TestSplitCombine.java
pig/trunk/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java
pig/trunk/test/org/apache/pig/test/TestTypedMap.java
pig/trunk/test/org/apache/pig/test/TestUnionOnSchema.java
pig/trunk/test/org/apache/pig/test/pigunit/pig/TestGruntParser.java
Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Sat Apr 15 07:23:03 2017
@@ -97,6 +97,8 @@ OPTIMIZATIONS
BUG FIXES
+PIG-5222: Fix Junit Deprecations (wattsinabox via daijy)
+
PIG-5223: TestLimitVariable.testNestedLimitVariable1 and TestSecondarySortMR.testNestedLimitedSort failing (jins via daijy)
PIG-5209: Cross product on flatten(map) fails with ClassCastException (knoguchi)
Modified: pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestToBagToTuple.java
URL: http://svn.apache.org/viewvc/pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestToBagToTuple.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestToBagToTuple.java (original)
+++ pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestToBagToTuple.java Sat Apr 15 07:23:03 2017
@@ -20,7 +20,7 @@ package org.apache.pig.piggybank.test.ev
import java.util.HashSet;
import java.util.Set;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.pig.data.DataBag;
import org.apache.pig.data.Tuple;
Modified: pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestFixedWidthStorer.java
URL: http://svn.apache.org/viewvc/pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestFixedWidthStorer.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestFixedWidthStorer.java (original)
+++ pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestFixedWidthStorer.java Sat Apr 15 07:23:03 2017
@@ -22,7 +22,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Iterator;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.lang.StringUtils;
@@ -98,4 +98,4 @@ public class TestFixedWidthStorer {
Assert.assertEquals(StringUtils.join(expected, "\n"), StringUtils.join(data, "\n"));
}
-}
\ No newline at end of file
+}
Modified: pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestIndexedStorage.java
URL: http://svn.apache.org/viewvc/pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestIndexedStorage.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestIndexedStorage.java (original)
+++ pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestIndexedStorage.java Sat Apr 15 07:23:03 2017
@@ -26,7 +26,7 @@ import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
Modified: pig/trunk/test/org/apache/pig/TestLoadFuncMetadataWrapper.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/TestLoadFuncMetadataWrapper.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/TestLoadFuncMetadataWrapper.java (original)
+++ pig/trunk/test/org/apache/pig/TestLoadFuncMetadataWrapper.java Sat Apr 15 07:23:03 2017
@@ -23,7 +23,7 @@ import org.junit.Test;
import java.io.IOException;
import java.util.NoSuchElementException;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
Modified: pig/trunk/test/org/apache/pig/TestLoadFuncWrapper.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/TestLoadFuncWrapper.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/TestLoadFuncWrapper.java (original)
+++ pig/trunk/test/org/apache/pig/TestLoadFuncWrapper.java Sat Apr 15 07:23:03 2017
@@ -17,7 +17,7 @@
*/
package org.apache.pig;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
Modified: pig/trunk/test/org/apache/pig/TestLoadStoreFuncLifeCycle.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/TestLoadStoreFuncLifeCycle.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/TestLoadStoreFuncLifeCycle.java (original)
+++ pig/trunk/test/org/apache/pig/TestLoadStoreFuncLifeCycle.java Sat Apr 15 07:23:03 2017
@@ -17,8 +17,8 @@
*/
package org.apache.pig;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import static org.apache.pig.builtin.mock.Storage.tuple;
import java.io.IOException;
Modified: pig/trunk/test/org/apache/pig/TestStoreFuncMetadataWrapper.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/TestStoreFuncMetadataWrapper.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/TestStoreFuncMetadataWrapper.java (original)
+++ pig/trunk/test/org/apache/pig/TestStoreFuncMetadataWrapper.java Sat Apr 15 07:23:03 2017
@@ -23,7 +23,7 @@ import org.junit.Test;
import java.io.IOException;
import java.util.NoSuchElementException;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
Modified: pig/trunk/test/org/apache/pig/TestStoreFuncWrapper.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/TestStoreFuncWrapper.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/TestStoreFuncWrapper.java (original)
+++ pig/trunk/test/org/apache/pig/TestStoreFuncWrapper.java Sat Apr 15 07:23:03 2017
@@ -29,7 +29,7 @@ import java.io.IOException;
import java.util.LinkedList;
import java.util.NoSuchElementException;
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
Modified: pig/trunk/test/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/TestPigBytesRawComparator.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/TestPigBytesRawComparator.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/TestPigBytesRawComparator.java (original)
+++ pig/trunk/test/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/TestPigBytesRawComparator.java Sat Apr 15 07:23:03 2017
@@ -17,7 +17,7 @@
*/
package org.apache.pig.backend.hadoop.executionengine.mapReduceLayer;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
import java.io.ByteArrayOutputStream;
import java.io.DataOutput;
Modified: pig/trunk/test/org/apache/pig/newplan/logical/relational/TestLocationInPhysicalPlan.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/newplan/logical/relational/TestLocationInPhysicalPlan.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/newplan/logical/relational/TestLocationInPhysicalPlan.java (original)
+++ pig/trunk/test/org/apache/pig/newplan/logical/relational/TestLocationInPhysicalPlan.java Sat Apr 15 07:23:03 2017
@@ -21,7 +21,7 @@ package org.apache.pig.newplan.logical.r
import java.io.File;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.pig.PigServer;
import org.apache.pig.backend.executionengine.ExecJob;
Modified: pig/trunk/test/org/apache/pig/parser/TestAstValidator.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/parser/TestAstValidator.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/parser/TestAstValidator.java (original)
+++ pig/trunk/test/org/apache/pig/parser/TestAstValidator.java Sat Apr 15 07:23:03 2017
@@ -20,7 +20,7 @@ package org.apache.pig.parser;
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.antlr.runtime.CharStream;
import org.antlr.runtime.CommonTokenStream;
Modified: pig/trunk/test/org/apache/pig/parser/TestColumnAliasConversion.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/parser/TestColumnAliasConversion.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/parser/TestColumnAliasConversion.java (original)
+++ pig/trunk/test/org/apache/pig/parser/TestColumnAliasConversion.java Sat Apr 15 07:23:03 2017
@@ -20,7 +20,7 @@ package org.apache.pig.parser;
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.antlr.runtime.RecognitionException;
import org.apache.pig.impl.logicalLayer.FrontendException;
Modified: pig/trunk/test/org/apache/pig/parser/TestErrorHandling.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/parser/TestErrorHandling.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/parser/TestErrorHandling.java (original)
+++ pig/trunk/test/org/apache/pig/parser/TestErrorHandling.java Sat Apr 15 07:23:03 2017
@@ -21,7 +21,7 @@ package org.apache.pig.parser;
import java.io.IOException;
import java.util.Properties;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.pig.ExecType;
import org.apache.pig.PigServer;
Modified: pig/trunk/test/org/apache/pig/parser/TestQueryLexer.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/parser/TestQueryLexer.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/parser/TestQueryLexer.java (original)
+++ pig/trunk/test/org/apache/pig/parser/TestQueryLexer.java Sat Apr 15 07:23:03 2017
@@ -20,7 +20,7 @@ package org.apache.pig.parser;
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.antlr.runtime.CharStream;
Modified: pig/trunk/test/org/apache/pig/parser/TestScalarVisitor.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/parser/TestScalarVisitor.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/parser/TestScalarVisitor.java (original)
+++ pig/trunk/test/org/apache/pig/parser/TestScalarVisitor.java Sat Apr 15 07:23:03 2017
@@ -21,7 +21,7 @@ package org.apache.pig.parser;
import java.io.IOException;
import java.util.Properties;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.antlr.runtime.RecognitionException;
import org.apache.pig.ExecType;
Modified: pig/trunk/test/org/apache/pig/parser/TestSchemaAliasVisitor.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/parser/TestSchemaAliasVisitor.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/parser/TestSchemaAliasVisitor.java (original)
+++ pig/trunk/test/org/apache/pig/parser/TestSchemaAliasVisitor.java Sat Apr 15 07:23:03 2017
@@ -20,7 +20,7 @@ package org.apache.pig.parser;
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.antlr.runtime.RecognitionException;
import org.apache.pig.impl.plan.PlanValidationException;
Modified: pig/trunk/test/org/apache/pig/parser/TestUnionOnSchemaSetter.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/parser/TestUnionOnSchemaSetter.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/parser/TestUnionOnSchemaSetter.java (original)
+++ pig/trunk/test/org/apache/pig/parser/TestUnionOnSchemaSetter.java Sat Apr 15 07:23:03 2017
@@ -18,7 +18,7 @@
package org.apache.pig.parser;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.pig.impl.logicalLayer.FrontendException;
import org.apache.pig.newplan.logical.relational.LogicalPlan;
Modified: pig/trunk/test/org/apache/pig/pigunit/PigTest.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/pigunit/PigTest.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/pigunit/PigTest.java (original)
+++ pig/trunk/test/org/apache/pig/pigunit/PigTest.java Sat Apr 15 07:23:03 2017
@@ -32,7 +32,7 @@ import java.util.Map;
import java.util.Set;
import com.google.common.collect.Iterables;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
Modified: pig/trunk/test/org/apache/pig/test/TestAssert.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestAssert.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestAssert.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestAssert.java Sat Apr 15 07:23:03 2017
@@ -17,7 +17,7 @@
*/
package org.apache.pig.test;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import static org.apache.pig.builtin.mock.Storage.resetData;
import static org.apache.pig.builtin.mock.Storage.tuple;
@@ -25,7 +25,7 @@ import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.pig.PigServer;
import org.apache.pig.builtin.mock.Storage.Data;
Modified: pig/trunk/test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java Sat Apr 15 07:23:03 2017
@@ -17,7 +17,7 @@
*/
package org.apache.pig.test;
-import static junit.framework.Assert.*;
+import static org.junit.Assert.*;
import java.util.Iterator;
import java.util.List;
Modified: pig/trunk/test/org/apache/pig/test/TestCase.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestCase.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestCase.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestCase.java Sat Apr 15 07:23:03 2017
@@ -17,7 +17,7 @@
*/
package org.apache.pig.test;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
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;
Modified: pig/trunk/test/org/apache/pig/test/TestCubeOperator.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestCubeOperator.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestCubeOperator.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestCubeOperator.java Sat Apr 15 07:23:03 2017
@@ -28,7 +28,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.pig.PigServer;
import org.apache.pig.builtin.mock.Storage.Data;
Modified: pig/trunk/test/org/apache/pig/test/TestEvalPipelineLocal.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestEvalPipelineLocal.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestEvalPipelineLocal.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestEvalPipelineLocal.java Sat Apr 15 07:23:03 2017
@@ -72,7 +72,7 @@ import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestEvalPipelineLocal {
@@ -124,7 +124,11 @@ public class TestEvalPipelineLocal {
Iterator<Tuple> iter = pigServer.openIterator("b");
for (int i=0 ;i<3; i++){
- Assert.assertEquals(DataType.toDouble(iter.next().get(0)), 0.0);
+ // have to cast the double so the compiler finds the right method to call;
+ // otherwise, we get a compiler error
+ // error: reference to assertEquals is ambiguous
+ // both method assertEquals(Object,Object) in Assert and method assertEquals(double,double) in Assert match
+ Assert.assertEquals((double) DataType.toDouble(iter.next().get(0)), 0.0);
}
}
@@ -208,7 +212,12 @@ public class TestEvalPipelineLocal {
Iterator<Tuple> iter = pigServer.openIterator("b");
t = iter.next();
Assert.assertEquals(t.get(0).toString(), "red");
- Assert.assertEquals(DataType.toDouble(t.get(1)), 0.3);
+
+ // have to cast the double so the compiler finds the right method to call;
+ // otherwise, we get a compiler error:
+ // error: reference to assertEquals is ambiguous
+ // both method assertEquals(Object,Object) in Assert and method assertEquals(double,double) in Assert match
+ Assert.assertEquals((double) DataType.toDouble(t.get(1)), 0.3);
Assert.assertFalse(iter.hasNext());
}
Modified: pig/trunk/test/org/apache/pig/test/TestIn.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestIn.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestIn.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestIn.java Sat Apr 15 07:23:03 2017
@@ -17,7 +17,7 @@
*/
package org.apache.pig.test;
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
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;
Modified: pig/trunk/test/org/apache/pig/test/TestJobSubmission.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestJobSubmission.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestJobSubmission.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestJobSubmission.java Sat Apr 15 07:23:03 2017
@@ -26,7 +26,7 @@ import java.net.URI;
import java.util.Iterator;
import java.util.Random;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
Modified: pig/trunk/test/org/apache/pig/test/TestLineageFindRelVisitor.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestLineageFindRelVisitor.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestLineageFindRelVisitor.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestLineageFindRelVisitor.java Sat Apr 15 07:23:03 2017
@@ -21,7 +21,7 @@ package org.apache.pig.test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import junit.framework.Assert;
+import org.junit.Assert;
import java.io.File;
import java.io.IOException;
Modified: pig/trunk/test/org/apache/pig/test/TestLoadFunc.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestLoadFunc.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestLoadFunc.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestLoadFunc.java Sat Apr 15 07:23:03 2017
@@ -21,7 +21,7 @@ package org.apache.pig.test;
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.hadoop.fs.Path;
import org.apache.pig.LoadFunc;
Modified: pig/trunk/test/org/apache/pig/test/TestLocal2.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestLocal2.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestLocal2.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestLocal2.java Sat Apr 15 07:23:03 2017
@@ -29,7 +29,7 @@ import java.io.PrintStream;
import java.text.DecimalFormat;
import java.util.Iterator;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.pig.EvalFunc;
import org.apache.pig.PigServer;
Modified: pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestLogicalPlanBuilder.java Sat Apr 15 07:23:03 2017
@@ -2134,4 +2134,4 @@ public class TestLogicalPlanBuilder {
public LogicalPlan buildPlan(String query) throws Exception {
return Util.buildLp(pigServer, query);
}
-}
\ No newline at end of file
+}
Modified: pig/trunk/test/org/apache/pig/test/TestOptimizeLimit.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestOptimizeLimit.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestOptimizeLimit.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestOptimizeLimit.java Sat Apr 15 07:23:03 2017
@@ -38,7 +38,7 @@ import org.apache.pig.newplan.optimizer.
import org.apache.pig.backend.executionengine.ExecException;
import org.apache.pig.impl.PigContext;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.junit.After;
import org.junit.Before;
Modified: pig/trunk/test/org/apache/pig/test/TestPigContextClassCache.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestPigContextClassCache.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestPigContextClassCache.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestPigContextClassCache.java Sat Apr 15 07:23:03 2017
@@ -18,7 +18,7 @@ package org.apache.pig.test;
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.pig.builtin.REPLACE;
import org.apache.pig.builtin.TOMAP;
Modified: pig/trunk/test/org/apache/pig/test/TestPigException.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestPigException.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestPigException.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestPigException.java Sat Apr 15 07:23:03 2017
@@ -18,7 +18,7 @@
package org.apache.pig.test;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.pig.PigException;
import org.apache.pig.impl.util.LogUtils;
import org.junit.Test;
Modified: pig/trunk/test/org/apache/pig/test/TestPlanGeneration.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestPlanGeneration.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestPlanGeneration.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestPlanGeneration.java Sat Apr 15 07:23:03 2017
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertNul
import java.io.IOException;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.hadoop.mapreduce.Job;
import org.apache.pig.ExecType;
Modified: pig/trunk/test/org/apache/pig/test/TestResourceSchema.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestResourceSchema.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestResourceSchema.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestResourceSchema.java Sat Apr 15 07:23:03 2017
@@ -26,7 +26,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.pig.ResourceSchema;
import org.apache.pig.SortColInfo;
Modified: pig/trunk/test/org/apache/pig/test/TestSplitCombine.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestSplitCombine.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestSplitCombine.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestSplitCombine.java Sat Apr 15 07:23:03 2017
@@ -29,7 +29,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
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=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java Sat Apr 15 07:23:03 2017
@@ -45,7 +45,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.hadoop.conf.Configuration;
import org.apache.pig.EvalFunc;
Modified: pig/trunk/test/org/apache/pig/test/TestTypedMap.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestTypedMap.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestTypedMap.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestTypedMap.java Sat Apr 15 07:23:03 2017
@@ -24,7 +24,7 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Properties;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
Modified: pig/trunk/test/org/apache/pig/test/TestUnionOnSchema.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestUnionOnSchema.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestUnionOnSchema.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestUnionOnSchema.java Sat Apr 15 07:23:03 2017
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.List;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.pig.EvalFunc;
import org.apache.pig.PigException;
Modified: pig/trunk/test/org/apache/pig/test/pigunit/pig/TestGruntParser.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/pigunit/pig/TestGruntParser.java?rev=1791458&r1=1791457&r2=1791458&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/pigunit/pig/TestGruntParser.java (original)
+++ pig/trunk/test/org/apache/pig/test/pigunit/pig/TestGruntParser.java Sat Apr 15 07:23:03 2017
@@ -17,7 +17,7 @@ import java.io.StringReader;
import java.util.HashMap;
import java.util.Map;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.pig.pigunit.pig.GruntParser;
import org.apache.pig.pigunit.pig.PigServer;