Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-4779 TestHTablePool, TestScanWithBloomError, TestRegionSplitCalculator are 

not tagged and TestPoolMap should not use TestSuite (N Keywal)


git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1201442 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2011-11-13 15:46:44 +00:00
parent 94a06fb391
commit 9cdde5ab68
7 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -704,6 +704,8 @@ Release 0.92.0 - Unreleased
HBASE-4759 Migrate from JUnit 4.8.2 to JUnit 4.10 (nkeywal) HBASE-4759 Migrate from JUnit 4.8.2 to JUnit 4.10 (nkeywal)
HBASE-4554 Allow set/unset coprocessor table attributes from shell HBASE-4554 Allow set/unset coprocessor table attributes from shell
(Mingjie Lai) (Mingjie Lai)
HBASE-4779 TestHTablePool, TestScanWithBloomError, TestRegionSplitCalculator are
not tagged and TestPoolMap should not use TestSuite (N Keywal)
TASKS TASKS
HBASE-3559 Move report of split to master OFF the heartbeat channel HBASE-3559 Move report of split to master OFF the heartbeat channel

2
src/test/java/org/apache/hadoop/hbase/TestServerName.java
View File

@ -27,7 +27,9 @@ import java.util.regex.Pattern;
import org.apache.hadoop.hbase.util.Addressing; import org.apache.hadoop.hbase.util.Addressing;
import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category;
@Category(SmallTests.class)
public class TestServerName { public class TestServerName {
@Test @Test
public void testRegexPatterns() { public void testRegexPatterns() {

3
src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java
View File

@ -23,7 +23,6 @@ import java.io.IOException;
import junit.framework.Assert; import junit.framework.Assert;
import junit.framework.TestCase; import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.*;
import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Bytes;
@ -202,6 +201,7 @@ public class TestHTablePool {
} }
} }
@Category(MediumTests.class)
public static class TestHTableReusablePool extends TestHTablePoolType { public static class TestHTableReusablePool extends TestHTablePoolType {
@Override @Override
protected PoolType getPoolType() { protected PoolType getPoolType() {
@ -276,6 +276,7 @@ public class TestHTablePool {
} }
} }
@Category(MediumTests.class)
public static class TestHTableThreadLocalPool extends TestHTablePoolType { public static class TestHTableThreadLocalPool extends TestHTablePoolType {
@Override @Override
protected PoolType getPoolType() { protected PoolType getPoolType() {

6
src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
View File

@ -34,9 +34,7 @@ import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.*;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.KeyValueTestUtil;
import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.io.hfile.Compression; import org.apache.hadoop.hbase.io.hfile.Compression;
@ -45,6 +43,7 @@ import org.apache.hadoop.hbase.regionserver.HRegion.RegionScannerImpl;
import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.junit.runners.Parameterized; import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters; import org.junit.runners.Parameterized.Parameters;
@ -57,6 +56,7 @@ import static org.junit.Assert.*;
* This is needed for the multi-column Bloom filter optimization. * This is needed for the multi-column Bloom filter optimization.
*/ */
@RunWith(Parameterized.class) @RunWith(Parameterized.class)
@Category(SmallTests.class)
public class TestScanWithBloomError { public class TestScanWithBloomError {
private static final Log LOG = private static final Log LOG =

10
src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
View File

@ -43,13 +43,7 @@ import org.apache.hadoop.fs.FilterFileSystem;
import org.apache.hadoop.fs.LocalFileSystem; import org.apache.hadoop.fs.LocalFileSystem;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.*;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.io.hfile.CacheConfig; import org.apache.hadoop.hbase.io.hfile.CacheConfig;
import org.apache.hadoop.hbase.monitoring.MonitoredTask; import org.apache.hadoop.hbase.monitoring.MonitoredTask;
@ -60,6 +54,7 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper; import org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper;
import org.apache.hadoop.hbase.util.ManualEnvironmentEdge; import org.apache.hadoop.hbase.util.ManualEnvironmentEdge;
import org.apache.hadoop.util.Progressable; import org.apache.hadoop.util.Progressable;
import org.junit.experimental.categories.Category;
import org.mockito.Mockito; import org.mockito.Mockito;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
@ -67,6 +62,7 @@ import com.google.common.base.Joiner;
/** /**
* Test class for the Store * Test class for the Store
*/ */
@Category(MediumTests.class)
public class TestStore extends TestCase { public class TestStore extends TestCase {
public static final Log LOG = LogFactory.getLog(TestStore.class); public static final Log LOG = LogFactory.getLog(TestStore.class);

20
src/test/java/org/apache/hadoop/hbase/util/TestPoolMap.java
View File

@ -27,13 +27,17 @@ import java.util.concurrent.atomic.AtomicBoolean;
import junit.framework.Test; import junit.framework.Test;
import junit.framework.TestCase; import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.util.PoolMap.PoolType; import org.apache.hadoop.hbase.util.PoolMap.PoolType;
import org.junit.experimental.categories.Category; import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@Category(SmallTests.class) @RunWith(Suite.class)
@Suite.SuiteClasses({TestPoolMap.TestRoundRobinPoolType.class, TestPoolMap.TestThreadLocalPoolType.class, TestPoolMap.TestReusablePoolType.class})
@Category(MediumTests.class)
public class TestPoolMap { public class TestPoolMap {
public abstract static class TestPoolType extends TestCase { public abstract static class TestPoolType extends TestCase {
protected PoolMap<String, String> poolMap; protected PoolMap<String, String> poolMap;
@ -71,6 +75,7 @@ public class TestPoolMap {
} }
} }
@Category(MediumTests.class)
public static class TestRoundRobinPoolType extends TestPoolType { public static class TestRoundRobinPoolType extends TestPoolType {
@Override @Override
protected PoolType getPoolType() { protected PoolType getPoolType() {
@ -132,6 +137,7 @@ public class TestPoolMap {
} }
@Category(MediumTests.class)
public static class TestThreadLocalPoolType extends TestPoolType { public static class TestThreadLocalPoolType extends TestPoolType {
@Override @Override
protected PoolType getPoolType() { protected PoolType getPoolType() {
@ -176,6 +182,7 @@ public class TestPoolMap {
} }
@Category(MediumTests.class)
public static class TestReusablePoolType extends TestPoolType { public static class TestReusablePoolType extends TestPoolType {
@Override @Override
protected PoolType getPoolType() { protected PoolType getPoolType() {
@ -223,13 +230,4 @@ public class TestPoolMap {
} }
} }
public static Test suite() {
TestSuite suite = new TestSuite();
suite.addTestSuite(TestRoundRobinPoolType.class);
suite.addTestSuite(TestThreadLocalPoolType.class);
suite.addTestSuite(TestReusablePoolType.class);
return suite;
}
} }

3
src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitCalculator.java
View File

@ -27,11 +27,14 @@ import java.util.SortedSet;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.SmallTests;
import org.junit.Test; import org.junit.Test;
import com.google.common.collect.ComparisonChain; import com.google.common.collect.ComparisonChain;
import com.google.common.collect.Multimap; import com.google.common.collect.Multimap;
import org.junit.experimental.categories.Category;
@Category(SmallTests.class)
public class TestRegionSplitCalculator { public class TestRegionSplitCalculator {
final static Log LOG = LogFactory.getLog(TestRegionSplitCalculator.class); final static Log LOG = LogFactory.getLog(TestRegionSplitCalculator.class);