hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject [12/12] git commit: HBASE-11911 Break up tests into more fine grained categories (Alex Newman)
Date Sat, 13 Sep 2014 04:38:44 GMT
HBASE-11911 Break up tests into more fine grained categories (Alex Newman)


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3c9bd7d2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3c9bd7d2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3c9bd7d2

Branch: refs/heads/master
Commit: 3c9bd7d296f7ce44a00a6df830906949e2676e1f
Parents: 98be489
Author: stack <stack@apache.org>
Authored: Fri Sep 12 21:37:06 2014 -0700
Committer: stack <stack@apache.org>
Committed: Fri Sep 12 21:37:06 2014 -0700

----------------------------------------------------------------------
 .../hadoop/hbase/TestRegionLocations.java       |   4 +-
 .../hadoop/hbase/client/TestAsyncProcess.java   |   5 +-
 .../hadoop/hbase/client/TestAttributes.java     |   5 +-
 .../hbase/client/TestClientNoCluster.java       |   5 +-
 .../hbase/client/TestDeleteTimeStamp.java       |   5 +-
 .../org/apache/hadoop/hbase/client/TestGet.java |   5 +-
 .../hadoop/hbase/client/TestIncrement.java      |   5 +-
 .../hadoop/hbase/client/TestOperation.java      |   5 +-
 .../hadoop/hbase/client/TestPutDotHas.java      |   5 +-
 .../apache/hadoop/hbase/client/TestScan.java    |   5 +-
 .../hbase/client/TestSnapshotFromAdmin.java     |   5 +-
 .../apache/hadoop/hbase/ipc/TestIPCUtil.java    |   5 +-
 .../ipc/TestPayloadCarryingRpcController.java   |   5 +-
 .../hbase/security/TestEncryptionUtil.java      |   6 +-
 .../apache/hadoop/hbase/IntegrationTests.java   |  39 ---
 .../org/apache/hadoop/hbase/LargeTests.java     |  38 ---
 .../org/apache/hadoop/hbase/MediumTests.java    |  37 ---
 .../org/apache/hadoop/hbase/SmallTests.java     |  34 ---
 .../apache/hadoop/hbase/TestCellComparator.java |   4 +-
 .../org/apache/hadoop/hbase/TestCellUtil.java   |   4 +-
 .../apache/hadoop/hbase/TestClassFinder.java    |   4 +-
 .../hadoop/hbase/TestCompoundConfiguration.java |   4 +-
 .../hadoop/hbase/TestHBaseConfiguration.java    |   4 +-
 .../hadoop/hbase/codec/TestCellCodec.java       |   7 +-
 .../hbase/codec/TestCellCodecWithTags.java      |   5 +-
 .../hadoop/hbase/codec/TestKeyValueCodec.java   |   7 +-
 .../hbase/codec/TestKeyValueCodecWithTags.java  |   5 +-
 .../hbase/io/TestTagCompressionContext.java     |   5 +-
 .../hbase/io/crypto/TestCipherProvider.java     |   5 +-
 .../hadoop/hbase/io/crypto/TestEncryption.java  |   5 +-
 .../hadoop/hbase/io/crypto/TestKeyProvider.java |   5 +-
 .../io/crypto/TestKeyStoreKeyProvider.java      |   5 +-
 .../hadoop/hbase/io/crypto/aes/TestAES.java     |   5 +-
 .../hadoop/hbase/io/util/TestLRUDictionary.java |   5 +-
 .../hbase/testclassification/ClientTests.java   |  41 +++
 .../testclassification/CoprocessorTests.java    |  41 +++
 .../hbase/testclassification/FilterTests.java   |  41 +++
 .../hbase/testclassification/FlakeyTests.java   |  40 +++
 .../hbase/testclassification/IOTests.java       |  41 +++
 .../testclassification/IntegrationTests.java    |  39 +++
 .../hbase/testclassification/LargeTests.java    |  38 +++
 .../testclassification/MapReduceTests.java      |  40 +++
 .../hbase/testclassification/MasterTests.java   |  40 +++
 .../hbase/testclassification/MediumTests.java   |  37 +++
 .../hbase/testclassification/MiscTests.java     |  40 +++
 .../hbase/testclassification/RPCTests.java      |  40 +++
 .../testclassification/RegionServerTests.java   |  41 +++
 .../testclassification/ReplicationTests.java    |  40 +++
 .../hbase/testclassification/RestTests.java     |  41 +++
 .../hbase/testclassification/SecurityTests.java |  42 +++
 .../hbase/testclassification/SmallTests.java    |  34 +++
 .../VerySlowMapReduceTests.java                 |  42 +++
 .../VerySlowRegionServerTests.java              |  42 +++
 .../hbase/types/TestFixedLengthWrapper.java     |   5 +-
 .../hadoop/hbase/types/TestOrderedBlob.java     |   5 +-
 .../hadoop/hbase/types/TestOrderedBlobVar.java  |   5 +-
 .../hadoop/hbase/types/TestOrderedString.java   |   5 +-
 .../hadoop/hbase/types/TestRawString.java       |   5 +-
 .../apache/hadoop/hbase/types/TestStruct.java   |   5 +-
 .../hbase/types/TestStructNullExtension.java    |   5 +-
 .../hbase/types/TestTerminatedWrapper.java      |   5 +-
 .../apache/hadoop/hbase/types/TestUnion2.java   |   5 +-
 .../apache/hadoop/hbase/util/TestBase64.java    |   5 +-
 .../util/TestByteRangeWithKVSerialization.java  |   5 +-
 .../org/apache/hadoop/hbase/util/TestBytes.java |   5 +-
 .../hbase/util/TestConcatenatedLists.java       |   5 +-
 .../hbase/util/TestCoprocessorClassLoader.java  |   5 +-
 .../apache/hadoop/hbase/util/TestCounter.java   |   5 +-
 .../hadoop/hbase/util/TestDrainBarrier.java     |   5 +-
 .../hbase/util/TestDynamicClassLoader.java      |   5 +-
 .../hbase/util/TestEnvironmentEdgeManager.java  |   5 +-
 .../apache/hadoop/hbase/util/TestKeyLocker.java |   5 +-
 .../hbase/util/TestLoadTestKVGenerator.java     |   6 +-
 .../org/apache/hadoop/hbase/util/TestOrder.java |   5 +-
 .../hadoop/hbase/util/TestOrderedBytes.java     |   5 +-
 .../hadoop/hbase/util/TestShowProperties.java   |   5 +-
 .../hbase/util/TestSimpleMutableByteRange.java  |   5 +-
 .../TestSimplePositionedMutableByteRange.java   |   5 +-
 .../apache/hadoop/hbase/util/TestThreads.java   |   5 +-
 .../example/TestBulkDeleteProtocol.java         |   5 +-
 .../example/TestRowCountEndpoint.java           |   5 +-
 .../TestZooKeeperScanPolicyObserver.java        |   5 +-
 .../hbase/mapreduce/TestMapReduceExamples.java  |   5 +-
 .../apache/hadoop/hbase/types/TestPBCell.java   |   4 +
 .../master/TestMetricsMasterSourceImpl.java     |   3 -
 .../hadoop/hbase/IntegrationTestIngest.java     |   1 +
 .../IntegrationTestIngestStripeCompactions.java |   1 +
 .../hbase/IntegrationTestIngestWithACL.java     |   1 +
 .../IntegrationTestIngestWithEncryption.java    |   1 +
 .../hbase/IntegrationTestIngestWithTags.java    |   1 +
 ...tegrationTestIngestWithVisibilityLabels.java |   1 +
 .../hbase/IntegrationTestLazyCfLoading.java     |   1 +
 .../hbase/IntegrationTestManyRegions.java       |   2 +-
 .../hbase/IntegrationTestRegionReplicaPerf.java |   1 +
 .../hadoop/hbase/IntegrationTestsDriver.java    |   1 +
 .../mapreduce/IntegrationTestBulkLoad.java      |   2 +-
 .../mapreduce/IntegrationTestImportTsv.java     |   2 +-
 .../IntegrationTestTableMapReduceUtil.java      |   4 +-
 ...IntegrationTestTableSnapshotInputFormat.java |   2 +-
 .../hadoop/hbase/mttr/IntegrationTestMTTR.java  |   2 +-
 .../test/IntegrationTestBigLinkedList.java      |   2 +-
 ...egrationTestBigLinkedListWithVisibility.java |   2 +-
 .../test/IntegrationTestLoadAndVerify.java      |   2 +-
 ...undedMultiGetRequestsWithRegionReplicas.java |   2 +-
 ...stTimeBoundedRequestsWithRegionReplicas.java |   2 +-
 ...tionTestWithCellVisibilityLoadAndVerify.java |   2 +-
 .../trace/IntegrationTestSendTraceRequests.java |   2 +-
 .../hbase/codec/keyvalue/TestKeyValueTool.java  |   5 +-
 .../prefixtree/blockmeta/TestBlockMeta.java     |   5 +-
 .../codec/prefixtree/builder/TestTokenizer.java |   5 +-
 .../codec/prefixtree/builder/TestTreeDepth.java |   5 +-
 .../prefixtree/column/TestColumnBuilder.java    |   5 +-
 .../prefixtree/row/TestPrefixTreeSearcher.java  |   5 +-
 .../codec/prefixtree/row/TestRowEncoder.java    |   5 +-
 .../timestamp/TestTimestampEncoder.java         |   5 +-
 .../hadoop/hbase/util/bytes/TestByteRange.java  |   5 +-
 .../hadoop/hbase/util/vint/TestFIntTool.java    |   6 +-
 .../hadoop/hbase/util/vint/TestVIntTool.java    |   6 +-
 .../hadoop/hbase/util/vint/TestVLongTool.java   |   6 +-
 .../apache/hadoop/hbase/TestAcidGuarantees.java |   4 +-
 .../hadoop/hbase/TestCheckTestClasses.java      |   4 +-
 .../hadoop/hbase/TestClusterBootOrder.java      |   4 +-
 .../org/apache/hadoop/hbase/TestCompare.java    |   4 +-
 .../TestFSTableDescriptorForceCreation.java     |   4 +-
 .../hadoop/hbase/TestFullLogReconstruction.java |   4 +-
 .../hadoop/hbase/TestGlobalMemStoreSize.java    |   4 +-
 .../hadoop/hbase/TestHBaseTestingUtility.java   |   4 +-
 .../hadoop/hbase/TestHColumnDescriptor.java     |   4 +-
 .../TestHColumnDescriptorDefaultVersions.java   |   9 +-
 .../hbase/TestHDFSBlocksDistribution.java       |   4 +-
 .../hadoop/hbase/TestHRegionLocation.java       |   4 +-
 .../hadoop/hbase/TestHTableDescriptor.java      |   4 +-
 .../org/apache/hadoop/hbase/TestIOFencing.java  |   4 +-
 .../hbase/TestIPv6NIOServerSocketChannel.java   |   4 +-
 .../apache/hadoop/hbase/TestInfoServers.java    |   4 +-
 .../apache/hadoop/hbase/TestJMXListener.java    |   4 +-
 .../hadoop/hbase/TestLocalHBaseCluster.java     |   4 +-
 .../hadoop/hbase/TestMetaTableAccessor.java     |   4 +-
 .../hbase/TestMetaTableAccessorNoCluster.java   |   4 +-
 .../hadoop/hbase/TestMetaTableLocator.java      |   4 +-
 .../apache/hadoop/hbase/TestMultiVersions.java  |   4 +-
 .../org/apache/hadoop/hbase/TestNamespace.java  |   4 +-
 .../hadoop/hbase/TestNodeHealthCheckChore.java  |   4 +-
 .../hadoop/hbase/TestPerformanceEvaluation.java |   4 +-
 .../hadoop/hbase/TestRegionRebalancing.java     |   4 +-
 .../apache/hadoop/hbase/TestSerialization.java  |   4 +-
 .../org/apache/hadoop/hbase/TestServerLoad.java |   4 +-
 .../org/apache/hadoop/hbase/TestServerName.java |   4 +-
 .../org/apache/hadoop/hbase/TestZooKeeper.java  |   4 +-
 .../hadoop/hbase/backup/TestHFileArchiving.java |   6 +-
 .../TestZooKeeperTableArchiveClient.java        |   5 +-
 .../apache/hadoop/hbase/client/TestAdmin.java   |   5 +-
 .../client/TestClientOperationInterrupt.java    |   5 +-
 .../client/TestClientScannerRPCTimeout.java     |   5 +-
 .../hadoop/hbase/client/TestClientTimeouts.java |   5 +-
 .../client/TestCloneSnapshotFromClient.java     |  11 +-
 ...oneSnapshotFromClientWithRegionReplicas.java |   5 +-
 .../hbase/client/TestConnectionUtils.java       |   5 +-
 .../hadoop/hbase/client/TestFromClientSide.java |   5 +-
 .../hbase/client/TestFromClientSide3.java       |   5 +-
 .../hbase/client/TestFromClientSideNoCodec.java |   5 +-
 .../TestFromClientSideWithCoprocessor.java      |   5 +-
 .../hbase/client/TestHBaseAdminNoCluster.java   |   5 +-
 .../org/apache/hadoop/hbase/client/TestHCM.java |   5 +-
 .../hbase/client/TestHTableMultiplexer.java     |   5 +-
 .../hadoop/hbase/client/TestHTableUtil.java     |   5 +-
 .../hbase/client/TestIntraRowPagination.java    |   5 +-
 .../hadoop/hbase/client/TestMetaScanner.java    |   5 +-
 .../hadoop/hbase/client/TestMultiParallel.java  |   5 +-
 .../hbase/client/TestMultipleTimestamps.java    |   4 +-
 .../client/TestPutDeleteEtcCellIteration.java   |   5 +-
 .../hadoop/hbase/client/TestPutWithDelete.java  |   4 +-
 .../hbase/client/TestReplicaWithCluster.java    |   5 +-
 .../hadoop/hbase/client/TestReplicasClient.java |   5 +-
 .../client/TestRestoreSnapshotFromClient.java   |   5 +-
 ...oreSnapshotFromClientWithRegionReplicas.java |   5 +-
 .../apache/hadoop/hbase/client/TestResult.java  |   5 +-
 .../hbase/client/TestRpcControllerFactory.java  |   5 +-
 .../hadoop/hbase/client/TestScannerTimeout.java |   5 +-
 .../client/TestScannersFromClientSide.java      |   5 +-
 .../client/TestSnapshotCloneIndependence.java   |   5 +-
 .../hbase/client/TestSnapshotFromClient.java    |   5 +-
 ...estSnapshotFromClientWithRegionReplicas.java |   5 +-
 .../hbase/client/TestSnapshotMetadata.java      |   5 +-
 .../hbase/client/TestTableSnapshotScanner.java  |   5 +-
 .../hbase/client/TestTimestampsFilter.java      |   4 +-
 .../replication/TestReplicationAdmin.java       |   4 +-
 .../hbase/codec/TestCellMessageCodec.java       |   7 +-
 .../hadoop/hbase/constraint/TestConstraint.java |   5 +-
 .../hbase/constraint/TestConstraints.java       |   5 +-
 .../coprocessor/TestAggregateProtocol.java      |   4 +-
 .../TestBatchCoprocessorEndpoint.java           |   5 +-
 .../TestBigDecimalColumnInterpreter.java        |   4 +-
 .../hbase/coprocessor/TestClassLoading.java     |   5 +-
 .../coprocessor/TestCoprocessorEndpoint.java    |   5 +-
 .../coprocessor/TestCoprocessorInterface.java   |   5 +-
 .../hbase/coprocessor/TestCoprocessorStop.java  |   6 +-
 .../TestDoubleColumnInterpreter.java            |   5 +-
 .../hbase/coprocessor/TestHTableWrapper.java    |   5 +-
 ...TestMasterCoprocessorExceptionWithAbort.java |   6 +-
 ...estMasterCoprocessorExceptionWithRemove.java |   6 +-
 .../hbase/coprocessor/TestMasterObserver.java   |   6 +-
 .../coprocessor/TestOpenTableInCoprocessor.java |   5 +-
 .../coprocessor/TestRegionObserverBypass.java   |   5 +-
 .../TestRegionObserverInterface.java            |   5 +-
 .../TestRegionObserverScannerOpenHook.java      |   5 +-
 .../coprocessor/TestRegionObserverStacking.java |   5 +-
 ...gionServerCoprocessorExceptionWithAbort.java |   4 +-
 ...ionServerCoprocessorExceptionWithRemove.java |   4 +-
 .../coprocessor/TestRegionServerObserver.java   |   5 +-
 .../coprocessor/TestRowProcessorEndpoint.java   |   5 +-
 .../hbase/coprocessor/TestWALObserver.java      |   7 +-
 .../TestForeignExceptionDispatcher.java         |   5 +-
 .../TestForeignExceptionSerialization.java      |   5 +-
 .../TestTimeoutExceptionInjector.java           |   5 +-
 .../hbase/executor/TestExecutorService.java     |   5 +-
 .../hadoop/hbase/filter/TestBitComparator.java  |   5 +-
 .../filter/TestColumnPaginationFilter.java      |   5 +-
 .../hbase/filter/TestColumnPrefixFilter.java    |   4 +-
 .../hbase/filter/TestColumnRangeFilter.java     |   4 +-
 .../filter/TestComparatorSerialization.java     |   5 +-
 .../hbase/filter/TestDependentColumnFilter.java |   4 +-
 .../apache/hadoop/hbase/filter/TestFilter.java  |   6 +-
 .../hadoop/hbase/filter/TestFilterList.java     |   5 +-
 .../hbase/filter/TestFilterSerialization.java   |   5 +-
 .../hbase/filter/TestFilterWithScanLimits.java  |   5 +-
 .../hadoop/hbase/filter/TestFilterWrapper.java  |   5 +-
 ...stFirstKeyValueMatchingQualifiersFilter.java |   5 +-
 .../TestFuzzyRowAndColumnRangeFilter.java       |   5 +-
 .../hadoop/hbase/filter/TestFuzzyRowFilter.java |   5 +-
 .../hbase/filter/TestInclusiveStopFilter.java   |  11 +-
 .../filter/TestInvocationRecordFilter.java      |   5 +-
 .../filter/TestMultipleColumnPrefixFilter.java  |   4 +-
 .../hadoop/hbase/filter/TestNullComparator.java |   5 +-
 .../hadoop/hbase/filter/TestPageFilter.java     |   5 +-
 .../hadoop/hbase/filter/TestParseFilter.java    |  17 +-
 .../hadoop/hbase/filter/TestPrefixFilter.java   |  10 +-
 .../hbase/filter/TestRandomRowFilter.java       |  10 +-
 .../TestSingleColumnValueExcludeFilter.java     |   5 +-
 .../filter/TestSingleColumnValueFilter.java     |   5 +-
 .../hadoop/hbase/fs/TestBlockReorder.java       |   5 +-
 .../hbase/http/HttpServerFunctionalTest.java    |   3 -
 .../hadoop/hbase/http/TestGlobalFilter.java     |   8 +-
 .../hadoop/hbase/http/TestHtmlQuoting.java      |   7 +-
 .../hadoop/hbase/http/TestHttpRequestLog.java   |   7 +-
 .../hbase/http/TestHttpRequestLogAppender.java  |   6 +-
 .../hadoop/hbase/http/TestHttpServer.java       |   5 +-
 .../hbase/http/TestHttpServerLifecycle.java     |   7 +-
 .../hbase/http/TestHttpServerWebapps.java       |   6 +-
 .../hadoop/hbase/http/TestPathFilter.java       |   8 +-
 .../hadoop/hbase/http/TestSSLHttpServer.java    |   5 +-
 .../hadoop/hbase/http/TestServletFilter.java    |   5 +-
 .../hadoop/hbase/http/conf/TestConfServlet.java |   6 +-
 .../hbase/http/jmx/TestJMXJsonServlet.java      |   5 +-
 .../hbase/http/lib/TestStaticUserWebFilter.java |   5 +-
 .../hadoop/hbase/http/log/TestLogLevel.java     |   6 +-
 .../apache/hadoop/hbase/io/TestFileLink.java    |   5 +-
 .../apache/hadoop/hbase/io/TestHFileLink.java   |  20 +-
 .../hbase/io/TestHalfStoreFileReader.java       |   5 +-
 .../apache/hadoop/hbase/io/TestHeapSize.java    |   5 +-
 .../hbase/io/TestImmutableBytesWritable.java    |   5 +-
 .../apache/hadoop/hbase/io/TestReference.java   |   5 +-
 .../encoding/TestBufferedDataBlockEncoder.java  |   5 +-
 .../hbase/io/encoding/TestChangingEncoding.java |   5 +-
 .../io/encoding/TestDataBlockEncoders.java      |   5 +-
 .../hbase/io/encoding/TestEncodedSeekers.java   |   5 +-
 .../encoding/TestLoadAndSwitchEncodeOnDisk.java |   5 +-
 .../hbase/io/encoding/TestPrefixTree.java       |   5 +-
 .../io/encoding/TestPrefixTreeEncoding.java     |   5 +-
 .../encoding/TestSeekToBlockWithEncoders.java   |   5 +-
 .../hbase/io/hfile/TestBlockCacheReporting.java |   5 +-
 .../hadoop/hbase/io/hfile/TestCacheConfig.java  |   5 +-
 .../hadoop/hbase/io/hfile/TestCacheOnWrite.java |   5 +-
 .../hbase/io/hfile/TestCachedBlockQueue.java    |   5 +-
 .../hadoop/hbase/io/hfile/TestChecksum.java     |   5 +-
 .../hbase/io/hfile/TestFixedFileTrailer.java    |   4 +-
 .../io/hfile/TestForceCacheImportantBlocks.java |   5 +-
 .../apache/hadoop/hbase/io/hfile/TestHFile.java |   5 +-
 .../hadoop/hbase/io/hfile/TestHFileBlock.java   |   5 +-
 .../io/hfile/TestHFileBlockCompatibility.java   |   5 +-
 .../hbase/io/hfile/TestHFileBlockIndex.java     |   5 +-
 .../io/hfile/TestHFileDataBlockEncoder.java     |   5 +-
 .../hbase/io/hfile/TestHFileEncryption.java     |   5 +-
 .../TestHFileInlineToRootChunkConversion.java   |   5 +-
 .../hbase/io/hfile/TestHFilePerformance.java    |   1 -
 .../hadoop/hbase/io/hfile/TestHFileSeek.java    |   5 +-
 .../hbase/io/hfile/TestHFileWriterV2.java       |   5 +-
 .../hbase/io/hfile/TestHFileWriterV3.java       |   5 +-
 .../hfile/TestLazyDataBlockDecompression.java   |   5 +-
 .../hbase/io/hfile/TestLruBlockCache.java       |   5 +-
 .../hbase/io/hfile/TestLruCachedBlock.java      |   5 +-
 .../hadoop/hbase/io/hfile/TestPrefetch.java     |   5 +-
 .../hadoop/hbase/io/hfile/TestReseekTo.java     |   5 +-
 .../TestScannerSelectionUsingKeyRange.java      |   5 +-
 .../io/hfile/TestScannerSelectionUsingTTL.java  |   6 +-
 .../hadoop/hbase/io/hfile/TestSeekTo.java       |   5 +-
 .../hbase/io/hfile/bucket/TestBucketCache.java  |   5 +-
 .../io/hfile/bucket/TestBucketWriterThread.java |   5 +-
 .../io/hfile/bucket/TestByteBufferIOEngine.java |   5 +-
 .../hbase/io/hfile/bucket/TestFileIOEngine.java |   6 +-
 .../hadoop/hbase/ipc/TestBufferChain.java       |   5 +-
 .../apache/hadoop/hbase/ipc/TestCallRunner.java |   5 +-
 .../apache/hadoop/hbase/ipc/TestDelayedRpc.java |   5 +-
 .../hadoop/hbase/ipc/TestHBaseClient.java       |   7 +-
 .../org/apache/hadoop/hbase/ipc/TestIPC.java    |   5 +-
 .../hadoop/hbase/ipc/TestProtoBufRpc.java       |   5 +-
 .../apache/hadoop/hbase/ipc/TestRpcMetrics.java |   5 +-
 .../hbase/ipc/TestSimpleRpcScheduler.java       |   5 +-
 .../apache/hadoop/hbase/mapred/TestDriver.java  |   5 +-
 .../hbase/mapred/TestGroupingTableMap.java      |   5 +-
 .../hbase/mapred/TestIdentityTableMap.java      |   5 +-
 .../hadoop/hbase/mapred/TestRowCounter.java     |   5 +-
 .../hadoop/hbase/mapred/TestSplitTable.java     |   5 +-
 .../hbase/mapred/TestTableInputFormat.java      |   4 +-
 .../hadoop/hbase/mapred/TestTableMapReduce.java |   5 +-
 .../hbase/mapred/TestTableMapReduceUtil.java    |   5 +-
 .../mapred/TestTableSnapshotInputFormat.java    |   5 +-
 .../hadoop/hbase/mapreduce/TestCellCounter.java |   5 +-
 .../hadoop/hbase/mapreduce/TestCopyTable.java   |   5 +-
 .../mapreduce/TestGroupingTableMapper.java      |   5 +-
 .../hbase/mapreduce/TestHFileOutputFormat.java  |   5 +-
 .../hbase/mapreduce/TestHFileOutputFormat2.java |   5 +-
 .../hbase/mapreduce/TestHLogRecordReader.java   |   5 +-
 .../hbase/mapreduce/TestHRegionPartitioner.java |   5 +-
 .../hbase/mapreduce/TestImportExport.java       |   5 +-
 .../TestImportTSVWithOperationAttributes.java   |   5 +-
 .../TestImportTSVWithVisibilityLabels.java      |   5 +-
 .../hadoop/hbase/mapreduce/TestImportTsv.java   |   5 +-
 .../hbase/mapreduce/TestImportTsvParser.java    |   5 +-
 .../mapreduce/TestLoadIncrementalHFiles.java    |   5 +-
 .../TestLoadIncrementalHFilesSplitRecovery.java |   5 +-
 .../mapreduce/TestMultiTableInputFormat.java    |   5 +-
 .../mapreduce/TestMultithreadedTableMapper.java |   4 +-
 .../hadoop/hbase/mapreduce/TestRowCounter.java  |   5 +-
 .../TestSecureLoadIncrementalHFiles.java        |   5 +-
 ...ecureLoadIncrementalHFilesSplitRecovery.java |   5 +-
 .../TestSimpleTotalOrderPartitioner.java        |   4 +-
 .../mapreduce/TestTableInputFormatScan1.java    |   5 +-
 .../mapreduce/TestTableInputFormatScan2.java    |   5 +-
 .../hbase/mapreduce/TestTableMapReduce.java     |  18 +-
 .../hbase/mapreduce/TestTableMapReduceUtil.java |   5 +-
 .../mapreduce/TestTableSnapshotInputFormat.java |   5 +-
 .../hadoop/hbase/mapreduce/TestTableSplit.java  |   5 +-
 .../hbase/mapreduce/TestTimeRangeMapRed.java    |   4 +-
 .../hadoop/hbase/mapreduce/TestWALPlayer.java   |   7 +-
 .../mapreduce/hadoopbackport/TestJarFinder.java |   5 +-
 .../hbase/master/TestActiveMasterManager.java   |   5 +-
 .../hbase/master/TestAssignmentListener.java    |   5 +-
 .../master/TestAssignmentManagerOnCluster.java  |   5 +-
 .../hadoop/hbase/master/TestCatalogJanitor.java |   5 +-
 .../hbase/master/TestClockSkewDetection.java    |   4 +-
 .../master/TestClusterStatusPublisher.java      |   5 +-
 .../hadoop/hbase/master/TestDeadServer.java     |   5 +-
 .../master/TestDistributedLogSplitting.java     |   5 +-
 .../hbase/master/TestHMasterCommandLine.java    |   5 +-
 .../hbase/master/TestHMasterRPCException.java   |   4 +-
 .../apache/hadoop/hbase/master/TestMaster.java  |   5 +-
 .../hadoop/hbase/master/TestMasterFailover.java |   5 +-
 .../TestMasterFailoverBalancerPersistence.java  |   5 +-
 .../hbase/master/TestMasterFileSystem.java      |   5 +-
 .../hadoop/hbase/master/TestMasterMetrics.java  |   5 +-
 .../hbase/master/TestMasterMetricsWrapper.java  |   7 +-
 .../hbase/master/TestMasterNoCluster.java       |   5 +-
 .../TestMasterOperationsForRegionReplicas.java  |   5 +-
 .../TestMasterRestartAfterDisablingTable.java   |   5 +-
 .../hadoop/hbase/master/TestMasterShutdown.java |   5 +-
 .../hbase/master/TestMasterStatusServlet.java   |   4 +-
 .../hbase/master/TestMasterTransitions.java     |   5 +-
 .../hbase/master/TestRegionPlacement.java       |   6 +-
 .../hadoop/hbase/master/TestRegionPlan.java     |   5 +-
 .../hadoop/hbase/master/TestRegionState.java    |   7 +-
 .../hadoop/hbase/master/TestRestartCluster.java |   5 +-
 .../hadoop/hbase/master/TestRollingRestart.java |   5 +-
 .../hbase/master/TestSplitLogManager.java       |   5 +-
 .../hbase/master/TestTableLockManager.java      |   5 +-
 .../master/balancer/TestBaseLoadBalancer.java   |   5 +-
 .../balancer/TestDefaultLoadBalancer.java       |   5 +-
 .../TestFavoredNodeAssignmentHelper.java        |   5 +-
 .../master/balancer/TestServerAndLoad.java      |   5 +-
 .../balancer/TestStochasticLoadBalancer.java    |   5 +-
 .../hbase/master/cleaner/TestCleanerChore.java  |   5 +-
 .../hbase/master/cleaner/TestHFileCleaner.java  |   5 +-
 .../master/cleaner/TestHFileLinkCleaner.java    |   5 +-
 .../hbase/master/cleaner/TestLogsCleaner.java   |   4 +-
 .../master/cleaner/TestSnapshotFromMaster.java  |   6 +-
 .../master/handler/TestCreateTableHandler.java  |   5 +-
 .../handler/TestTableDeleteFamilyHandler.java   |   6 +-
 .../TestTableDescriptorModification.java        |   6 +-
 .../master/snapshot/TestSnapshotFileCache.java  |   5 +-
 .../snapshot/TestSnapshotHFileCleaner.java      |   5 +-
 .../master/snapshot/TestSnapshotLogCleaner.java |   5 +-
 .../master/snapshot/TestSnapshotManager.java    |   5 +-
 .../hbase/metrics/TestMetricsHistogram.java     |   5 +-
 .../TestMemoryBoundedLogMessageBuffer.java      |   5 +-
 .../hbase/monitoring/TestTaskMonitor.java       |   5 +-
 .../hadoop/hbase/procedure/TestProcedure.java   |   5 +-
 .../procedure/TestProcedureCoordinator.java     |   5 +-
 .../hbase/procedure/TestProcedureManager.java   |   5 +-
 .../hbase/procedure/TestProcedureMember.java    |   6 +-
 .../hadoop/hbase/procedure/TestZKProcedure.java |   5 +-
 .../procedure/TestZKProcedureControllers.java   |   5 +-
 .../hadoop/hbase/protobuf/TestProtobufUtil.java |   6 +-
 .../hbase/protobuf/TestReplicationProtobuf.java |   5 +-
 .../hbase/regionserver/TestAtomicOperation.java |   5 +-
 .../hbase/regionserver/TestBlocksRead.java      |   5 +-
 .../hbase/regionserver/TestBlocksScanned.java   |   5 +-
 .../regionserver/TestCacheOnWriteInSchema.java  |   5 +-
 .../hbase/regionserver/TestClusterId.java       |   5 +-
 .../hbase/regionserver/TestColumnSeeking.java   |   4 +-
 .../hbase/regionserver/TestCompaction.java      |   5 +-
 .../hbase/regionserver/TestCompactionState.java |   5 +-
 .../TestCompactionWithCoprocessor.java          |   5 +-
 .../regionserver/TestCompoundBloomFilter.java   |   5 +-
 .../TestDefaultCompactSelection.java            |   5 +-
 .../hbase/regionserver/TestDefaultMemStore.java |   5 +-
 .../regionserver/TestDefaultStoreEngine.java    |   5 +-
 .../regionserver/TestEncryptionKeyRotation.java |   5 +-
 .../TestEncryptionRandomKeying.java             |   5 +-
 .../TestEndToEndSplitTransaction.java           |   5 +-
 .../regionserver/TestExplicitColumnTracker.java |   4 +-
 .../hbase/regionserver/TestFSErrorsExposed.java |   5 +-
 .../regionserver/TestFlushRegionEntry.java      |   5 +-
 .../regionserver/TestGetClosestAtOrBefore.java  |   5 +-
 .../hadoop/hbase/regionserver/TestHRegion.java  |   5 +-
 .../regionserver/TestHRegionFileSystem.java     |   5 +-
 .../hbase/regionserver/TestHRegionInfo.java     |   5 +-
 .../regionserver/TestHRegionOnCluster.java      |   5 +-
 .../regionserver/TestHRegionServerBulkLoad.java |   5 +-
 .../regionserver/TestHeapMemoryManager.java     |   5 +-
 .../hbase/regionserver/TestJoinedScanners.java  |   6 +-
 .../hbase/regionserver/TestKeepDeletes.java     |   6 +-
 .../hbase/regionserver/TestKeyValueHeap.java    |   5 +-
 .../regionserver/TestKeyValueScanFixture.java   |   5 +-
 .../regionserver/TestKeyValueSkipListSet.java   |   5 +-
 .../hbase/regionserver/TestMajorCompaction.java |   5 +-
 .../regionserver/TestMasterAddressTracker.java  |   4 +-
 .../regionserver/TestMemStoreChunkPool.java     |   5 +-
 .../hbase/regionserver/TestMemStoreLAB.java     |   5 +-
 .../hbase/regionserver/TestMetricsRegion.java   |   5 +-
 .../regionserver/TestMetricsRegionServer.java   |   5 +-
 .../hbase/regionserver/TestMinVersions.java     |   5 +-
 .../TestMiniBatchOperationInProgress.java       |   5 +-
 .../hbase/regionserver/TestMinorCompaction.java |   5 +-
 .../regionserver/TestMultiColumnScanner.java    |   5 +-
 .../TestMultiVersionConsistencyControl.java     |   5 +-
 .../hbase/regionserver/TestParallelPut.java     |   5 +-
 .../hbase/regionserver/TestPriorityRpc.java     |   5 +-
 .../hbase/regionserver/TestQosFunction.java     |   5 +-
 .../hbase/regionserver/TestQueryMatcher.java    |   5 +-
 .../TestRSKilledWhenInitializing.java           |   7 +-
 .../hbase/regionserver/TestRSStatusServlet.java |   5 +-
 .../regionserver/TestRegionFavoredNodes.java    |   5 +-
 .../TestRegionMergeTransaction.java             |   5 +-
 .../TestRegionMergeTransactionOnCluster.java    |   5 +-
 .../hbase/regionserver/TestRegionReplicas.java  |   5 +-
 .../regionserver/TestRegionServerMetrics.java   |   4 +-
 .../regionserver/TestRegionServerNoMaster.java  |   6 +-
 .../regionserver/TestRegionSplitPolicy.java     |   5 +-
 .../regionserver/TestResettingCounters.java     |   4 +-
 .../regionserver/TestReversibleScanners.java    |   5 +-
 .../hbase/regionserver/TestRowTooBig.java       |   4 +-
 .../regionserver/TestSCVFWithMiniCluster.java   |   5 +-
 .../regionserver/TestScanDeleteTracker.java     |   6 +-
 .../TestScanWildcardColumnTracker.java          |   4 +-
 .../regionserver/TestScanWithBloomError.java    |   5 +-
 .../hadoop/hbase/regionserver/TestScanner.java  |   7 +-
 .../regionserver/TestScannerWithBulkload.java   |   5 +-
 .../regionserver/TestSeekOptimizations.java     |   5 +-
 .../regionserver/TestServerCustomProtocol.java  |   5 +-
 .../regionserver/TestServerNonceManager.java    |   5 +-
 .../hbase/regionserver/TestSplitLogWorker.java  |   5 +-
 .../regionserver/TestSplitTransaction.java      |   6 +-
 .../TestSplitTransactionOnCluster.java          |   5 +-
 .../hadoop/hbase/regionserver/TestStore.java    |   5 +-
 .../hbase/regionserver/TestStoreFile.java       |   5 +-
 .../hbase/regionserver/TestStoreFileInfo.java   |  41 +--
 .../TestStoreFileRefresherChore.java            |   5 +-
 .../TestStoreFileScannerWithTagCompression.java |   5 +-
 .../hbase/regionserver/TestStoreScanner.java    |   5 +-
 .../hbase/regionserver/TestStripeCompactor.java |   9 +-
 .../regionserver/TestStripeStoreEngine.java     |   5 +-
 .../TestStripeStoreFileManager.java             |   6 +-
 .../hadoop/hbase/regionserver/TestTags.java     |   5 +-
 .../hbase/regionserver/TestWideScanner.java     |   5 +-
 .../compactions/PerfTestCompactionPolicies.java |   5 +-
 .../compactions/TestOffPeakHours.java           |   5 +-
 .../compactions/TestStripeCompactionPolicy.java |   5 +-
 .../hbase/regionserver/wal/TestCompressor.java  |   5 +-
 .../wal/TestCustomWALCellCodec.java             |   6 +-
 .../hbase/regionserver/wal/TestDurability.java  |   5 +-
 .../hadoop/hbase/regionserver/wal/TestHLog.java |   6 +-
 .../regionserver/wal/TestHLogFiltering.java     |   5 +-
 .../hbase/regionserver/wal/TestHLogMethods.java |   4 +-
 .../wal/TestHLogReaderOnSecureHLog.java         |   5 +-
 .../hbase/regionserver/wal/TestHLogSplit.java   |  15 +-
 .../wal/TestHLogSplitCompressed.java            |   5 +-
 .../wal/TestKeyValueCompression.java            |   5 +-
 .../regionserver/wal/TestLogRollAbort.java      |   6 +-
 .../regionserver/wal/TestLogRollPeriod.java     |   5 +-
 .../hbase/regionserver/wal/TestLogRolling.java  |   5 +-
 .../wal/TestLogRollingNoCluster.java            |   5 +-
 .../wal/TestReadOldRootAndMetaEdits.java        |   5 +-
 .../hbase/regionserver/wal/TestSecureHLog.java  |   5 +-
 .../regionserver/wal/TestSecureWALReplay.java   |   5 +-
 .../wal/TestWALActionsListener.java             |   4 +-
 .../wal/TestWALCellCodecWithCompression.java    |   5 +-
 .../hbase/regionserver/wal/TestWALReplay.java   |   5 +-
 .../wal/TestWALReplayCompressed.java            |   5 +-
 .../replication/TestMasterReplication.java      |   5 +-
 .../replication/TestMultiSlaveReplication.java  |   4 +-
 .../replication/TestPerTableCFReplication.java  |   4 +-
 ...estReplicationChangingPeerRegionservers.java |   6 +-
 .../TestReplicationDisableInactivePeer.java     |   5 +-
 .../replication/TestReplicationEndpoint.java    |   5 +-
 .../TestReplicationKillMasterRS.java            |   5 +-
 .../TestReplicationKillMasterRSCompressed.java  |   5 +-
 .../replication/TestReplicationKillRS.java      |   6 +-
 .../replication/TestReplicationKillSlaveRS.java |   6 +-
 .../replication/TestReplicationSmallTests.java  |   5 +-
 .../replication/TestReplicationSource.java      |   5 +-
 .../replication/TestReplicationStateZKImpl.java |   6 +-
 .../replication/TestReplicationSyncUpTool.java  |   4 +-
 .../TestReplicationTrackerZKImpl.java           |   6 +-
 .../TestReplicationWALEntryFilters.java         |   5 +-
 .../replication/TestReplicationWithTags.java    |   5 +-
 .../TestRegionReplicaReplicationEndpoint.java   |   6 +-
 ...egionReplicaReplicationEndpointNoMaster.java |   6 +-
 .../TestReplicationHLogReaderManager.java       |   7 +-
 .../regionserver/TestReplicationSink.java       |   5 +-
 .../TestReplicationSinkManager.java             |   5 +-
 .../TestReplicationSourceManager.java           |   5 +-
 .../regionserver/TestReplicationThrottler.java  |   6 +-
 .../apache/hadoop/hbase/rest/TestDeleteRow.java |   8 +-
 .../hbase/rest/TestGZIPResponseWrapper.java     |   5 +-
 .../hbase/rest/TestGetAndPutResource.java       |   8 +-
 .../hadoop/hbase/rest/TestGzipFilter.java       |   6 +-
 .../hadoop/hbase/rest/TestMultiRowResource.java |   7 +-
 .../hadoop/hbase/rest/TestResourceFilter.java   |   5 +-
 .../hadoop/hbase/rest/TestScannerResource.java  |   4 +-
 .../hbase/rest/TestScannersWithFilters.java     |   4 +-
 .../hbase/rest/TestScannersWithLabels.java      |   8 +-
 .../hadoop/hbase/rest/TestSchemaResource.java   |   7 +-
 .../hadoop/hbase/rest/TestStatusResource.java   |   6 +-
 .../hadoop/hbase/rest/TestTableResource.java    |   4 +-
 .../apache/hadoop/hbase/rest/TestTableScan.java |   6 +-
 .../hadoop/hbase/rest/TestVersionResource.java  |   6 +-
 .../rest/client/TestRemoteAdminRetries.java     |   5 +-
 .../rest/client/TestRemoteHTableRetries.java    |   5 +-
 .../hbase/rest/client/TestRemoteTable.java      |   6 +-
 .../hadoop/hbase/rest/model/TestCellModel.java  |  15 +-
 .../hbase/rest/model/TestCellSetModel.java      |  13 +-
 .../hbase/rest/model/TestColumnSchemaModel.java |  14 +-
 .../hadoop/hbase/rest/model/TestModelBase.java  |   5 +-
 .../hadoop/hbase/rest/model/TestRowModel.java   |   9 +-
 .../hbase/rest/model/TestScannerModel.java      |   5 +-
 .../model/TestStorageClusterStatusModel.java    |   6 +-
 .../model/TestStorageClusterVersionModel.java   |  12 +-
 .../hbase/rest/model/TestTableInfoModel.java    |  13 +-
 .../hbase/rest/model/TestTableListModel.java    |  13 +-
 .../hbase/rest/model/TestTableRegionModel.java  |  11 +-
 .../hbase/rest/model/TestTableSchemaModel.java  |  13 +-
 .../hbase/rest/model/TestVersionModel.java      |  15 +-
 .../hbase/security/TestHBaseSaslRpcClient.java  |   5 +-
 .../hadoop/hbase/security/TestSecureRPC.java    |   5 +-
 .../apache/hadoop/hbase/security/TestUser.java  |   5 +-
 .../TestUsersOperationsWithSecureHadoop.java    |   5 +-
 .../access/TestAccessControlFilter.java         |   5 +-
 .../security/access/TestAccessController.java   |   6 +-
 .../security/access/TestAccessController2.java  |   5 +-
 .../access/TestCellACLWithMultipleVersions.java |   5 +-
 .../hbase/security/access/TestCellACLs.java     |   5 +-
 .../security/access/TestNamespaceCommands.java  |   5 +-
 .../access/TestScanEarlyTermination.java        |   5 +-
 .../security/access/TestTablePermissions.java   |   6 +-
 .../access/TestZKPermissionsWatcher.java        |   6 +-
 .../security/token/TestAuthenticationKey.java   |   5 +-
 .../security/token/TestTokenAuthentication.java |   6 +-
 .../security/token/TestZKSecretWatcher.java     |   5 +-
 .../TestEnforcingScanLabelGenerator.java        |   5 +-
 .../visibility/TestExpressionExpander.java      |   5 +-
 .../visibility/TestExpressionParser.java        |   5 +-
 ...sibilityLabelsOpWithDifferentUsersNoACL.java |   5 +-
 .../visibility/TestVisibilityLabelsWithACL.java |   5 +-
 ...VisibilityLabelsWithCustomVisLabService.java |   5 +-
 ...ibilityLabelsWithDefaultVisLabelService.java |   5 +-
 .../TestVisibilityLabelsWithDeletes.java        |   5 +-
 ...isibilityLabelsWithDistributedLogReplay.java |   5 +-
 .../TestVisibilityLabelsWithSLGStack.java       |   5 +-
 .../TestVisibilityWithCheckAuths.java           |   5 +-
 .../hbase/snapshot/TestExportSnapshot.java      |   6 +-
 .../snapshot/TestFlushSnapshotFromClient.java   |  10 +-
 .../TestRestoreFlushSnapshotFromClient.java     |   6 +-
 .../snapshot/TestRestoreSnapshotHelper.java     |   5 +-
 .../snapshot/TestSecureExportSnapshot.java      |   5 +-
 .../snapshot/TestSnapshotDescriptionUtils.java  |   6 +-
 .../hadoop/hbase/trace/TestHTraceHooks.java     |   5 +-
 .../util/ProcessBasedLocalHBaseCluster.java     |   5 +-
 .../util/TestBoundedPriorityBlockingQueue.java  |   5 +-
 .../hadoop/hbase/util/TestByteBloomFilter.java  |   5 +-
 .../hadoop/hbase/util/TestByteBufferUtils.java  |   5 +-
 .../hadoop/hbase/util/TestCompressionTest.java  |   5 +-
 .../hbase/util/TestCoprocessorScanPolicy.java   |   5 +-
 .../hbase/util/TestDefaultEnvironmentEdge.java  |   5 +-
 .../hadoop/hbase/util/TestFSHDFSUtils.java      |   5 +-
 .../hbase/util/TestFSTableDescriptors.java      |   6 +-
 .../apache/hadoop/hbase/util/TestFSUtils.java   |   5 +-
 .../apache/hadoop/hbase/util/TestFSVisitor.java |   9 +-
 .../apache/hadoop/hbase/util/TestHBaseFsck.java |   5 +-
 .../hbase/util/TestHBaseFsckComparator.java     |   5 +-
 .../hbase/util/TestHBaseFsckEncryption.java     |   5 +-
 .../hadoop/hbase/util/TestHFileArchiveUtil.java |   5 +-
 .../apache/hadoop/hbase/util/TestIdLock.java    |   5 +-
 .../util/TestIncrementingEnvironmentEdge.java   |   5 +-
 .../hadoop/hbase/util/TestMergeTable.java       |   4 +-
 .../apache/hadoop/hbase/util/TestMergeTool.java |   6 +-
 .../hbase/util/TestMiniClusterLoadEncoded.java  |   5 +-
 .../hbase/util/TestMiniClusterLoadParallel.java |   5 +-
 .../util/TestMiniClusterLoadSequential.java     |   5 +-
 .../apache/hadoop/hbase/util/TestPoolMap.java   |  12 +-
 .../hbase/util/TestProcessBasedCluster.java     |   5 +-
 .../hbase/util/TestRegionSizeCalculator.java    |   5 +-
 .../hbase/util/TestRegionSplitCalculator.java   |   5 +-
 .../hadoop/hbase/util/TestRegionSplitter.java   |   5 +-
 .../apache/hadoop/hbase/util/TestRootPath.java  |   5 +-
 .../hbase/util/TestSortedCopyOnWriteSet.java    |   6 +-
 .../apache/hadoop/hbase/util/TestTableName.java |   6 +-
 .../util/hbck/OfflineMetaRebuildTestCore.java   |   5 +-
 .../util/hbck/TestOfflineMetaRebuildBase.java   |   5 +-
 .../util/hbck/TestOfflineMetaRebuildHole.java   |   5 +-
 .../hbck/TestOfflineMetaRebuildOverlap.java     |   5 +-
 .../hadoop/hbase/zookeeper/TestHQuorumPeer.java |   4 +-
 .../zookeeper/TestRecoverableZooKeeper.java     |   5 +-
 .../hadoop/hbase/zookeeper/TestZKConfig.java    |   5 +-
 .../hbase/zookeeper/TestZKLeaderManager.java    |   4 +-
 .../hadoop/hbase/zookeeper/TestZKMulti.java     |   5 +-
 .../zookeeper/TestZKTableStateManager.java      |   5 +-
 .../hbase/zookeeper/TestZooKeeperACL.java       |   6 +-
 .../zookeeper/TestZooKeeperMainServer.java      |   4 +-
 .../zookeeper/TestZooKeeperNodeTracker.java     |   4 +-
 .../lock/TestZKInterProcessReadWriteLock.java   |   5 +-
 .../apache/hadoop/hbase/client/TestShell.java   |   6 +-
 .../hadoop/hbase/thrift/TestCallQueue.java      |   8 +-
 .../hadoop/hbase/thrift/TestThriftServer.java   |   5 +-
 .../hbase/thrift/TestThriftServerCmdLine.java   |   5 +-
 .../hadoop/hbase/thrift2/TestHTablePool.java    |  12 +-
 .../thrift2/TestThriftHBaseServiceHandler.java  |   5 +-
 ...TestThriftHBaseServiceHandlerWithLabels.java |   5 +-
 pom.xml                                         | 270 ++++++++++++++++++-
 648 files changed, 2858 insertions(+), 1608 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-client/src/test/java/org/apache/hadoop/hbase/TestRegionLocations.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestRegionLocations.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestRegionLocations.java
index 8d833c3..7331b4d 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestRegionLocations.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestRegionLocations.java
@@ -23,10 +23,12 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import org.apache.hadoop.hbase.testclassification.ClientTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(SmallTests.class)
+@Category({ClientTests.class, SmallTests.class})
 public class TestRegionLocations {
 
   ServerName sn0 = ServerName.valueOf("host0", 10, 10);

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java
index a0d80c6..7132b8d 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java
@@ -27,7 +27,8 @@ import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.HRegionLocation;
-import org.apache.hadoop.hbase.MediumTests;
+import org.apache.hadoop.hbase.testclassification.ClientTests;
+import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.client.AsyncProcess.AsyncRequestFuture;
 import org.apache.hadoop.hbase.client.coprocessor.Batch;
@@ -62,7 +63,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-@Category(MediumTests.class)
+@Category({ClientTests.class, MediumTests.class})
 public class TestAsyncProcess {
   private static final TableName DUMMY_TABLE =
       TableName.valueOf("DUMMY_TABLE");

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAttributes.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAttributes.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAttributes.java
index ef8f022..6656a83 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAttributes.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAttributes.java
@@ -21,13 +21,14 @@ package org.apache.hadoop.hbase.client;
 
 import java.util.Arrays;
 
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.ClientTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(SmallTests.class)
+@Category({ClientTests.class, SmallTests.class})
 public class TestAttributes {
   private static final byte [] ROW = new byte [] {'r'};
   @Test

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java
index df5e693..58b4604 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java
@@ -47,7 +47,8 @@ import org.apache.hadoop.hbase.RegionLocations;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.RegionTooBusyException;
 import org.apache.hadoop.hbase.ServerName;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.ClientTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.protobuf.generated.CellProtos;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;
@@ -91,7 +92,7 @@ import com.google.protobuf.ServiceException;
  * Test client behavior w/o setting up a cluster.
  * Mock up cluster emissions.
  */
-@Category(SmallTests.class)
+@Category({ClientTests.class, SmallTests.class})
 public class TestClientNoCluster extends Configured implements Tool {
   private static final Log LOG = LogFactory.getLog(TestClientNoCluster.class);
   private Configuration conf;

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestDeleteTimeStamp.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestDeleteTimeStamp.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestDeleteTimeStamp.java
index ab09146..e3582c1 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestDeleteTimeStamp.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestDeleteTimeStamp.java
@@ -16,13 +16,14 @@ import java.util.Map.Entry;
 import java.util.NavigableMap;
 
 import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.ClientTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(SmallTests.class)
+@Category({ClientTests.class, SmallTests.class})
 public class TestDeleteTimeStamp {
   private static final byte[] ROW = Bytes.toBytes("testRow");
   private static final byte[] FAMILY = Bytes.toBytes("testFamily");

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
index f11633d..1617b3a 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
@@ -33,8 +33,9 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.testclassification.ClientTests;
 import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
 import org.apache.hadoop.hbase.filter.Filter;
 import org.apache.hadoop.hbase.filter.FilterList;
@@ -48,7 +49,7 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 // TODO: cover more test cases
-@Category(SmallTests.class)
+@Category({ClientTests.class, SmallTests.class})
 public class TestGet {
   private static final byte [] ROW = new byte [] {'r'};
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestIncrement.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestIncrement.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestIncrement.java
index 19ff867..4b9f113 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestIncrement.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestIncrement.java
@@ -22,11 +22,12 @@ import static org.junit.Assert.assertEquals;
 import java.util.Map;
 import java.util.NavigableMap;
 
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.ClientTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-@Category(SmallTests.class)
+@Category({ClientTests.class, SmallTests.class})
 public class TestIncrement {
   @Test
   public void test() {

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java
index bec74f5..d85cffc 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java
@@ -24,9 +24,10 @@ import static org.junit.Assert.assertTrue;
 
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.testclassification.ClientTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.SmallTests;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -72,7 +73,7 @@ import org.junit.experimental.categories.Category;
  * Run tests that use the functionality of the Operation superclass for
  * Puts, Gets, Deletes, Scans, and MultiPuts.
  */
-@Category(SmallTests.class)
+@Category({ClientTests.class, SmallTests.class})
 public class TestOperation {
   private static byte [] ROW = Bytes.toBytes("testRow");
   private static byte [] FAMILY = Bytes.toBytes("testFamily");

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestPutDotHas.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestPutDotHas.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestPutDotHas.java
index 49cfcdc..c269e62 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestPutDotHas.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestPutDotHas.java
@@ -17,14 +17,15 @@
  */
 package org.apache.hadoop.hbase.client;
 
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.ClientTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(SmallTests.class)
+@Category({ClientTests.class, SmallTests.class})
 /**
  * Addresses HBASE-6047
  * We test put.has call with all of its polymorphic magic

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
index 10da121..f358bf7 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
@@ -25,7 +25,8 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.Set;
 
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.ClientTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;
 import org.apache.hadoop.hbase.security.visibility.Authorizations;
@@ -35,7 +36,7 @@ import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 // TODO: cover more test cases
-@Category(SmallTests.class)
+@Category({ClientTests.class, SmallTests.class})
 public class TestScan {
   @Test
   public void testAttributesSerialization() throws IOException {

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromAdmin.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromAdmin.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromAdmin.java
index 572128a..f0ed3c1 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromAdmin.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromAdmin.java
@@ -25,9 +25,10 @@ import java.io.IOException;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.testclassification.ClientTests;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
 import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsSnapshotDoneRequest;
@@ -43,7 +44,7 @@ import com.google.protobuf.RpcController;
 /**
  * Test snapshot logic from the client
  */
-@Category(SmallTests.class)
+@Category({SmallTests.class, ClientTests.class})
 public class TestSnapshotFromAdmin {
 
   private static final Log LOG = LogFactory.getLog(TestSnapshotFromAdmin.class);

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java
index 4544086..92d67b1 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java
@@ -31,9 +31,10 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellScanner;
 import org.apache.hadoop.hbase.CellUtil;
+import org.apache.hadoop.hbase.testclassification.ClientTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.SmallTests;
 import org.apache.hadoop.hbase.codec.Codec;
 import org.apache.hadoop.hbase.codec.KeyValueCodec;
 import org.apache.hadoop.hbase.io.SizedCellScanner;
@@ -47,7 +48,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(SmallTests.class) 
+@Category({ClientTests.class, SmallTests.class})
 public class TestIPCUtil {
 
   public static final Log LOG = LogFactory.getLog(IPCUtil.class);

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestPayloadCarryingRpcController.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestPayloadCarryingRpcController.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestPayloadCarryingRpcController.java
index fa185c0..e6d6f43 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestPayloadCarryingRpcController.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestPayloadCarryingRpcController.java
@@ -28,13 +28,14 @@ import java.util.List;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellScannable;
 import org.apache.hadoop.hbase.CellScanner;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.ClientTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 
-@Category(SmallTests.class)
+@Category({ClientTests.class, SmallTests.class})
 public class TestPayloadCarryingRpcController {
   @Test
   public void testListOfCellScannerables() throws IOException {

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestEncryptionUtil.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestEncryptionUtil.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestEncryptionUtil.java
index 2d6b43f..298344f 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestEncryptionUtil.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestEncryptionUtil.java
@@ -26,17 +26,17 @@ import java.security.SecureRandom;
 import javax.crypto.spec.SecretKeySpec;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.testclassification.ClientTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.SmallTests;
 import org.apache.hadoop.hbase.io.crypto.KeyProviderForTesting;
 import org.apache.hadoop.hbase.io.crypto.aes.AES;
-import org.apache.hadoop.hbase.security.EncryptionUtil;
 import org.apache.hadoop.hbase.util.Bytes;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(SmallTests.class)
+@Category({ClientTests.class, SmallTests.class})
 public class TestEncryptionUtil {
 
   @Test

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/IntegrationTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/IntegrationTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/IntegrationTests.java
deleted file mode 100644
index d429e24..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/IntegrationTests.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * 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;
-
-/**
- * Tag a test as 'integration/system' test, meaning that the test class has the following
- * characteristics: <ul>
- *  <li> Possibly takes hours to complete</li>
- *  <li> Can be run on a mini cluster or an actual cluster</li>
- *  <li> Can make changes to the given cluster (starting stopping daemons, etc)</li>
- *  <li> Should not be run in parallel of other integration tests</li>
- * </ul>
- *
- * Integration / System tests should have a class name starting with "IntegrationTest", and
- * should be annotated with @Category(IntegrationTests.class). Integration tests can be run
- * using the IntegrationTestsDriver class or from mvn verify.
- *
- * @see SmallTests
- * @see MediumTests
- * @see LargeTests
- */
-public interface IntegrationTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/LargeTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/LargeTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/LargeTests.java
deleted file mode 100644
index 958ffd7..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/LargeTests.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *
- * 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;
-
-/**
- * Tag a test as 'large', meaning that the test class has the following
- * characteristics:
- *  - executed in an isolated JVM. Tests can however be executed in different
- *    JVM on the same machine simultaneously.
- *  - will not have to be executed by the developer before submitting a bug
- *  - ideally, last less than 2 minutes to help parallelization
- *
- *  It the worst case compared to small or medium, use it only for tests that
- *    you cannot put in the other categories
- *
- * @see SmallTests
- * @see MediumTests
- * @see IntegrationTests
- */
-public interface LargeTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/MediumTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/MediumTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/MediumTests.java
deleted file mode 100644
index a51a2c9..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/MediumTests.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- *
- * 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;
-
-/**
- * Tag a test as 'Medium', meaning that the test class has the following
- * characteristics:
- *  - executed in an isolated JVM. Tests can however be executed in different
- *    JVM on the same machine simultaneously.
- *  - will have to be executed by the developer before submitting a bug
- *  - ideally, last less than 1 minutes to help parallelization
- *
- *  Use it for tests that cannot be tagged as 'Small'.
- *
- * @see SmallTests
- * @see LargeTests
- * @see IntegrationTests
- */
-public interface MediumTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/SmallTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/SmallTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/SmallTests.java
deleted file mode 100644
index 6953667..0000000
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/SmallTests.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *
- * 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;
-
-/**
- * Tag a test as 'small', meaning that the test class has the following
- * characteristics:
- *  - can be run simultaneously with other small tests in the same JVM
- *  - ideally, last less than 15 seconds
- *  - does not use a cluster
- *
- * @see MediumTests
- * @see LargeTests
- * @see IntegrationTests
- */
-public interface SmallTests {
-}

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellComparator.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellComparator.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellComparator.java
index 39e788a..2b80a54 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellComparator.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellComparator.java
@@ -20,10 +20,12 @@ package org.apache.hadoop.hbase;
 import static org.junit.Assert.assertTrue;
 
 import org.apache.hadoop.hbase.KeyValue.Type;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-@Category(SmallTests.class)
+@Category({MiscTests.class, SmallTests.class})
 public class TestCellComparator {
 
   byte[] row1 = Bytes.toBytes("row1");

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellUtil.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellUtil.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellUtil.java
index 50063f4..133fa03 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellUtil.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellUtil.java
@@ -24,12 +24,14 @@ import java.util.List;
 import java.util.NavigableMap;
 import java.util.TreeMap;
 
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(SmallTests.class)
+@Category({MiscTests.class, SmallTests.class})
 public class TestCellUtil {
   /**
    * CellScannable used in test. Returns a {@link TestCellScanner}

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/TestClassFinder.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestClassFinder.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestClassFinder.java
index 261fc1e..bcdcd9b 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestClassFinder.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestClassFinder.java
@@ -44,12 +44,14 @@ import javax.tools.ToolProvider;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(SmallTests.class)
+@Category({MiscTests.class, SmallTests.class})
 public class TestClassFinder {
   private static final Log LOG = LogFactory.getLog(TestClassFinder.class);
   private static final HBaseCommonTestingUtility testUtil = new HBaseCommonTestingUtility();

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCompoundConfiguration.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCompoundConfiguration.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCompoundConfiguration.java
index 148dd9c..65607a4 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCompoundConfiguration.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestCompoundConfiguration.java
@@ -26,11 +26,13 @@ import junit.framework.TestCase;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(SmallTests.class)
+@Category({MiscTests.class, SmallTests.class})
 public class TestCompoundConfiguration extends TestCase {
   private Configuration baseConf;
   private int baseConfSize;

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java
index 60fa3b3..90e9e19 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java
@@ -29,10 +29,12 @@ import java.util.List;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(SmallTests.class)
+@Category({MiscTests.class, SmallTests.class})
 public class TestHBaseConfiguration {
 
   private static final Log LOG = LogFactory.getLog(TestHBaseConfiguration.class);

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodec.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodec.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodec.java
index bca57d9..028e78e 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodec.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodec.java
@@ -28,9 +28,8 @@ import java.io.IOException;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellComparator;
 import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.SmallTests;
-import org.apache.hadoop.hbase.codec.CellCodec;
-import org.apache.hadoop.hbase.codec.Codec;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -38,7 +37,7 @@ import org.junit.experimental.categories.Category;
 import com.google.common.io.CountingInputStream;
 import com.google.common.io.CountingOutputStream;
 
-@Category(SmallTests.class)
+@Category({MiscTests.class, SmallTests.class})
 public class TestCellCodec {
 
   @Test

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodecWithTags.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodecWithTags.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodecWithTags.java
index 1499a91..14926f1 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodecWithTags.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodecWithTags.java
@@ -32,7 +32,8 @@ import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellComparator;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.Tag;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
@@ -41,7 +42,7 @@ import org.junit.experimental.categories.Category;
 import com.google.common.io.CountingInputStream;
 import com.google.common.io.CountingOutputStream;
 
-@Category(SmallTests.class)
+@Category({MiscTests.class, SmallTests.class})
 public class TestCellCodecWithTags {
 
   @Test

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodec.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodec.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodec.java
index 3d254af..e3366fe 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodec.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodec.java
@@ -28,9 +28,8 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 
 import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.SmallTests;
-import org.apache.hadoop.hbase.codec.Codec;
-import org.apache.hadoop.hbase.codec.KeyValueCodec;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -38,7 +37,7 @@ import org.junit.experimental.categories.Category;
 import com.google.common.io.CountingInputStream;
 import com.google.common.io.CountingOutputStream;
 
-@Category(SmallTests.class)
+@Category({MiscTests.class, SmallTests.class})
 public class TestKeyValueCodec {
   @Test
   public void testEmptyWorks() throws IOException {

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodecWithTags.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodecWithTags.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodecWithTags.java
index d8dd7fe..78fa733 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodecWithTags.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodecWithTags.java
@@ -32,7 +32,8 @@ import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellComparator;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.Tag;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
@@ -41,7 +42,7 @@ import org.junit.experimental.categories.Category;
 import com.google.common.io.CountingInputStream;
 import com.google.common.io.CountingOutputStream;
 
-@Category(SmallTests.class)
+@Category({MiscTests.class, SmallTests.class})
 public class TestKeyValueCodecWithTags {
 
   @Test

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestTagCompressionContext.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestTagCompressionContext.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestTagCompressionContext.java
index eed0a64..fcdb750 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestTagCompressionContext.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestTagCompressionContext.java
@@ -27,14 +27,15 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.Tag;
 import org.apache.hadoop.hbase.io.util.LRUDictionary;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(SmallTests.class)
+@Category({MiscTests.class, SmallTests.class})
 public class TestTagCompressionContext {
 
   private static final byte[] ROW = Bytes.toBytes("r1");

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestCipherProvider.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestCipherProvider.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestCipherProvider.java
index 3815689..b7d6322 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestCipherProvider.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestCipherProvider.java
@@ -27,13 +27,14 @@ import java.util.Arrays;
 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.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.io.crypto.aes.AES;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(SmallTests.class)
+@Category({MiscTests.class, SmallTests.class})
 public class TestCipherProvider {
 
   public static class MyCipherProvider implements CipherProvider {

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestEncryption.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestEncryption.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestEncryption.java
index e58376e..5a7222d 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestEncryption.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestEncryption.java
@@ -28,12 +28,13 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(SmallTests.class)
+@Category({MiscTests.class, SmallTests.class})
 public class TestEncryption {
 
   private static final Log LOG = LogFactory.getLog(TestEncryption.class);

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyProvider.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyProvider.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyProvider.java
index 5ea3241..4e60082 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyProvider.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyProvider.java
@@ -25,13 +25,14 @@ import java.security.Key;
 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.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.io.crypto.aes.AES;
 
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(SmallTests.class)
+@Category({MiscTests.class, SmallTests.class})
 public class TestKeyProvider {
 
   @Test

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java
index 9827b5b..ddd5d45 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java
@@ -32,12 +32,13 @@ import javax.crypto.spec.SecretKeySpec;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(SmallTests.class)
+@Category({MiscTests.class, SmallTests.class})
 public class TestKeyStoreKeyProvider {
 
   static final Log LOG = LogFactory.getLog(TestKeyStoreKeyProvider.class);

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/aes/TestAES.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/aes/TestAES.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/aes/TestAES.java
index f73917e..68424bb 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/aes/TestAES.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/aes/TestAES.java
@@ -34,7 +34,8 @@ import javax.crypto.spec.SecretKeySpec;
 import org.apache.commons.io.IOUtils;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.io.crypto.Cipher;
 import org.apache.hadoop.hbase.io.crypto.DefaultCipherProvider;
 import org.apache.hadoop.hbase.io.crypto.Encryption;
@@ -44,7 +45,7 @@ import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(SmallTests.class)
+@Category({MiscTests.class, SmallTests.class})
 public class TestAES {
 
   // Validation for AES in CTR mode with a 128 bit key

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/io/util/TestLRUDictionary.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/util/TestLRUDictionary.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/util/TestLRUDictionary.java
index 871c6fc..90da280 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/util/TestLRUDictionary.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/util/TestLRUDictionary.java
@@ -25,7 +25,8 @@ import java.util.Arrays;
 import java.util.Random;
 
 import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.MiscTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Before;
 import org.junit.Test;
@@ -34,7 +35,7 @@ import org.junit.experimental.categories.Category;
 /**
  * Tests LRUDictionary
  */
-@Category(SmallTests.class)
+@Category({MiscTests.class, SmallTests.class})
 public class TestLRUDictionary {
   LRUDictionary testee;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java
new file mode 100644
index 0000000..ab39591
--- /dev/null
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java
@@ -0,0 +1,41 @@
+/*
+ *
+ * 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.
+ */
+
+/**
+ * Tag a test as related to the client, This tests the hbase-client package and all of the client tests in
+ * hbase-server.
+ * @see org.apache.hadoop.hbase.testclassification.ClientTests
+ * @see org.apache.hadoop.hbase.testclassification.CoprocessorTests
+ * @see org.apache.hadoop.hbase.testclassification.FilterTests
+ * @see org.apache.hadoop.hbase.testclassification.FlakeyTests
+ * @see org.apache.hadoop.hbase.testclassification.IOTests
+ * @see org.apache.hadoop.hbase.testclassification.MapReduceTests
+ * @see org.apache.hadoop.hbase.testclassification.MasterTests
+ * @see org.apache.hadoop.hbase.testclassification.MiscTests
+ * @see org.apache.hadoop.hbase.testclassification.RegionServerTests
+ * @see org.apache.hadoop.hbase.testclassification.ReplicationTests
+ * @see org.apache.hadoop.hbase.testclassification.RPCTests
+ * @see org.apache.hadoop.hbase.testclassification.SecurityTests
+ * @see org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests
+ * @see org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests
+ */
+package org.apache.hadoop.hbase.testclassification;
+
+public interface ClientTests {
+}


Mime
View raw message