hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From te...@apache.org
Subject svn commit: r1201442 - in /hbase/trunk: ./ src/test/java/org/apache/hadoop/hbase/ src/test/java/org/apache/hadoop/hbase/client/ src/test/java/org/apache/hadoop/hbase/regionserver/ src/test/java/org/apache/hadoop/hbase/util/
Date Sun, 13 Nov 2011 15:46:45 GMT
Author: tedyu
Date: Sun Nov 13 15:46:44 2011
New Revision: 1201442

URL: http://svn.apache.org/viewvc?rev=1201442&view=rev
Log:
HBASE-4779  TestHTablePool, TestScanWithBloomError, TestRegionSplitCalculator are
               not tagged and TestPoolMap should not use TestSuite (N Keywal)

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestServerName.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestPoolMap.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitCalculator.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1201442&r1=1201441&r2=1201442&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Sun Nov 13 15:46:44 2011
@@ -704,6 +704,8 @@ Release 0.92.0 - Unreleased
    HBASE-4759  Migrate from JUnit 4.8.2 to JUnit 4.10 (nkeywal)
    HBASE-4554  Allow set/unset coprocessor table attributes from shell
                (Mingjie Lai)
+   HBASE-4779  TestHTablePool, TestScanWithBloomError, TestRegionSplitCalculator are
+               not tagged and TestPoolMap should not use TestSuite (N Keywal)
 
   TASKS
    HBASE-3559  Move report of split to master OFF the heartbeat channel

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestServerName.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestServerName.java?rev=1201442&r1=1201441&r2=1201442&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestServerName.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestServerName.java Sun Nov 13 15:46:44
2011
@@ -27,7 +27,9 @@ import java.util.regex.Pattern;
 import org.apache.hadoop.hbase.util.Addressing;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
+@Category(SmallTests.class)
 public class TestServerName {
   @Test
   public void testRegexPatterns() {
@@ -79,4 +81,4 @@ public class TestServerName {
     assertNotSame(5677,
       ServerName.getServerStartcodeFromServerName(sn.toString()));
   }
-}
\ No newline at end of file
+}

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java?rev=1201442&r1=1201441&r2=1201442&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/client/TestHTablePool.java Sun Nov 13
15:46:44 2011
@@ -23,7 +23,6 @@ import java.io.IOException;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.util.Bytes;
@@ -202,6 +201,7 @@ public class TestHTablePool {
     }
   }
 
+  @Category(MediumTests.class)
 	public static class TestHTableReusablePool extends TestHTablePoolType {
 		@Override
 		protected PoolType getPoolType() {
@@ -276,6 +276,7 @@ public class TestHTablePool {
 		}
 	}
 
+  @Category(MediumTests.class)
 	public static class TestHTableThreadLocalPool extends TestHTablePoolType {
 		@Override
 		protected PoolType getPoolType() {

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java?rev=1201442&r1=1201441&r2=1201442&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
(original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java
Sun Nov 13 15:46:44 2011
@@ -34,9 +34,7 @@ import org.apache.commons.logging.LogFac
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.KeyValueTestUtil;
+import org.apache.hadoop.hbase.*;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.io.hfile.Compression;
@@ -45,6 +43,7 @@ import org.apache.hadoop.hbase.regionser
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 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.
  */
 @RunWith(Parameterized.class)
+@Category(SmallTests.class)
 public class TestScanWithBloomError {
 
   private static final Log LOG =

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java?rev=1201442&r1=1201441&r2=1201442&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java Sun Nov
13 15:46:44 2011
@@ -43,13 +43,7 @@ import org.apache.hadoop.fs.FilterFileSy
 import org.apache.hadoop.fs.LocalFileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-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.*;
 import org.apache.hadoop.hbase.client.Get;
 import org.apache.hadoop.hbase.io.hfile.CacheConfig;
 import org.apache.hadoop.hbase.monitoring.MonitoredTask;
@@ -60,6 +54,7 @@ import org.apache.hadoop.hbase.util.Envi
 import org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper;
 import org.apache.hadoop.hbase.util.ManualEnvironmentEdge;
 import org.apache.hadoop.util.Progressable;
+import org.junit.experimental.categories.Category;
 import org.mockito.Mockito;
 
 import com.google.common.base.Joiner;
@@ -67,6 +62,7 @@ import com.google.common.base.Joiner;
 /**
  * Test class for the Store
  */
+@Category(MediumTests.class)
 public class TestStore extends TestCase {
   public static final Log LOG = LogFactory.getLog(TestStore.class);
 

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestPoolMap.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestPoolMap.java?rev=1201442&r1=1201441&r2=1201442&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestPoolMap.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestPoolMap.java Sun Nov 13 15:46:44
2011
@@ -27,13 +27,17 @@ import java.util.concurrent.atomic.Atomi
 
 import junit.framework.Test;
 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.util.PoolMap.PoolType;
 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 abstract static class TestPoolType extends TestCase {
     protected PoolMap<String, String> poolMap;
@@ -71,6 +75,7 @@ public class TestPoolMap {
     }
   }
 
+  @Category(MediumTests.class)
   public static class TestRoundRobinPoolType extends TestPoolType {
     @Override
     protected PoolType getPoolType() {
@@ -132,6 +137,7 @@ public class TestPoolMap {
 
   }
 
+  @Category(MediumTests.class)
   public static class TestThreadLocalPoolType extends TestPoolType {
     @Override
     protected PoolType getPoolType() {
@@ -176,6 +182,7 @@ public class TestPoolMap {
 
   }
 
+  @Category(MediumTests.class)
   public static class TestReusablePoolType extends TestPoolType {
     @Override
     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;
-  }
-
 }

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitCalculator.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitCalculator.java?rev=1201442&r1=1201441&r2=1201442&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitCalculator.java
(original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitCalculator.java
Sun Nov 13 15:46:44 2011
@@ -27,11 +27,14 @@ import java.util.SortedSet;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.SmallTests;
 import org.junit.Test;
 
 import com.google.common.collect.ComparisonChain;
 import com.google.common.collect.Multimap;
+import org.junit.experimental.categories.Category;
 
+@Category(SmallTests.class)
 public class TestRegionSplitCalculator {
   final static Log LOG = LogFactory.getLog(TestRegionSplitCalculator.class);
 



Mime
View raw message