PIG-5222: Fix Junit Deprecations
git-svn-id: https://svn.apache.org/repos/asf/pig/trunk@1791458 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 174ae5c..db3a5b9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -97,6 +97,8 @@
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)
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestToBagToTuple.java b/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestToBagToTuple.java
index d804b31..b975568 100644
--- a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestToBagToTuple.java
+++ b/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestToBagToTuple.java
@@ -20,7 +20,7 @@
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;
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestFixedWidthStorer.java b/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestFixedWidthStorer.java
index 7891f5b..c262c21 100644
--- a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestFixedWidthStorer.java
+++ b/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestFixedWidthStorer.java
@@ -22,7 +22,7 @@
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 @@
Assert.assertEquals(StringUtils.join(expected, "\n"), StringUtils.join(data, "\n"));
}
-}
\ No newline at end of file
+}
diff --git a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestIndexedStorage.java b/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestIndexedStorage.java
index 46385e9..0203cda 100644
--- a/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestIndexedStorage.java
+++ b/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/storage/TestIndexedStorage.java
@@ -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 junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
diff --git a/test/org/apache/pig/TestLoadFuncMetadataWrapper.java b/test/org/apache/pig/TestLoadFuncMetadataWrapper.java
index 065957d..aae54f5 100644
--- a/test/org/apache/pig/TestLoadFuncMetadataWrapper.java
+++ b/test/org/apache/pig/TestLoadFuncMetadataWrapper.java
@@ -23,7 +23,7 @@
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;
diff --git a/test/org/apache/pig/TestLoadFuncWrapper.java b/test/org/apache/pig/TestLoadFuncWrapper.java
index 72f1c0e..b6130c3 100644
--- a/test/org/apache/pig/TestLoadFuncWrapper.java
+++ b/test/org/apache/pig/TestLoadFuncWrapper.java
@@ -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;
diff --git a/test/org/apache/pig/TestLoadStoreFuncLifeCycle.java b/test/org/apache/pig/TestLoadStoreFuncLifeCycle.java
index 803aefc..76e05af 100644
--- a/test/org/apache/pig/TestLoadStoreFuncLifeCycle.java
+++ b/test/org/apache/pig/TestLoadStoreFuncLifeCycle.java
@@ -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;
diff --git a/test/org/apache/pig/TestStoreFuncMetadataWrapper.java b/test/org/apache/pig/TestStoreFuncMetadataWrapper.java
index 75628df..004066b 100644
--- a/test/org/apache/pig/TestStoreFuncMetadataWrapper.java
+++ b/test/org/apache/pig/TestStoreFuncMetadataWrapper.java
@@ -23,7 +23,7 @@
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;
diff --git a/test/org/apache/pig/TestStoreFuncWrapper.java b/test/org/apache/pig/TestStoreFuncWrapper.java
index ffa6e1b..c00d941 100644
--- a/test/org/apache/pig/TestStoreFuncWrapper.java
+++ b/test/org/apache/pig/TestStoreFuncWrapper.java
@@ -29,7 +29,7 @@
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;
diff --git a/test/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/TestPigBytesRawComparator.java b/test/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/TestPigBytesRawComparator.java
index 80a309e..e3d90db 100644
--- a/test/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/TestPigBytesRawComparator.java
+++ b/test/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/TestPigBytesRawComparator.java
@@ -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;
diff --git a/test/org/apache/pig/newplan/logical/relational/TestLocationInPhysicalPlan.java b/test/org/apache/pig/newplan/logical/relational/TestLocationInPhysicalPlan.java
index 94b34b3..0e40b6b 100644
--- a/test/org/apache/pig/newplan/logical/relational/TestLocationInPhysicalPlan.java
+++ b/test/org/apache/pig/newplan/logical/relational/TestLocationInPhysicalPlan.java
@@ -21,7 +21,7 @@
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;
diff --git a/test/org/apache/pig/parser/TestAstValidator.java b/test/org/apache/pig/parser/TestAstValidator.java
index 00325fd..1422673 100644
--- a/test/org/apache/pig/parser/TestAstValidator.java
+++ b/test/org/apache/pig/parser/TestAstValidator.java
@@ -20,7 +20,7 @@
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.antlr.runtime.CharStream;
import org.antlr.runtime.CommonTokenStream;
diff --git a/test/org/apache/pig/parser/TestColumnAliasConversion.java b/test/org/apache/pig/parser/TestColumnAliasConversion.java
index 291a81c..f396f92 100644
--- a/test/org/apache/pig/parser/TestColumnAliasConversion.java
+++ b/test/org/apache/pig/parser/TestColumnAliasConversion.java
@@ -20,7 +20,7 @@
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.antlr.runtime.RecognitionException;
import org.apache.pig.impl.logicalLayer.FrontendException;
diff --git a/test/org/apache/pig/parser/TestErrorHandling.java b/test/org/apache/pig/parser/TestErrorHandling.java
index 7696903..15e0903 100644
--- a/test/org/apache/pig/parser/TestErrorHandling.java
+++ b/test/org/apache/pig/parser/TestErrorHandling.java
@@ -21,7 +21,7 @@
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;
diff --git a/test/org/apache/pig/parser/TestQueryLexer.java b/test/org/apache/pig/parser/TestQueryLexer.java
index 5a88509..b70721a 100644
--- a/test/org/apache/pig/parser/TestQueryLexer.java
+++ b/test/org/apache/pig/parser/TestQueryLexer.java
@@ -20,7 +20,7 @@
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.antlr.runtime.CharStream;
diff --git a/test/org/apache/pig/parser/TestScalarVisitor.java b/test/org/apache/pig/parser/TestScalarVisitor.java
index 17ea3c8..61f8818 100644
--- a/test/org/apache/pig/parser/TestScalarVisitor.java
+++ b/test/org/apache/pig/parser/TestScalarVisitor.java
@@ -21,7 +21,7 @@
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;
diff --git a/test/org/apache/pig/parser/TestSchemaAliasVisitor.java b/test/org/apache/pig/parser/TestSchemaAliasVisitor.java
index ecb7bfb..d072a74 100644
--- a/test/org/apache/pig/parser/TestSchemaAliasVisitor.java
+++ b/test/org/apache/pig/parser/TestSchemaAliasVisitor.java
@@ -20,7 +20,7 @@
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.antlr.runtime.RecognitionException;
import org.apache.pig.impl.plan.PlanValidationException;
diff --git a/test/org/apache/pig/parser/TestUnionOnSchemaSetter.java b/test/org/apache/pig/parser/TestUnionOnSchemaSetter.java
index 0549a6d..bdd0570 100644
--- a/test/org/apache/pig/parser/TestUnionOnSchemaSetter.java
+++ b/test/org/apache/pig/parser/TestUnionOnSchemaSetter.java
@@ -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;
diff --git a/test/org/apache/pig/pigunit/PigTest.java b/test/org/apache/pig/pigunit/PigTest.java
index 0866979..f11c394 100644
--- a/test/org/apache/pig/pigunit/PigTest.java
+++ b/test/org/apache/pig/pigunit/PigTest.java
@@ -32,7 +32,7 @@
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;
diff --git a/test/org/apache/pig/test/TestAssert.java b/test/org/apache/pig/test/TestAssert.java
index 6d4b5c6..458c0fd 100644
--- a/test/org/apache/pig/test/TestAssert.java
+++ b/test/org/apache/pig/test/TestAssert.java
@@ -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.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;
diff --git a/test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java b/test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java
index fc4fc61..e2f6ee5 100644
--- a/test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java
+++ b/test/org/apache/pig/test/TestBuiltInBagToTupleOrString.java
@@ -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;
diff --git a/test/org/apache/pig/test/TestCase.java b/test/org/apache/pig/test/TestCase.java
index c9bb2fa..6bf684a 100644
--- a/test/org/apache/pig/test/TestCase.java
+++ b/test/org/apache/pig/test/TestCase.java
@@ -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;
diff --git a/test/org/apache/pig/test/TestCubeOperator.java b/test/org/apache/pig/test/TestCubeOperator.java
index de96e6c..456f807 100644
--- a/test/org/apache/pig/test/TestCubeOperator.java
+++ b/test/org/apache/pig/test/TestCubeOperator.java
@@ -28,7 +28,7 @@
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;
diff --git a/test/org/apache/pig/test/TestEvalPipelineLocal.java b/test/org/apache/pig/test/TestEvalPipelineLocal.java
index 7c9a039..eeaa8ee 100644
--- a/test/org/apache/pig/test/TestEvalPipelineLocal.java
+++ b/test/org/apache/pig/test/TestEvalPipelineLocal.java
@@ -72,7 +72,7 @@
import org.junit.Before;
import org.junit.Test;
-import junit.framework.Assert;
+import org.junit.Assert;
public class TestEvalPipelineLocal {
@@ -124,7 +124,11 @@
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 @@
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());
}
diff --git a/test/org/apache/pig/test/TestIn.java b/test/org/apache/pig/test/TestIn.java
index dfa7a39..a195d9a 100644
--- a/test/org/apache/pig/test/TestIn.java
+++ b/test/org/apache/pig/test/TestIn.java
@@ -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;
diff --git a/test/org/apache/pig/test/TestJobSubmission.java b/test/org/apache/pig/test/TestJobSubmission.java
index d29156f..53aeaf9 100644
--- a/test/org/apache/pig/test/TestJobSubmission.java
+++ b/test/org/apache/pig/test/TestJobSubmission.java
@@ -26,7 +26,7 @@
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;
diff --git a/test/org/apache/pig/test/TestLineageFindRelVisitor.java b/test/org/apache/pig/test/TestLineageFindRelVisitor.java
index e8e6aeb..49d7d65 100644
--- a/test/org/apache/pig/test/TestLineageFindRelVisitor.java
+++ b/test/org/apache/pig/test/TestLineageFindRelVisitor.java
@@ -21,7 +21,7 @@
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;
diff --git a/test/org/apache/pig/test/TestLoadFunc.java b/test/org/apache/pig/test/TestLoadFunc.java
index 8ace828..01f3db7 100644
--- a/test/org/apache/pig/test/TestLoadFunc.java
+++ b/test/org/apache/pig/test/TestLoadFunc.java
@@ -21,7 +21,7 @@
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.hadoop.fs.Path;
import org.apache.pig.LoadFunc;
diff --git a/test/org/apache/pig/test/TestLocal2.java b/test/org/apache/pig/test/TestLocal2.java
index 61e1d83..514748e 100644
--- a/test/org/apache/pig/test/TestLocal2.java
+++ b/test/org/apache/pig/test/TestLocal2.java
@@ -29,7 +29,7 @@
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;
diff --git a/test/org/apache/pig/test/TestLogicalPlanBuilder.java b/test/org/apache/pig/test/TestLogicalPlanBuilder.java
index a6db23d..8465cfd 100644
--- a/test/org/apache/pig/test/TestLogicalPlanBuilder.java
+++ b/test/org/apache/pig/test/TestLogicalPlanBuilder.java
@@ -2134,4 +2134,4 @@
public LogicalPlan buildPlan(String query) throws Exception {
return Util.buildLp(pigServer, query);
}
-}
\ No newline at end of file
+}
diff --git a/test/org/apache/pig/test/TestOptimizeLimit.java b/test/org/apache/pig/test/TestOptimizeLimit.java
index 3085c1c..f4610e9 100644
--- a/test/org/apache/pig/test/TestOptimizeLimit.java
+++ b/test/org/apache/pig/test/TestOptimizeLimit.java
@@ -38,7 +38,7 @@
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;
diff --git a/test/org/apache/pig/test/TestPigContextClassCache.java b/test/org/apache/pig/test/TestPigContextClassCache.java
index dc7186c..a976420 100644
--- a/test/org/apache/pig/test/TestPigContextClassCache.java
+++ b/test/org/apache/pig/test/TestPigContextClassCache.java
@@ -18,7 +18,7 @@
import java.io.IOException;
-import junit.framework.Assert;
+import org.junit.Assert;
import org.apache.pig.builtin.REPLACE;
import org.apache.pig.builtin.TOMAP;
diff --git a/test/org/apache/pig/test/TestPigException.java b/test/org/apache/pig/test/TestPigException.java
index e259f9d..8eac985 100644
--- a/test/org/apache/pig/test/TestPigException.java
+++ b/test/org/apache/pig/test/TestPigException.java
@@ -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;
diff --git a/test/org/apache/pig/test/TestPlanGeneration.java b/test/org/apache/pig/test/TestPlanGeneration.java
index b107b42..745e7a3 100644
--- a/test/org/apache/pig/test/TestPlanGeneration.java
+++ b/test/org/apache/pig/test/TestPlanGeneration.java
@@ -22,7 +22,7 @@
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;
diff --git a/test/org/apache/pig/test/TestResourceSchema.java b/test/org/apache/pig/test/TestResourceSchema.java
index dd206b4..d995227 100644
--- a/test/org/apache/pig/test/TestResourceSchema.java
+++ b/test/org/apache/pig/test/TestResourceSchema.java
@@ -26,7 +26,7 @@
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;
diff --git a/test/org/apache/pig/test/TestSplitCombine.java b/test/org/apache/pig/test/TestSplitCombine.java
index ce4f346..cdde871 100644
--- a/test/org/apache/pig/test/TestSplitCombine.java
+++ b/test/org/apache/pig/test/TestSplitCombine.java
@@ -29,7 +29,7 @@
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;
diff --git a/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java b/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java
index 6f76aeb..78371c3 100644
--- a/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java
+++ b/test/org/apache/pig/test/TestTypeCheckingValidatorNewLP.java
@@ -45,7 +45,7 @@
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;
diff --git a/test/org/apache/pig/test/TestTypedMap.java b/test/org/apache/pig/test/TestTypedMap.java
index 2f775ed..cb0736a 100644
--- a/test/org/apache/pig/test/TestTypedMap.java
+++ b/test/org/apache/pig/test/TestTypedMap.java
@@ -24,7 +24,7 @@
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;
diff --git a/test/org/apache/pig/test/TestUnionOnSchema.java b/test/org/apache/pig/test/TestUnionOnSchema.java
index 1da3885..3dea37f 100644
--- a/test/org/apache/pig/test/TestUnionOnSchema.java
+++ b/test/org/apache/pig/test/TestUnionOnSchema.java
@@ -25,7 +25,7 @@
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;
diff --git a/test/org/apache/pig/test/pigunit/pig/TestGruntParser.java b/test/org/apache/pig/test/pigunit/pig/TestGruntParser.java
index c048667..1b1e5e9 100644
--- a/test/org/apache/pig/test/pigunit/pig/TestGruntParser.java
+++ b/test/org/apache/pig/test/pigunit/pig/TestGruntParser.java
@@ -17,7 +17,7 @@
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;
