svn commit: r1437074 - in /accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce: AccumuloInputFormatIT.java AccumuloOutputFormatIT.java

[ct...@apache.org]

Author: ctubbsii
Date: Tue Jan 22 18:08:30 2013
New Revision: 1437074

URL: http://svn.apache.org/viewvc?rev=1437074&view=rev
Log:
ACCUMULO-769 Fix bsp contrib build due to mapreduce changes in previous commit

Modified:
    accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatIT.java
    accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatIT.java

Modified: accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatIT.java
URL: http://svn.apache.org/viewvc/accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatIT.java?rev=1437074&r1=1437073&r2=1437074&view=diff
==============================================================================
--- accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatIT.java (original)
+++ accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatIT.java Tue Jan 22 18:08:30 2013
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
+import java.nio.charset.Charset;
 
 import org.apache.accumulo.bsp.AccumuloInputFormat;
 import org.apache.accumulo.bsp.MapreduceWrapper;
@@ -30,7 +31,6 @@ import org.apache.accumulo.core.client.m
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.security.Authorizations;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
 import org.apache.hadoop.io.Writable;
@@ -97,7 +97,8 @@ public class AccumuloInputFormatIT {
     bspJob.setBspClass(InputFormatTestBSP.class);
     bspJob.setInputPath(new Path("test"));
     
-    AccumuloInputFormat.setInputInfo(job, "root", "".getBytes(), "testtable", new Authorizations());
+    AccumuloInputFormat.setConnectorInfo(job, "root", "".getBytes(Charset.forName("UTF-8")));
+    AccumuloInputFormat.setInputTableName(job, "testtable");
     AccumuloInputFormat.setMockInstance(job, "testmapinstance");
     
     AccumuloInputFormat input = new AccumuloInputFormat();

Modified: accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatIT.java
URL: http://svn.apache.org/viewvc/accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatIT.java?rev=1437074&r1=1437073&r2=1437074&view=diff
==============================================================================
--- accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatIT.java (original)
+++ accumulo/contrib/bsp/trunk/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormatIT.java Tue Jan 22 18:08:30 2013
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertTru
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.Iterator;
 import java.util.Map.Entry;
 
@@ -124,9 +125,11 @@ public class AccumuloOutputFormatIT {
     
     Job job = MapreduceWrapper.wrappedJob(bspJob);
     
-    AccumuloInputFormat.setInputInfo(job, "root", "".getBytes(), "testtable1", new Authorizations());
+    AccumuloInputFormat.setConnectorInfo(job, "root", "".getBytes(Charset.forName("UTF-8")));
+    AccumuloInputFormat.setInputTableName(job, "testtable1");
     AccumuloInputFormat.setMockInstance(job, "testmrinstance");
-    AccumuloOutputFormat.setOutputInfo(job, "root", "".getBytes(), false, "testtable2");
+    AccumuloOutputFormat.setConnectorInfo(job, "root", "".getBytes(Charset.forName("UTF-8")));
+    AccumuloOutputFormat.setDefaultTableName(job, "testtable2");
     AccumuloOutputFormat.setMockInstance(job, "testmrinstance");
     
     AccumuloInputFormat input = new AccumuloInputFormat();