pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From da...@apache.org
Subject svn commit: r1148074 - in /pig/trunk: CHANGES.txt test/org/apache/pig/test/TestJobSubmission.java test/org/apache/pig/test/TestPigContext.java test/org/apache/pig/test/TestSecondarySort.java
Date Mon, 18 Jul 2011 22:21:10 GMT
Author: daijy
Date: Mon Jul 18 22:21:09 2011
New Revision: 1148074

URL: http://svn.apache.org/viewvc?rev=1148074&view=rev
Log:
PIG-2172: Fix test failure for ant 1.8.x

Modified:
    pig/trunk/CHANGES.txt
    pig/trunk/test/org/apache/pig/test/TestJobSubmission.java
    pig/trunk/test/org/apache/pig/test/TestPigContext.java
    pig/trunk/test/org/apache/pig/test/TestSecondarySort.java

Modified: pig/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1148074&r1=1148073&r2=1148074&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Mon Jul 18 22:21:09 2011
@@ -87,6 +87,8 @@ PIG-2011: Speed up TestTypedMap.java (dv
 
 BUG FIXES
 
+PIG-2172: Fix test failure for ant 1.8.x (daijy)
+
 PIG-2162: bin/pig should not modify user args (rangadi via thejas)
 
 PIG-2060: Fix errors in pig grammars reported by ANTLRWorks (azaroth via thejas)

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=1148074&r1=1148073&r2=1148074&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestJobSubmission.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestJobSubmission.java Mon Jul 18 22:21:09 2011
@@ -17,6 +17,8 @@
  */
 package org.apache.pig.test;
 
+import static org.junit.Assert.*;
+
 import java.io.File;
 import java.util.Iterator;
 import java.util.Random;
@@ -50,11 +52,8 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
-@RunWith(JUnit4.class)
-public class TestJobSubmission extends junit.framework.TestCase{
+public class TestJobSubmission {
     
     
     static PigContext pc;

Modified: pig/trunk/test/org/apache/pig/test/TestPigContext.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestPigContext.java?rev=1148074&r1=1148073&r2=1148074&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestPigContext.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestPigContext.java Mon Jul 18 22:21:09 2011
@@ -19,6 +19,8 @@
 package org.apache.pig.test;
 
 
+import static org.junit.Assert.*;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -45,8 +47,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-@RunWith(JUnit4.class)
-public class TestPigContext extends TestCase {
+public class TestPigContext {
 
     private static final String TMP_DIR_PROP = "/tmp/hadoop-hadoop";
     private static final String FS_NAME = "file:///";
@@ -62,7 +63,6 @@ public class TestPigContext extends Test
     }
     
     @Before
-    @Override
     public void setUp() throws Exception {
         pigContext = new PigContext(ExecType.LOCAL, getProperties());
         input = File.createTempFile("PigContextTest-", ".txt");
@@ -230,7 +230,6 @@ public class TestPigContext extends Test
     }
 
     @After
-    @Override
     public void tearDown() throws Exception {
         input.delete();
     }

Modified: pig/trunk/test/org/apache/pig/test/TestSecondarySort.java
URL: http://svn.apache.org/viewvc/pig/trunk/test/org/apache/pig/test/TestSecondarySort.java?rev=1148074&r1=1148073&r2=1148074&view=diff
==============================================================================
--- pig/trunk/test/org/apache/pig/test/TestSecondarySort.java (original)
+++ pig/trunk/test/org/apache/pig/test/TestSecondarySort.java Mon Jul 18 22:21:09 2011
@@ -17,6 +17,8 @@
  */
 package org.apache.pig.test;
 
+import static org.junit.Assert.*;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.PrintStream;
@@ -42,8 +44,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-@RunWith(JUnit4.class)
-public class TestSecondarySort extends TestCase {
+public class TestSecondarySort {
     static MiniCluster cluster = MiniCluster.buildCluster();
     private PigServer pigServer;
 
@@ -63,7 +64,6 @@ public class TestSecondarySort extends T
     }
 
     @Before
-    @Override
     public void setUp() throws Exception {
         FileLocalizer.setR(new Random());
         pigServer = new PigServer(ExecType.MAPREDUCE, cluster.getProperties());



Mime
View raw message