Merge branch 'bnewbold-args'

3 files changed, 12 insertions, 3 deletions

diff --git a/scalding/src/test/scala/sandcrawler/HBaseMimeCountTest.scala b/scalding/src/test/scala/sandcrawler/HBaseMimeCountTest.scala
index cc400c5..fde2290 100644
--- a/scalding/src/test/scala/sandcrawler/HBaseMimeCountTest.scala
+++ b/scalding/src/test/scala/sandcrawler/HBaseMimeCountTest.scala
@@ -16,6 +16,7 @@ import scala._
 class HBaseMimeCountTest extends FunSpec with TupleConversions {
 
   val output = "/tmp/testOutput"
+  val (testTable, testHost) = ("test-table", "dummy-host:2181")
 
   val log = LoggerFactory.getLogger(this.getClass.getName)
 
@@ -40,8 +41,10 @@ class HBaseMimeCountTest extends FunSpec with TupleConversions {
     .arg("test", "")
     .arg("app.conf.path", "app.conf")
     .arg("output", output)
+    .arg("hbase-table", testTable)
+    .arg("zookeeper-hosts", testHost)
     .arg("debug", "true")
-    .source[Tuple](HBaseCountJob.getHBaseSource("file:mime"),
+    .source[Tuple](HBaseCountJob.getHBaseSource(testTable, testHost, "file:mime"),
       sampleData.map(l => new Tuple(l.map(s => {new ImmutableBytesWritable(Bytes.toBytes(s))}):_*)))
       .sink[Tuple](Tsv(output)) {
         outputBuffer =>
diff --git a/scalding/src/test/scala/sandcrawler/HBaseRowCountTest.scala b/scalding/src/test/scala/sandcrawler/HBaseRowCountTest.scala
index 6f61eb3..3424a36 100644
--- a/scalding/src/test/scala/sandcrawler/HBaseRowCountTest.scala
+++ b/scalding/src/test/scala/sandcrawler/HBaseRowCountTest.scala
@@ -19,6 +19,7 @@ import scala._
 class HBaseRowCountTest extends FunSpec with TupleConversions {
 
   val output = "/tmp/testOutput"
+  val (testTable, testHost) = ("test-table", "dummy-host:2181")
 
   val log = LoggerFactory.getLogger(this.getClass.getName)
 
@@ -37,8 +38,10 @@ class HBaseRowCountTest extends FunSpec with TupleConversions {
     .arg("test", "")
     .arg("app.conf.path", "app.conf")
     .arg("output", output)
+    .arg("hbase-table", testTable)
+    .arg("zookeeper-hosts", testHost)
     .arg("debug", "true")
-    .source[Tuple](HBaseRowCountJob.getHBaseSource,
+    .source[Tuple](HBaseRowCountJob.getHBaseSource(testTable, testHost),
       sampleData.map(l => new Tuple(l.map(s => {new ImmutableBytesWritable(Bytes.toBytes(s))}):_*)))
       .sink[Tuple](Tsv(output)) {
       outputBuffer =>
diff --git a/scalding/src/test/scala/sandcrawler/HBaseStatusCountTest.scala b/scalding/src/test/scala/sandcrawler/HBaseStatusCountTest.scala
index 056347c..fca9c69 100644
--- a/scalding/src/test/scala/sandcrawler/HBaseStatusCountTest.scala
+++ b/scalding/src/test/scala/sandcrawler/HBaseStatusCountTest.scala
@@ -16,6 +16,7 @@ import scala._
 class HBaseStatusCountTest extends FunSpec with TupleConversions {
 
   val output = "/tmp/testOutput"
+  val (testTable, testHost) = ("test-table", "dummy-host:2181")
 
   val log = LoggerFactory.getLogger(this.getClass.getName)
 
@@ -40,8 +41,10 @@ class HBaseStatusCountTest extends FunSpec with TupleConversions {
     .arg("test", "")
     .arg("app.conf.path", "app.conf")
     .arg("output", output)
+    .arg("hbase-table", testTable)
+    .arg("zookeeper-hosts", testHost)
     .arg("debug", "true")
-    .source[Tuple](HBaseCountJob.getHBaseSource("grobid0:status_code"),
+    .source[Tuple](HBaseCountJob.getHBaseSource(testTable, testHost, "grobid0:status_code"),
       sampleData.map(l => new Tuple(l.map(s => {new ImmutableBytesWritable(Bytes.toBytes(s))}):_*)))
       .sink[Tuple](Tsv(output)) {
         outputBuffer =>