hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndimi...@apache.org
Subject [9/9] hbase git commit: HBASE-12163 Move test annotation classes to the same package as in master
Date Mon, 08 Dec 2014 18:43:02 GMT
HBASE-12163 Move test annotation classes to the same package as in master


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

Branch: refs/heads/branch-1
Commit: 081ce3f8de8379b962c3e4dcc4c1da8fc04d7ba2
Parents: 9ee9a4b
Author: Nick Dimiduk <ndimiduk@apache.org>
Authored: Mon Dec 8 10:38:58 2014 -0800
Committer: Nick Dimiduk <ndimiduk@apache.org>
Committed: Mon Dec 8 10:38:58 2014 -0800

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


http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/hbase-annotations/src/test/java/org/apache/hadoop/hbase/IntegrationTests.java
----------------------------------------------------------------------
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/IntegrationTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/IntegrationTests.java
deleted file mode 100644
index d429e24..0000000
--- a/hbase-annotations/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/081ce3f8/hbase-annotations/src/test/java/org/apache/hadoop/hbase/LargeTests.java
----------------------------------------------------------------------
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/LargeTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/LargeTests.java
deleted file mode 100644
index 958ffd7..0000000
--- a/hbase-annotations/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/081ce3f8/hbase-annotations/src/test/java/org/apache/hadoop/hbase/MediumTests.java
----------------------------------------------------------------------
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/MediumTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/MediumTests.java
deleted file mode 100644
index a51a2c9..0000000
--- a/hbase-annotations/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/081ce3f8/hbase-annotations/src/test/java/org/apache/hadoop/hbase/SmallTests.java
----------------------------------------------------------------------
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/SmallTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/SmallTests.java
deleted file mode 100644
index 6953667..0000000
--- a/hbase-annotations/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/081ce3f8/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java
----------------------------------------------------------------------
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java
new file mode 100644
index 0000000..ce6af67
--- /dev/null
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java
@@ -0,0 +1,39 @@
+/**
+ * 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.testclassification;
+
+/**
+ * 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/081ce3f8/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java
----------------------------------------------------------------------
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java
new file mode 100644
index 0000000..b8f6ba3
--- /dev/null
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java
@@ -0,0 +1,38 @@
+/*
+ *
+ * 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.testclassification;
+
+/**
+ * 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/081ce3f8/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java
----------------------------------------------------------------------
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java
new file mode 100644
index 0000000..0b79b3d
--- /dev/null
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java
@@ -0,0 +1,37 @@
+/*
+ *
+ * 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.testclassification;
+
+/**
+ * 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/081ce3f8/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java
----------------------------------------------------------------------
diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java
new file mode 100644
index 0000000..1552617
--- /dev/null
+++ b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java
@@ -0,0 +1,34 @@
+/*
+ *
+ * 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.testclassification;
+
+/**
+ * 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/081ce3f8/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptor.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptor.java
index fd966d2..8e23f97 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptor.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptor.java
@@ -25,6 +25,7 @@ import org.apache.hadoop.hbase.io.compress.Compression;
 import org.apache.hadoop.hbase.io.compress.Compression.Algorithm;
 import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
 import org.apache.hadoop.hbase.regionserver.BloomType;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.BuilderStyleTest;
 import org.junit.experimental.categories.Category;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
index 25e20e9..8dc141b 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java
@@ -29,6 +29,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.client.Durability;
 import org.apache.hadoop.hbase.exceptions.DeserializationException;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.BuilderStyleTest;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/hbase-client/src/test/java/org/apache/hadoop/hbase/TestInterfaceAudienceAnnotations.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestInterfaceAudienceAnnotations.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestInterfaceAudienceAnnotations.java
index 4cb715e..ace11ec 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestInterfaceAudienceAnnotations.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestInterfaceAudienceAnnotations.java
@@ -27,7 +27,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.hbase.classification.InterfaceAudience;
 import org.apache.hadoop.hbase.classification.InterfaceStability;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.ClassFinder.And;
 import org.apache.hadoop.hbase.ClassFinder.FileNameFilter;
 import org.apache.hadoop.hbase.ClassFinder.Not;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..1c27f45 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,6 +23,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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 e4c4162..6bb8dbb 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,7 @@ 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.MediumTests;
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.client.AsyncProcess.AsyncRequestFuture;
 import org.apache.hadoop.hbase.client.coprocessor.Batch;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..e7250dd 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,7 +21,7 @@ package org.apache.hadoop.hbase.client;
 
 import java.util.Arrays;
 
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Assert;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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 8d35819..9582405 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,7 @@ 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.SmallTests;
 import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.protobuf.generated.CellProtos;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..62b4972 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,7 +16,7 @@ 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.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Assert;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestFastFailWithoutTestUtil.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestFastFailWithoutTestUtil.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestFastFailWithoutTestUtil.java
index a6113e7..7cb0be6 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestFastFailWithoutTestUtil.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestFastFailWithoutTestUtil.java
@@ -46,7 +46,7 @@ import org.apache.hadoop.hbase.HRegionLocation;
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.exceptions.ConnectionClosingException;
 import org.apache.hadoop.hbase.exceptions.PreemptiveFastFailException;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.ipc.RemoteException;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..335103c 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
@@ -34,7 +34,7 @@ import java.util.Set;
 
 import org.apache.hadoop.conf.Configuration;
 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;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..8a2c447 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,7 +22,7 @@ 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.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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 c1ca6e1..1e81f28 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,7 +24,7 @@ import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.junit.Assert;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..0fec0eb 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,7 +17,7 @@
  */
 package org.apache.hadoop.hbase.client;
 
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Assert;
 import org.junit.Before;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..d843723 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,7 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.Set;
 
-import org.apache.hadoop.hbase.SmallTests;
+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;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..30060b2 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
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory;
 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.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;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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 cf58eda..308b8e2 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
@@ -33,7 +33,7 @@ import org.apache.hadoop.hbase.CellScanner;
 import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.codec.Codec;
 import org.apache.hadoop.hbase.codec.KeyValueCodec;
 import org.apache.hadoop.hbase.io.SizedCellScanner;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..b506b88 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,7 +28,7 @@ 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.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..e5e7b78 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
@@ -27,10 +27,9 @@ import javax.crypto.spec.SecretKeySpec;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.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;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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 e3f89bb..0dc64ec 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
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import org.apache.hadoop.hbase.KeyValue.Type;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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 1059515..fe32680 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
@@ -27,6 +27,7 @@ import java.util.NavigableMap;
 import java.util.TreeMap;
 
 import org.apache.hadoop.hbase.KeyValue.Type;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Assert;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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 890f108..1ee5ce0 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
@@ -42,7 +42,7 @@ import java.util.jar.Manifest;
 import javax.tools.JavaCompiler;
 import javax.tools.ToolProvider;
 
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Rule;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..a84b9fb 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,6 +26,7 @@ import junit.framework.TestCase;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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 445db84..b739f36 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,6 +29,7 @@ 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.SmallTests;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..54ee7a6 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,7 @@ 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.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..2a1569b 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,7 @@ 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.SmallTests;
 import org.apache.hadoop.hbase.Tag;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..6c18dc0 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,7 @@ 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.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..c217cfa 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,7 @@ 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.SmallTests;
 import org.apache.hadoop.hbase.Tag;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestByteBufferInputStream.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestByteBufferInputStream.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestByteBufferInputStream.java
index 3cdfe33..abd588d 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestByteBufferInputStream.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestByteBufferInputStream.java
@@ -24,7 +24,7 @@ import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.nio.ByteBuffer;
 
-import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.testclassification.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..ea1e380 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,7 +27,7 @@ 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.SmallTests;
 import org.apache.hadoop.hbase.Tag;
 import org.apache.hadoop.hbase.io.util.LRUDictionary;
 import org.apache.hadoop.hbase.util.Bytes;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..126d7f6 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,7 +27,7 @@ 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.SmallTests;
 import org.apache.hadoop.hbase.io.crypto.aes.AES;
 
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..d9e51c1 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,7 +28,7 @@ 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.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..9c98272 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,7 +25,7 @@ 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.SmallTests;
 import org.apache.hadoop.hbase.io.crypto.aes.AES;
 
 import org.junit.Test;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..5b193a4 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,7 +32,7 @@ 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.SmallTests;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..65260ea 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,7 @@ 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.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;

http://git-wip-us.apache.org/repos/asf/hbase/blob/081ce3f8/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..6d16ec2 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,7 @@ 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.SmallTests;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.junit.Before;
 import org.junit.Test;


Mime
View raw message