You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by li...@apache.org on 2014/05/14 02:27:04 UTC
svn commit: r1594423 [17/17] - in /hbase/branches/0.89-fb: ./ bin/
src/main/java/org/apache/hadoop/hbase/rest/
src/main/java/org/apache/hadoop/hbase/rest/client/
src/main/java/org/apache/hadoop/hbase/rest/metrics/
src/main/java/org/apache/hadoop/hbase/...
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftMutationAPI.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftMutationAPI.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftMutationAPI.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftMutationAPI.java Wed May 14 00:26:57 2014
@@ -28,6 +28,7 @@ import java.util.Set;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HTestConst;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.thrift.generated.IOError;
import org.apache.hadoop.hbase.thrift.generated.IllegalArgument;
import org.apache.hadoop.hbase.thrift.generated.Mutation;
@@ -38,12 +39,15 @@ import org.apache.hadoop.hbase.thrift.ge
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.thrift.TException;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import static org.apache.hadoop.hbase.HTestConst.getRowBytes;
import static org.apache.hadoop.hbase.HTestConst.getCFQualBytes;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+@Category(SmallTests.class)
public class TestThriftMutationAPI extends ThriftServerTestBase {
private static final int NUM_ROWS = 3;
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftResultSerializer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftResultSerializer.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftResultSerializer.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftResultSerializer.java Wed May 14 00:26:57 2014
@@ -24,15 +24,18 @@ import java.io.ByteArrayOutputStream;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Assert;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Testcase for ThriftResultSerializer and ThriftResultSerializer2
*/
+@Category(SmallTests.class)
public class TestThriftResultSerializer {
private static KeyValue[] constuctKvList(int n) {
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java Wed May 14 00:26:57 2014
@@ -26,6 +26,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.filter.ParseFilter;
import org.apache.hadoop.hbase.io.hfile.Compression;
import org.apache.hadoop.hbase.regionserver.StoreFile;
@@ -49,6 +50,7 @@ import org.apache.hadoop.metrics.spi.Out
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.io.IOException;
import java.nio.ByteBuffer;
@@ -62,6 +64,7 @@ import static org.junit.Assert.*;
* Unit testing for ThriftServerRunner.HBaseHandler, a part of the
* org.apache.hadoop.hbase.thrift package.
*/
+@Category(MediumTests.class)
public class TestThriftServer {
private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
private static final Log LOG = LogFactory.getLog(TestThriftServer.class);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerLegacy.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerLegacy.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerLegacy.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerLegacy.java Wed May 14 00:26:57 2014
@@ -46,18 +46,21 @@ import java.util.List;
import org.apache.hadoop.hbase.HBaseClusterTestCase;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.thrift.generated.ColumnDescriptor;
import org.apache.hadoop.hbase.thrift.generated.Hbase;
import org.apache.hadoop.hbase.thrift.generated.Mutation;
import org.apache.hadoop.hbase.thrift.generated.TCell;
import org.apache.hadoop.hbase.thrift.generated.TRowResult;
import org.apache.hadoop.hbase.util.Bytes;
+import org.junit.experimental.categories.Category;
/**
* Unit testing for ThriftServerRunner.HBaseHandler, a part of the org.apache.hadoop.hbase.thrift
* package. Most of this stuff exists in {@link TestThriftServer} but there might be differences in
* details, so leaving this around for better test coverage.
*/
+@Category(MediumTests.class)
public class TestThriftServerLegacy extends HBaseClusterTestCase {
/**
@@ -178,7 +181,7 @@ public class TestThriftServerLegacy exte
TRowResult rowResult2 = handler.getRow(tableAname, rowBname, null).get(0);
assertBufferEquals(rowBname, rowResult2.row);
assertBufferEquals(valueCname, rowResult2.columns.get(columnAname).value);
- assertBufferEquals(valueDname, rowResult2.columns.get(columnBname).value);
+ assertBufferEquals(valueDname, rowResult2.columns.get(columnBname).value);
// Apply some deletes
handler.deleteAll(tableAname, rowAname, columnBname, null);
@@ -234,9 +237,9 @@ public class TestThriftServerLegacy exte
// Assert that the timestamp-related methods retrieve the correct data
assertEquals(2, handler.getVerTs(tableAname, rowAname, columnBname, time2,
- MAXVERSIONS, null).size());
+ MAXVERSIONS, null).size());
assertEquals(1, handler.getVerTs(tableAname, rowAname, columnBname, time1,
- MAXVERSIONS, null).size());
+ MAXVERSIONS, null).size());
TRowResult rowResult1 = handler.getRowTs(tableAname, rowAname, time1, null).get(0);
TRowResult rowResult2 = handler.getRowTs(tableAname, rowAname, time2, null).get(0);
@@ -355,7 +358,7 @@ public class TestThriftServerLegacy exte
/**
* Tests some of the getRows*() calls.
- *
+ *
* @throws Exception
*/
public void doTestTableMultiGet() throws Exception {
@@ -397,7 +400,7 @@ public class TestThriftServerLegacy exte
/**
* Test some of the checkAndMutate calls
- *
+ *
* @throws Exception
*/
public void doTestTableCheckAndMutate() throws Exception {
@@ -458,9 +461,8 @@ public class TestThriftServerLegacy exte
}
/**
- *
* @return a List of Mutations for a row, with columnA having valueC and
- * columnB having valueD
+ * columnB having valueD
*/
private List<Mutation> getMutations2() {
List<Mutation> mutations = new ArrayList<Mutation>();
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/ThriftServerCmdLineTestBase.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/ThriftServerCmdLineTestBase.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/ThriftServerCmdLineTestBase.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/ThriftServerCmdLineTestBase.java Wed May 14 00:26:57 2014
@@ -29,6 +29,7 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.thrift.ThriftServerRunner.ImplType;
import org.apache.hadoop.hbase.thrift.generated.Hbase;
import org.apache.hadoop.hbase.util.Threads;
@@ -44,12 +45,14 @@ import org.junit.BeforeClass;
import org.junit.Test;
import com.google.common.base.Joiner;
+import org.junit.experimental.categories.Category;
/**
* Start the HBase Thrift server on a random port through the command-line
* interface and talk to it from client side. This itself is not a JUnit test,
* but a base class for subclasses testing individual thrift server types.
*/
+@Category(MediumTests.class)
public class ThriftServerCmdLineTestBase {
public static final Log LOG =
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestHRegionInterfaceSimpleFunctions.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestHRegionInterfaceSimpleFunctions.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestHRegionInterfaceSimpleFunctions.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestHRegionInterfaceSimpleFunctions.java Wed May 14 00:26:57 2014
@@ -16,6 +16,7 @@ import org.apache.hadoop.hbase.HBaseTest
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HServerInfo;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
@@ -41,7 +42,9 @@ import org.apache.zookeeper.data.Stat;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(MediumTests.class)
public class TestHRegionInterfaceSimpleFunctions {
private final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
private final int SLAVES = 1;
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestJVMCrash.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestJVMCrash.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestJVMCrash.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestJVMCrash.java Wed May 14 00:26:57 2014
@@ -3,8 +3,11 @@ package org.apache.hadoop.hbase.thrift.s
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.LargeTests;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(LargeTests.class)
public class TestJVMCrash {
private HBaseTestingUtility hbaseTestingUtility = new HBaseTestingUtility();
private final Log LOG = LogFactory.getLog(TestJVMCrash.class);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestMasterToRSUseThrift.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestMasterToRSUseThrift.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestMasterToRSUseThrift.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestMasterToRSUseThrift.java Wed May 14 00:26:57 2014
@@ -27,6 +27,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
@@ -35,6 +36,7 @@ import org.apache.hadoop.hbase.util.Byte
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* A simple test which just brings up the MiniHBase cluster where the master ->
@@ -42,6 +44,7 @@ import org.junit.Test;
* through thrift. This test just does a simple put and get.
*
*/
+@Category(MediumTests.class)
public class TestMasterToRSUseThrift {
private final Configuration conf = HBaseConfiguration.create();
private final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(conf);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestServerSideException.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestServerSideException.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestServerSideException.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestServerSideException.java Wed May 14 00:26:57 2014
@@ -27,6 +27,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.HTableAsync;
import org.apache.hadoop.hbase.client.Put;
@@ -43,10 +44,12 @@ import org.junit.BeforeClass;
import org.junit.Test;
import com.google.common.util.concurrent.ListenableFuture;
+import org.junit.experimental.categories.Category;
/**
* Test failure handling in HTableAsync. We can also use it in
*/
+@Category(MediumTests.class)
public class TestServerSideException {
private static final Log LOG = LogFactory.getLog(TestServerSideException.class);
private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleOperations.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleOperations.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleOperations.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleOperations.java Wed May 14 00:26:57 2014
@@ -14,6 +14,7 @@ import org.apache.commons.logging.LogFac
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.HBaseAdmin;
@@ -31,10 +32,12 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+@Category(MediumTests.class)
public class TestSimpleOperations {
private static final Log LOG = LogFactory.getLog(TestSimpleOperations.class);
private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleRowMutations.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleRowMutations.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleRowMutations.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleRowMutations.java Wed May 14 00:26:57 2014
@@ -33,6 +33,7 @@ import java.util.concurrent.ExecutionExc
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.HTable;
@@ -45,7 +46,9 @@ import org.apache.hadoop.hbase.util.Byte
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(MediumTests.class)
public class TestSimpleRowMutations {
byte[] tableName = Bytes.toBytes("testSimpleRowMutationsUsingSwift");
byte[] family1 = Bytes.toBytes("family1");
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleScan.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleScan.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleScan.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSimpleScan.java Wed May 14 00:26:57 2014
@@ -28,6 +28,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.HTableAsync;
import org.apache.hadoop.hbase.client.Put;
@@ -39,7 +40,9 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(MediumTests.class)
public class TestSimpleScan {
private final Log LOG = LogFactory.getLog(TestSimpleScan.class);
private final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSocksProxy.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSocksProxy.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSocksProxy.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSocksProxy.java Wed May 14 00:26:57 2014
@@ -5,13 +5,16 @@ import static org.junit.Assert.*;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.ipc.thrift.ThriftClientObjectFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import com.facebook.swift.service.ThriftClientConfig;
+import org.junit.experimental.categories.Category;
+@Category(SmallTests.class)
public class TestSocksProxy {
@Test
public void test() {
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSwiftSerDe.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSwiftSerDe.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSwiftSerDe.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestSwiftSerDe.java Wed May 14 00:26:57 2014
@@ -35,6 +35,7 @@ import org.apache.hadoop.hbase.HColumnDe
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HServerAddress;
import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Scan;
@@ -57,7 +58,9 @@ import org.junit.Test;
import com.facebook.swift.codec.ThriftCodec;
import com.facebook.swift.codec.ThriftCodecManager;
+import org.junit.experimental.categories.Category;
+@Category(SmallTests.class)
public class TestSwiftSerDe {
byte[] family1 = Bytes.toBytes("family1");
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestThriftExceptions.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestThriftExceptions.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestThriftExceptions.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestThriftExceptions.java Wed May 14 00:26:57 2014
@@ -23,6 +23,7 @@ import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.NotServingRegionException;
import org.apache.hadoop.hbase.ipc.HBaseRPCOptions;
import org.apache.hadoop.hbase.ipc.HRegionInterface;
@@ -31,6 +32,7 @@ import org.apache.hadoop.hbase.ipc.thrif
import org.apache.hadoop.hbase.ipc.thrift.exceptions.ThriftHBaseException;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.io.IOException;
import java.net.InetSocketAddress;
@@ -38,6 +40,7 @@ import java.net.InetSocketAddress;
/**
* This is a test class to verify if the Thrift Exceptions work as expected.
*/
+@Category(MediumTests.class)
public class TestThriftExceptions extends TestCase {
/**
* Test if the ThriftHBaseException can be serialized and deserialized
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestThriftMultiRSScenario.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestThriftMultiRSScenario.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestThriftMultiRSScenario.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/thrift/swift/TestThriftMultiRSScenario.java Wed May 14 00:26:57 2014
@@ -27,6 +27,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
@@ -35,7 +36,9 @@ import org.apache.hadoop.hbase.util.Byte
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(MediumTests.class)
public class TestThriftMultiRSScenario {
private final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
private final int SLAVES = 3;
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/SoftValueSortedMapTest.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/SoftValueSortedMapTest.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/SoftValueSortedMapTest.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/SoftValueSortedMapTest.java Wed May 14 00:26:57 2014
@@ -38,4 +38,4 @@ public class SoftValueSortedMapTest {
testMap(new SoftValueSortedMap<Integer, Integer>());
testMap(new TreeMap<Integer, Integer>());
}
-}
\ No newline at end of file
+}
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TagRunner.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TagRunner.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TagRunner.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TagRunner.java Wed May 14 00:26:57 2014
@@ -1,118 +0,0 @@
-/**
- * Copyright 2014 The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.util;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.junit.runner.Description;
-import org.junit.runner.Runner;
-import org.junit.runner.notification.RunNotifier;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.InitializationError;
-
-/**
- * A TagRunner is used to control the running JUnit testcases by tags.
- * To use a <code>TagRunner</code>:
- * <ol>
- * <li>Annotate the testing class with <code>@RunWith(TagRunner.class)</code></li>
- * <li>Annotate the a method with <code>@TestTag({"tag"})</code></li>
- * <li>Now you can specify the system property <code>testskip</code> to skip all
- * the test cases with some tags.</li>
- * </ol>
- *
- * <code>testskip</code> is a semicolon separated string contains all the tags
- * to be skipped. To specify a system property under Maven is like this
- * <code> mvn test -Dtestskip=tag1;tag2</code>
- *
- * <code>all</code> is a special tag which will trigger all tags to be skipped.
- */
-public class TagRunner extends Runner {
- private static final Set<String> skipTags = new HashSet<String>();
- private static boolean skipAll = false;
- /**
- * The system property setting skipping tags. The property is a semicolon
- * separated string.
- */
- private static String PROP_TESTSKIP = "testskip";
- /**
- * A special tags hitting all tags.
- */
- private static String TAG_ALL = "all";
- static {
- String tagStr = System.getProperty(PROP_TESTSKIP, "");
- if (tagStr.length() > 0) {
- for (String tag : tagStr.split(";")) {
- skipTags.add(tag);
- }
- }
- skipAll = skipTags.contains(TAG_ALL);
- }
-
- static private boolean shouldSkip(String[] tags) {
- if (skipAll) {
- return true;
- }
-
- for (String tag: tags) {
- if (skipTags.contains(tag)) {
- return true;
- }
- }
- return false;
- }
-
- private static class SelectiveRunner extends BlockJUnit4ClassRunner {
- @Override
- protected void runChild(FrameworkMethod mth, RunNotifier rn) {
- TestTag tag = mth.getAnnotation(TestTag.class);
- if (tag != null && tag.value().length > 0) {
- if (shouldSkip(tag.value())) {
- rn.fireTestIgnored(this.describeChild(mth));
- return;
- }
- }
-
- super.runChild(mth, rn);
- }
-
- public SelectiveRunner(Class<?> klass) throws InitializationError {
- super(klass);
- }
- }
-
- private Runner runner;
-
- public TagRunner(Class<?> testClass) throws InitializationError {
- this.runner = new SelectiveRunner(testClass);
- }
-
- @Override
- public Description getDescription() {
- return runner.getDescription();
- }
-
- @Override
- public void run(RunNotifier rn) {
- runner.run(rn);
- }
-
-}
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java Wed May 14 00:26:57 2014
@@ -25,10 +25,13 @@ import java.util.Map;
import java.util.TreeMap;
import junit.framework.TestCase;
+import org.apache.hadoop.hbase.SmallTests;
+import org.junit.experimental.categories.Category;
/**
* Test order preservation characteristics of ordered Base64 dialect
*/
+@Category(SmallTests.class)
public class TestBase64 extends TestCase {
// Note: uris is sorted. We need to prove that the ordered Base64
// preserves that ordering
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestByteBloomFilter.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestByteBloomFilter.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestByteBloomFilter.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestByteBloomFilter.java Wed May 14 00:26:57 2014
@@ -25,7 +25,10 @@ import java.io.DataOutputStream;
import java.nio.ByteBuffer;
import junit.framework.TestCase;
+import org.apache.hadoop.hbase.SmallTests;
+import org.junit.experimental.categories.Category;
+@Category(SmallTests.class)
public class TestByteBloomFilter extends TestCase {
public void testBasicBloom() throws Exception {
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestByteBufferUtils.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestByteBufferUtils.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestByteBufferUtils.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestByteBufferUtils.java Wed May 14 00:26:57 2014
@@ -34,10 +34,13 @@ import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.io.WritableUtils;
import org.junit.Before;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(SmallTests.class)
public class TestByteBufferUtils {
private byte[] array;
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java Wed May 14 00:26:57 2014
@@ -31,8 +31,11 @@ import java.util.Random;
import junit.framework.TestCase;
+import org.apache.hadoop.hbase.SmallTests;
import org.junit.Assert;
+import org.junit.experimental.categories.Category;
+@Category(SmallTests.class)
public class TestBytes extends TestCase {
public void testNullHashCode() {
byte [] b = null;
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestCompressionTest.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestCompressionTest.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestCompressionTest.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestCompressionTest.java Wed May 14 00:26:57 2014
@@ -21,6 +21,7 @@
package org.apache.hadoop.hbase.util;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.io.hfile.Compression;
import org.apache.hadoop.io.DataOutputBuffer;
import org.apache.hadoop.io.compress.CompressionCodec;
@@ -28,6 +29,7 @@ import org.apache.hadoop.io.compress.Com
import org.apache.hadoop.util.NativeCodeLoader;
import org.apache.hadoop.util.ReflectionUtils;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.io.BufferedOutputStream;
import java.io.DataOutputStream;
@@ -35,6 +37,7 @@ import java.io.IOException;
import static org.junit.Assert.*;
+@Category(SmallTests.class)
public class TestCompressionTest {
@Test
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java Wed May 14 00:26:57 2014
@@ -19,7 +19,9 @@
*/
package org.apache.hadoop.hbase.util;
+import org.apache.hadoop.hbase.SmallTests;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.fail;
@@ -28,6 +30,7 @@ import static junit.framework.Assert.fai
* Tests to make sure that the default environment edge conforms to appropriate
* behaviour.
*/
+@Category(SmallTests.class)
public class TestDefaultEnvironmentEdge {
@Test
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestDrainRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestDrainRegionServer.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestDrainRegionServer.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestDrainRegionServer.java Wed May 14 00:26:57 2014
@@ -20,6 +20,8 @@
package org.apache.hadoop.hbase.util;
import org.apache.hadoop.hbase.HServerInfo;
+import org.apache.hadoop.hbase.MediumTests;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.master.RegionMovementTestHelper;
import org.apache.hadoop.hbase.regionserver.HRegion;
@@ -27,6 +29,7 @@ import org.apache.hadoop.hbase.regionser
import org.apache.hadoop.hbase.master.AssignmentPlan;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.io.File;
import java.io.IOException;
@@ -42,6 +45,7 @@ import static org.junit.Assert.fail;
*
* Test requires write access to file system and takes more than a minute to run.
*/
+@Category(MediumTests.class)
public class TestDrainRegionServer {
private final static RegionMovementTestHelper TEST_UTIL = new RegionMovementTestHelper();
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestDrainableQueue.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestDrainableQueue.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestDrainableQueue.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestDrainableQueue.java Wed May 14 00:26:57 2014
@@ -35,8 +35,11 @@ import java.util.concurrent.atomic.Atomi
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.SmallTests;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(SmallTests.class)
public class TestDrainableQueue implements ParamCallable<Integer>{
private static final Log LOG = LogFactory.getLog(TestDrainableQueue.class);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java Wed May 14 00:26:57 2014
@@ -19,7 +19,9 @@
*/
package org.apache.hadoop.hbase.util;
+import org.apache.hadoop.hbase.SmallTests;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -30,6 +32,7 @@ import static org.junit.Assert.assertFal
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+@Category(SmallTests.class)
public class TestEnvironmentEdgeManager {
@Test
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestIdLock.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestIdLock.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestIdLock.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestIdLock.java Wed May 14 00:26:57 2014
@@ -33,8 +33,12 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import static org.junit.Assert.*;
+
+import org.apache.hadoop.hbase.SmallTests;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(SmallTests.class)
public class TestIdLock {
private static final Log LOG = LogFactory.getLog(TestIdLock.class);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java Wed May 14 00:26:57 2014
@@ -19,7 +19,9 @@
*/
package org.apache.hadoop.hbase.util;
+import org.apache.hadoop.hbase.SmallTests;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import static junit.framework.Assert.assertEquals;
@@ -27,6 +29,7 @@ import static junit.framework.Assert.ass
* Tests that the incrementing environment edge increments time instead of using
* the default.
*/
+@Category(SmallTests.class)
public class TestIncrementingEnvironmentEdge {
@Test
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestKeying.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestKeying.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestKeying.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestKeying.java Wed May 14 00:26:57 2014
@@ -20,10 +20,13 @@
package org.apache.hadoop.hbase.util;
import junit.framework.TestCase;
+import org.apache.hadoop.hbase.SmallTests;
+import org.junit.experimental.categories.Category;
/**
* Tests url transformations
*/
+@Category(SmallTests.class)
public class TestKeying extends TestCase {
@Override
@@ -59,4 +62,4 @@ public class TestKeying extends TestCase
System.out.println("Original url " + u + ", Transformed url " + k);
assertEquals(u, uri);
}
-}
\ No newline at end of file
+}
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestLoadTestKVGenerator.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestLoadTestKVGenerator.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestLoadTestKVGenerator.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestLoadTestKVGenerator.java Wed May 14 00:26:57 2014
@@ -23,8 +23,11 @@ import java.util.HashSet;
import java.util.Random;
import java.util.Set;
+import org.apache.hadoop.hbase.SmallTests;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(SmallTests.class)
public class TestLoadTestKVGenerator {
private static final int MIN_LEN = 10;
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java Wed May 14 00:26:57 2014
@@ -33,6 +33,7 @@ import org.apache.hadoop.hbase.HConstant
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
@@ -42,8 +43,10 @@ import org.apache.hadoop.hbase.regionser
import org.apache.hadoop.hbase.regionserver.InternalScanner;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.apache.hadoop.util.ToolRunner;
+import org.junit.experimental.categories.Category;
/** Test stand alone merge tool that can merge arbitrary regions */
+@Category(MediumTests.class)
public class TestMergeTool extends HBaseTestCase {
static final Log LOG = LogFactory.getLog(TestMergeTool.class);
// static final byte [] COLUMN_NAME = Bytes.toBytes("contents:");
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadEncoded.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadEncoded.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadEncoded.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadEncoded.java Wed May 14 00:26:57 2014
@@ -20,7 +20,9 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
+import org.junit.experimental.categories.Category;
import org.junit.runners.Parameterized.Parameters;
/**
@@ -29,6 +31,7 @@ import org.junit.runners.Parameterized.P
* amount of data, but goes through all available data block encoding
* algorithms.
*/
+@Category(MediumTests.class)
public class TestMiniClusterLoadEncoded extends TestMiniClusterLoadParallel {
/** We do not alternate the multi-put flag in this test. */
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadParallel.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadParallel.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadParallel.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadParallel.java Wed May 14 00:26:57 2014
@@ -16,8 +16,10 @@
*/
package org.apache.hadoop.hbase.util;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -27,6 +29,7 @@ import static org.junit.Assert.assertEqu
* A write/read/verify load test on a mini HBase cluster. Tests reading
* and writing at the same time.
*/
+@Category(MediumTests.class)
@RunWith(Parameterized.class)
public class TestMiniClusterLoadParallel
extends TestMiniClusterLoadSequential {
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadSequential.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadSequential.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadSequential.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadSequential.java Wed May 14 00:26:57 2014
@@ -29,6 +29,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.TableNotFoundException;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
@@ -46,6 +47,7 @@ import org.junit.runners.Parameterized.P
* A write/read/verify load test on a mini HBase cluster. Tests reading
* and then writing.
*/
+@Category(MediumTests.class)
@RunWith(Parameterized.class)
public class TestMiniClusterLoadSequential {
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMunkresAssignment.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMunkresAssignment.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMunkresAssignment.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestMunkresAssignment.java Wed May 14 00:26:57 2014
@@ -23,12 +23,15 @@ import static org.junit.Assert.*;
import java.util.Arrays;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.util.MunkresAssignment;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Tests for {@link MunkresAssignment} which solves the assignment problem.
*/
+@Category(SmallTests.class)
public class TestMunkresAssignment {
/**
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestParamFormatter.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestParamFormatter.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestParamFormatter.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestParamFormatter.java Wed May 14 00:26:57 2014
@@ -2,7 +2,9 @@ package org.apache.hadoop.hbase.util;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.SmallTests;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.lang.reflect.Method;
import java.util.HashMap;
@@ -13,6 +15,7 @@ import static junit.framework.Assert.*;
/**
* Test the ParamFormatter framework
*/
+@Category(SmallTests.class)
public class TestParamFormatter {
private final static Log LOG = LogFactory.getLog(TestParamFormatter.class);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestProcessBasedCluster.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestProcessBasedCluster.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestProcessBasedCluster.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestProcessBasedCluster.java Wed May 14 00:26:57 2014
@@ -26,16 +26,19 @@ import org.apache.commons.logging.LogFac
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HColumnDescriptor;
import org.apache.hadoop.hbase.HTestConst;
+import org.apache.hadoop.hbase.MediumTests;
+import org.apache.hadoop.hbase.UnstableTests;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.ResultScanner;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.runner.RunWith;
/**
* A basic unit test that spins up a local HBase cluster.
*/
-@RunWith(TagRunner.class)
+@Category(MediumTests.class)
public class TestProcessBasedCluster {
private static final Log LOG = LogFactory.getLog(TestProcessBasedCluster.class);
@@ -48,7 +51,7 @@ public class TestProcessBasedCluster {
private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
// Marked as unstable, recorded as #3866088
- @TestTag({ "unstable" })
+ @Category(UnstableTests.class)
@Test(timeout=300 * 1000)
public void testProcessBasedCluster() throws Exception {
ProcessBasedLocalHBaseCluster cluster = new ProcessBasedLocalHBaseCluster(
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java Wed May 14 00:26:57 2014
@@ -33,6 +33,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.HServerAddress;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.mapreduce.TableInputFormat;
@@ -45,11 +46,13 @@ import org.apache.hadoop.mapreduce.JobCo
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Tests for {@link RegionSplitter}, which can create a pre-split table or do a
* rolling split of an existing table.
*/
+@Category(MediumTests.class)
public class TestRegionSplitter {
private final static Log LOG = LogFactory.getLog(TestRegionSplitter.class);
private final static HBaseTestingUtility UTIL = new HBaseTestingUtility();
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestRootPath.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestRootPath.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestRootPath.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestRootPath.java Wed May 14 00:26:57 2014
@@ -28,10 +28,13 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.hbase.SmallTests;
+import org.junit.experimental.categories.Category;
/**
* Test requirement that root directory must be a URI
*/
+@Category(SmallTests.class)
public class TestRootPath extends TestCase {
private static final Log LOG = LogFactory.getLog(TestRootPath.class);
@@ -60,4 +63,4 @@ public class TestRootPath extends TestCa
LOG.info("Got expected exception when checking invalid path:", e);
}
}
-}
\ No newline at end of file
+}
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestSizeBasedThrottler.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestSizeBasedThrottler.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestSizeBasedThrottler.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestSizeBasedThrottler.java Wed May 14 00:26:57 2014
@@ -24,8 +24,11 @@ import java.util.ArrayList;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicBoolean;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.util.throttles.SizeBasedThrottler;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
import static org.junit.Assert.*;
/**
@@ -33,6 +36,7 @@ import static org.junit.Assert.*;
* It tests some race conditions that can happen
* occasionally, but not every time.
*/
+@Category(SmallTests.class)
public class TestSizeBasedThrottler {
private static final int REPEATS = 100;
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestStringBytes.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestStringBytes.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestStringBytes.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestStringBytes.java Wed May 14 00:26:57 2014
@@ -21,11 +21,14 @@ package org.apache.hadoop.hbase.util;
import junit.framework.Assert;
+import org.apache.hadoop.hbase.SmallTests;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
/**
* Testcase for StringBytes
*/
+@Category(SmallTests.class)
public class TestStringBytes {
@Test
public void testBasic() throws Exception {
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java Wed May 14 00:26:57 2014
@@ -22,8 +22,11 @@ import static org.junit.Assert.assertTru
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.SmallTests;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(SmallTests.class)
public class TestThreads {
private static final Log LOG = LogFactory.getLog(TestThreads.class);
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TitanUserInfo.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TitanUserInfo.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TitanUserInfo.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/TitanUserInfo.java Wed May 14 00:26:57 2014
@@ -9,17 +9,20 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.loadtest.RegionSplitter;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
+import org.junit.experimental.categories.Category;
/**
* Given a Titan userid, figure out where the user is located on a cluster. This
* is useful for taking userids, which appserver people use, and translating
* them to regions & current RS for diagnosis.
*/
+@Category(SmallTests.class)
public class TitanUserInfo {
public static void main(String[] args) throws IOException {
if (args.length < 1) {
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/coprocessor/TestSortedCopyOnWriteSet.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/coprocessor/TestSortedCopyOnWriteSet.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/coprocessor/TestSortedCopyOnWriteSet.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/util/coprocessor/TestSortedCopyOnWriteSet.java Wed May 14 00:26:57 2014
@@ -26,10 +26,13 @@ import static org.junit.Assert.assertTru
import java.util.Iterator;
+import org.apache.hadoop.hbase.SmallTests;
import org.junit.Test;
import com.google.common.collect.Lists;
+import org.junit.experimental.categories.Category;
+@Category(SmallTests.class)
public class TestSortedCopyOnWriteSet {
@Test
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java Wed May 14 00:26:57 2014
@@ -30,11 +30,14 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HBaseTestCase;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer;
+import org.junit.experimental.categories.Category;
/**
* Test for HQuorumPeer.
*/
+@Category(MediumTests.class)
public class TestHQuorumPeer extends HBaseTestCase {
private Path dataDir;
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperWrapper.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperWrapper.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperWrapper.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperWrapper.java Wed May 14 00:26:57 2014
@@ -6,6 +6,7 @@ import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.zookeeper.ZooKeeperWrapper.NodeFilter;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
@@ -17,7 +18,9 @@ import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
+@Category(MediumTests.class)
public class TestZooKeeperWrapper {
private static final HBaseTestingUtility TEST_UTIL =
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/zookeeper/lock/TestHReadWriteLockImpl.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/zookeeper/lock/TestHReadWriteLockImpl.java?rev=1594423&r1=1594422&r2=1594423&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/zookeeper/lock/TestHReadWriteLockImpl.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/zookeeper/lock/TestHReadWriteLockImpl.java Wed May 14 00:26:57 2014
@@ -30,6 +30,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.hbase.HLock.MetadataHandler;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.DaemonThreadFactory;
import org.apache.hadoop.hbase.util.MultiThreadedTestUtils;
@@ -39,6 +40,7 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import java.io.IOException;
import java.io.InterruptedIOException;
@@ -51,6 +53,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+@Category(MediumTests.class)
public class TestHReadWriteLockImpl {
private static final Log LOG =