From 83b3772eb3d81bae6c4525eb712813fa9476e65c Mon Sep 17 00:00:00 2001
From: Michael Stack <stack@apache.org>
Date: Thu, 18 Jun 2009 05:35:00 +0000
Subject: [PATCH] HBASE-1488 After 1304 goes in, fix and reenable test of
 thrift, mr indexer, and merge tool -- part 1

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@785913 13f79535-47bb-0310-9956-ffa450edef68
---
 ...abledTestTableIndex.java => TestTableIndex.java} | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
 rename src/test/org/apache/hadoop/hbase/mapred/{DisabledTestTableIndex.java => TestTableIndex.java} (96%)

diff --git a/src/test/org/apache/hadoop/hbase/mapred/DisabledTestTableIndex.java b/src/test/org/apache/hadoop/hbase/mapred/TestTableIndex.java
similarity index 96%
rename from src/test/org/apache/hadoop/hbase/mapred/DisabledTestTableIndex.java
rename to src/test/org/apache/hadoop/hbase/mapred/TestTableIndex.java
index 8f2cd525fb7..dae5ccc4a72 100644
--- a/src/test/org/apache/hadoop/hbase/mapred/DisabledTestTableIndex.java
+++ b/src/test/org/apache/hadoop/hbase/mapred/TestTableIndex.java
@@ -39,7 +39,6 @@ import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.client.ResultScanner;
-import org.apache.hadoop.hbase.io.RowResult;
 import org.apache.hadoop.hbase.io.Cell;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.MultiRegionTable;
@@ -59,8 +58,8 @@ import org.apache.lucene.search.TermQuery;
 /**
  * Test Map/Reduce job to build index over HBase table
  */
-public class DisabledTestTableIndex extends MultiRegionTable {
-  private static final Log LOG = LogFactory.getLog(DisabledTestTableIndex.class);
+public class TestTableIndex extends MultiRegionTable {
+  private static final Log LOG = LogFactory.getLog(TestTableIndex.class);
 
   static final String TABLE_NAME = "moretest";
   static final String INPUT_COLUMN = "contents:";
@@ -77,14 +76,14 @@ public class DisabledTestTableIndex extends MultiRegionTable {
   private JobConf jobConf = null;
 
   /** default constructor */
-  public DisabledTestTableIndex() {
+  public TestTableIndex() {
     super(INPUT_COLUMN);
     desc = new HTableDescriptor(TABLE_NAME);
     desc.addFamily(new HColumnDescriptor(INPUT_COLUMN));
     desc.addFamily(new HColumnDescriptor(OUTPUT_COLUMN));
   }
 
-  @Override
+    @Override
   public void tearDown() throws Exception {
     if (jobConf != null) {
       FileUtil.fullyDelete(new File(jobConf.get("hadoop.tmp.dir")));
@@ -109,7 +108,7 @@ public class DisabledTestTableIndex extends MultiRegionTable {
     conf.set("hbase.index.conf", createIndexConfContent());
 
     try {
-      jobConf = new JobConf(conf, DisabledTestTableIndex.class);
+      jobConf = new JobConf(conf, TestTableIndex.class);
       jobConf.setJobName("index column contents");
       jobConf.setNumMapTasks(2);
       // number of indexes to partition into
@@ -261,6 +260,6 @@ public class DisabledTestTableIndex extends MultiRegionTable {
    * @param args unused
    */
   public static void main(String[] args) {
-    TestRunner.run(new TestSuite(DisabledTestTableIndex.class));
+    TestRunner.run(new TestSuite(TestTableIndex.class));
   }
 }
\ No newline at end of file