Author: jimk
Date: Fri Sep 7 20:04:54 2007
New Revision: 573776
URL: http://svn.apache.org/viewvc?rev=573776&view=rev
Log:
HADOOP-1847 Many HBase tests do not fail well. (phase 2)
Modified:
lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/HBaseTestCase.java
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestCleanRegionServerExit.java
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestCompaction.java
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHBaseCluster.java
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHLog.java
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHMemcache.java
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHRegion.java
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHStoreFile.java
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestListTables.java
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestRegionServerAbort.java
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestTable.java
Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt?rev=573776&r1=573775&r2=573776&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original)
+++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Fri Sep 7 20:04:54 2007
@@ -32,6 +32,7 @@
HADOOP-1832 listTables() returns duplicate tables
HADOOP-1834 Scanners ignore timestamp passed on creation
HADOOP-1847 Many HBase tests do not fail well.
+ HADOOP-1847 Many HBase tests do not fail well. (phase 2)
IMPROVEMENTS
HADOOP-1737 Make HColumnDescriptor data publically members settable
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java?rev=573776&r1=573775&r2=573776&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/HBaseClusterTestCase.java
Fri Sep 7 20:04:54 2007
@@ -28,26 +28,42 @@
final boolean miniHdfs;
int regionServers;
- protected HBaseClusterTestCase() {
+ /**
+ * constructor
+ */
+ public HBaseClusterTestCase() {
this(true);
}
- protected HBaseClusterTestCase(int regionServers) {
+ /**
+ * @param regionServers
+ */
+ public HBaseClusterTestCase(int regionServers) {
this(true);
this.regionServers = regionServers;
}
- protected HBaseClusterTestCase(String name) {
+ /**
+ * @param name
+ */
+ public HBaseClusterTestCase(String name) {
this(name, true);
}
- protected HBaseClusterTestCase(final boolean miniHdfs) {
+ /**
+ * @param miniHdfs
+ */
+ public HBaseClusterTestCase(final boolean miniHdfs) {
super();
this.miniHdfs = miniHdfs;
this.regionServers = 1;
}
- protected HBaseClusterTestCase(String name, final boolean miniHdfs) {
+ /**
+ * @param name
+ * @param miniHdfs
+ */
+ public HBaseClusterTestCase(String name, final boolean miniHdfs) {
super(name);
this.miniHdfs = miniHdfs;
this.regionServers = 1;
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/HBaseTestCase.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/HBaseTestCase.java?rev=573776&r1=573775&r2=573776&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/HBaseTestCase.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/HBaseTestCase.java
Fri Sep 7 20:04:54 2007
@@ -47,19 +47,24 @@
}
protected volatile Configuration conf;
-
- protected HBaseTestCase() {
+
+ /** constructor */
+ public HBaseTestCase() {
super();
conf = new HBaseConfiguration();
}
- protected HBaseTestCase(String name) {
+ /**
+ * @param name
+ */
+ public HBaseTestCase(String name) {
super(name);
conf = new HBaseConfiguration();
}
+ /** [EMAIL PROTECTED] */
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
this.testDir = getUnitTestdir(getName());
this.localFs = FileSystem.getLocal(this.conf);
@@ -68,8 +73,9 @@
}
}
+ /** [EMAIL PROTECTED] */
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
if (this.localFs != null && this.testDir != null &&
this.localFs.exists(testDir)) {
this.localFs.delete(testDir);
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestCleanRegionServerExit.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestCleanRegionServerExit.java?rev=573776&r1=573775&r2=573776&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestCleanRegionServerExit.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestCleanRegionServerExit.java
Fri Sep 7 20:04:54 2007
@@ -43,14 +43,6 @@
}
/**
- * [EMAIL PROTECTED]
- */
- @Override
- public void setUp() throws Exception {
- super.setUp();
- }
-
- /**
* The test
* @throws IOException
*/
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestCompaction.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestCompaction.java?rev=573776&r1=573775&r2=573776&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestCompaction.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestCompaction.java
Fri Sep 7 20:04:54 2007
@@ -30,18 +30,6 @@
public class TestCompaction extends HBaseTestCase {
static final Log LOG = LogFactory.getLog(TestCompaction.class.getName());
- /** [EMAIL PROTECTED] */
- @Override
- public void setUp() throws Exception {
- super.setUp();
- }
-
- /** [EMAIL PROTECTED] */
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
/**
* Run compaction and flushing memcache
* @throws Exception
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHBaseCluster.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHBaseCluster.java?rev=573776&r1=573775&r2=573776&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHBaseCluster.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHBaseCluster.java
Fri Sep 7 20:04:54 2007
@@ -57,12 +57,6 @@
cleanup();
}
- /** [EMAIL PROTECTED] */
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
private static final int FIRST_ROW = 1;
private static final int NUM_VALS = 1000;
private static final Text CONTENTS = new Text("contents:");
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHLog.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHLog.java?rev=573776&r1=573775&r2=573776&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHLog.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHLog.java
Fri Sep 7 20:04:54 2007
@@ -31,12 +31,6 @@
/** JUnit test case for HLog */
public class TestHLog extends HBaseTestCase implements HConstants {
- /** [EMAIL PROTECTED] */
- @Override
- public void setUp() throws Exception {
- super.setUp();
- }
-
/**
* @throws IOException
*/
@@ -101,9 +95,4 @@
}
}
- /** [EMAIL PROTECTED] */
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
- }
}
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHMemcache.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHMemcache.java?rev=573776&r1=573775&r2=573776&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHMemcache.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHMemcache.java
Fri Sep 7 20:04:54 2007
@@ -55,12 +55,6 @@
this.conf = new HBaseConfiguration();
}
- /** [EMAIL PROTECTED] */
- @Override
- public void tearDown() throws Exception {
- super.tearDown();
- }
-
private Text getRowName(final int index) {
return new Text("row" + Integer.toString(index));
}
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHRegion.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHRegion.java?rev=573776&r1=573775&r2=573776&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHRegion.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHRegion.java
Fri Sep 7 20:04:54 2007
@@ -43,11 +43,6 @@
static final Logger LOG =
Logger.getLogger(TestHRegion.class.getName());
- /** Constructor */
- public TestHRegion() {
- super();
- }
-
/**
* Since all the "tests" depend on the results of the previous test, they are
* not Junit tests that can stand alone. Consequently we have a single Junit
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHStoreFile.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHStoreFile.java?rev=573776&r1=573775&r2=573776&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHStoreFile.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestHStoreFile.java
Fri Sep 7 20:04:54 2007
@@ -46,16 +46,18 @@
private Configuration conf;
private Path dir = null;
+ /** [EMAIL PROTECTED] */
@Override
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
super.setUp();
this.conf = new HBaseConfiguration();
this.fs = FileSystem.getLocal(this.conf);
this.dir = new Path(DIR, getName());
}
+ /** [EMAIL PROTECTED] */
@Override
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
if (this.fs.exists(this.dir)) {
this.fs.delete(this.dir);
}
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestListTables.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestListTables.java?rev=573776&r1=573775&r2=573776&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestListTables.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestListTables.java
Fri Sep 7 20:04:54 2007
@@ -35,11 +35,6 @@
new HTableDescriptor("table3")
};
- /** constructor */
- public TestListTables() {
- super();
- }
-
/** [EMAIL PROTECTED] */
@Override
public void setUp() throws Exception {
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestRegionServerAbort.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestRegionServerAbort.java?rev=573776&r1=573775&r2=573776&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestRegionServerAbort.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestRegionServerAbort.java
Fri Sep 7 20:04:54 2007
@@ -43,14 +43,6 @@
}
/**
- * [EMAIL PROTECTED]
- */
- @Override
- public void setUp() throws Exception {
- super.setUp();
- }
-
- /**
* The test
* @throws IOException
*/
Modified:
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestTable.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestTable.java?rev=573776&r1=573775&r2=573776&view=diff
==============================================================================
---
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestTable.java
(original)
+++
lucene/hadoop/trunk/src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestTable.java
Fri Sep 7 20:04:54 2007
@@ -25,11 +25,6 @@
/** Tests table creation restrictions*/
public class TestTable extends HBaseClusterTestCase {
- /** constructor */
- public TestTable() {
- super(true);
- }
-
/**
* the test
* @throws IOException
