diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/TestRegionLocations.java hbase-client/src/test/java/org/apache/hadoop/hbase/TestRegionLocations.java index 8d833c3..7331b4d 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/TestRegionLocations.java +++ 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); diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java index a0d80c6..7132b8d 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java +++ 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"); diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAttributes.java hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAttributes.java index ef8f022..6656a83 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAttributes.java +++ 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 diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java index df5e693..58b4604 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestClientNoCluster.java +++ 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; diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestDeleteTimeStamp.java hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestDeleteTimeStamp.java index ab09146..e3582c1 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestDeleteTimeStamp.java +++ 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"); diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java index f11633d..1617b3a 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java +++ 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'}; diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestIncrement.java hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestIncrement.java index 19ff867..4b9f113 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestIncrement.java +++ 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() { diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java index bec74f5..d85cffc 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestOperation.java +++ 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"); diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestPutDotHas.java hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestPutDotHas.java index 49cfcdc..c269e62 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestPutDotHas.java +++ 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 diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java index 10da121..f358bf7 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java +++ 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 { diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromAdmin.java hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromAdmin.java index 572128a..f0ed3c1 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromAdmin.java +++ 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); diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java index 4544086..92d67b1 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java +++ 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); diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestPayloadCarryingRpcController.java hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestPayloadCarryingRpcController.java index fa185c0..e6d6f43 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestPayloadCarryingRpcController.java +++ 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 { diff --git hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestEncryptionUtil.java hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestEncryptionUtil.java index 2d6b43f..298344f 100644 --- hbase-client/src/test/java/org/apache/hadoop/hbase/security/TestEncryptionUtil.java +++ 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 diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/IntegrationTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/IntegrationTests.java deleted file mode 100644 index d429e24..0000000 --- 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: - * - * 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 { -} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/LargeTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/LargeTests.java deleted file mode 100644 index 958ffd7..0000000 --- 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 { -} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/MediumTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/MediumTests.java deleted file mode 100644 index a51a2c9..0000000 --- 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 { -} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/SmallTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/SmallTests.java deleted file mode 100644 index 6953667..0000000 --- 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 { -} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellComparator.java hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellComparator.java index 39e788a..2b80a54 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellComparator.java +++ 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"); diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellUtil.java hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellUtil.java index 50063f4..133fa03 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/TestCellUtil.java +++ 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} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/TestClassFinder.java hbase-common/src/test/java/org/apache/hadoop/hbase/TestClassFinder.java index 261fc1e..bcdcd9b 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/TestClassFinder.java +++ 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(); diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/TestCompoundConfiguration.java hbase-common/src/test/java/org/apache/hadoop/hbase/TestCompoundConfiguration.java index 148dd9c..65607a4 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/TestCompoundConfiguration.java +++ 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; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java index 60fa3b3..90e9e19 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java +++ 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); diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodec.java hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodec.java index bca57d9..028e78e 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodec.java +++ 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 diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodecWithTags.java hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodecWithTags.java index 1499a91..14926f1 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestCellCodecWithTags.java +++ 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 diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodec.java hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodec.java index 3d254af..e3366fe 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodec.java +++ 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 { diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodecWithTags.java hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodecWithTags.java index d8dd7fe..78fa733 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/codec/TestKeyValueCodecWithTags.java +++ 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 diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestTagCompressionContext.java hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestTagCompressionContext.java index eed0a64..fcdb750 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/io/TestTagCompressionContext.java +++ 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"); diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestCipherProvider.java hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestCipherProvider.java index 3815689..b7d6322 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestCipherProvider.java +++ 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 { diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestEncryption.java hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestEncryption.java index e58376e..5a7222d 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestEncryption.java +++ 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); diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyProvider.java hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyProvider.java index 5ea3241..4e60082 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyProvider.java +++ 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 diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java index 9827b5b..ddd5d45 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java +++ 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); diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/aes/TestAES.java hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/aes/TestAES.java index f73917e..68424bb 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/aes/TestAES.java +++ 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 diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/io/util/TestLRUDictionary.java hbase-common/src/test/java/org/apache/hadoop/hbase/io/util/TestLRUDictionary.java index 871c6fc..90da280 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/io/util/TestLRUDictionary.java +++ 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; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ClientTests.java new file mode 100644 index 0000000..ab39591 --- /dev/null +++ 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 { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java new file mode 100644 index 0000000..ff65995 --- /dev/null +++ hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.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 coprocessors. + * @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 CoprocessorTests { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java new file mode 100644 index 0000000..b4e9c35 --- /dev/null +++ hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.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 filter package. + * @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 FilterTests { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java new file mode 100644 index 0000000..ddd92b1 --- /dev/null +++ hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java @@ -0,0 +1,40 @@ +/* + * + * 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 failing commonly on public build infrastructure. + * @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 FlakeyTests { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java new file mode 100644 index 0000000..cf8bffa --- /dev/null +++ hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.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 io package. Things like HFile and the like. + * @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 IOTests { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java new file mode 100644 index 0000000..ce6af67 --- /dev/null +++ hbase-common/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: + * + * 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 { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java new file mode 100644 index 0000000..b8f6ba3 --- /dev/null +++ hbase-common/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 { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java new file mode 100644 index 0000000..5f8c9b7 --- /dev/null +++ hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java @@ -0,0 +1,40 @@ +/* + * + * 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 mapred or mapreduce, + * @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 MapReduceTests { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java new file mode 100644 index 0000000..19a95f2 --- /dev/null +++ hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java @@ -0,0 +1,40 @@ +/* + * + * 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 master. + * @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 MasterTests { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java new file mode 100644 index 0000000..0b79b3d --- /dev/null +++ hbase-common/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 { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java new file mode 100644 index 0000000..ef4d3f9 --- /dev/null +++ hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java @@ -0,0 +1,40 @@ +/* + * + * 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 not easily falling into any of the below categories. + * @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 MiscTests { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java new file mode 100644 index 0000000..eab3375 --- /dev/null +++ hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java @@ -0,0 +1,40 @@ +/* + * + * 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 RPC. + * @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 RPCTests { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java new file mode 100644 index 0000000..3b03194 --- /dev/null +++ hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.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 regionserver, + * @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 RegionServerTests { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java new file mode 100644 index 0000000..4f86404 --- /dev/null +++ hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java @@ -0,0 +1,40 @@ +/* + * + * 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 replication, + * @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 ReplicationTests { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java new file mode 100644 index 0000000..16fe1f7 --- /dev/null +++ hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.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 rest capability of HBase. + * + * @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 RestTests { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java new file mode 100644 index 0000000..907ae7a --- /dev/null +++ hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java @@ -0,0 +1,42 @@ +/* + * + * 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 security. + * + * @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 SecurityTests { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java new file mode 100644 index 0000000..1552617 --- /dev/null +++ hbase-common/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 { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java new file mode 100644 index 0000000..96a5e9a --- /dev/null +++ hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java @@ -0,0 +1,42 @@ +/* + * + * 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 mapreduce and taking longer than 5 minutes to run on public build + * infrastructure. + * @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 VerySlowMapReduceTests { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java new file mode 100644 index 0000000..3caa218 --- /dev/null +++ hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java @@ -0,0 +1,42 @@ +/* + * + * 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 region tests which takes longer than 5 minutes to run on public build + * infrastructure. + * @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 VerySlowRegionServerTests { +} diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestFixedLengthWrapper.java hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestFixedLengthWrapper.java index d9227c3..b259429 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestFixedLengthWrapper.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestFixedLengthWrapper.java @@ -20,7 +20,8 @@ package org.apache.hadoop.hbase.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -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.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.PositionedByteRange; @@ -28,7 +29,7 @@ import org.apache.hadoop.hbase.util.SimplePositionedMutableByteRange; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestFixedLengthWrapper { static final byte[][] VALUES = new byte[][] { diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedBlob.java hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedBlob.java index d24f4d4..c796fea 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedBlob.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedBlob.java @@ -19,14 +19,15 @@ package org.apache.hadoop.hbase.types; import static org.junit.Assert.assertEquals; -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.apache.hadoop.hbase.util.PositionedByteRange; import org.apache.hadoop.hbase.util.SimplePositionedMutableByteRange; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestOrderedBlob { static final byte[][] VALUES = new byte[][] { diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedBlobVar.java hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedBlobVar.java index 4e88552..d9c40e5 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedBlobVar.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedBlobVar.java @@ -19,14 +19,15 @@ package org.apache.hadoop.hbase.types; import static org.junit.Assert.assertEquals; -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.apache.hadoop.hbase.util.PositionedByteRange; import org.apache.hadoop.hbase.util.SimplePositionedMutableByteRange; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestOrderedBlobVar { static final byte[][] VALUES = new byte[][] { diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedString.java hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedString.java index 8306f00..6e9e9d0 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedString.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedString.java @@ -19,13 +19,14 @@ package org.apache.hadoop.hbase.types; import static org.junit.Assert.assertEquals; -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.PositionedByteRange; import org.apache.hadoop.hbase.util.SimplePositionedMutableByteRange; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestOrderedString { static final String[] VALUES = diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestRawString.java hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestRawString.java index b022229..90f7e21 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestRawString.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestRawString.java @@ -20,7 +20,8 @@ package org.apache.hadoop.hbase.types; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -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.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.PositionedByteRange; @@ -28,7 +29,7 @@ import org.apache.hadoop.hbase.util.SimplePositionedMutableByteRange; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestRawString { static final String[] VALUES = new String[] { diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestStruct.java hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestStruct.java index 2b79eeb..8dc239b 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestStruct.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestStruct.java @@ -25,7 +25,8 @@ import java.util.Arrays; import java.util.Collection; import java.util.Comparator; -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.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.PositionedByteRange; @@ -43,7 +44,7 @@ import org.junit.runners.Parameterized.Parameters; * custom data type extension for an application POJO. */ @RunWith(Parameterized.class) -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestStruct { private Struct generic; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestStructNullExtension.java hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestStructNullExtension.java index 8e45793..e87438d 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestStructNullExtension.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestStructNullExtension.java @@ -24,13 +24,14 @@ import static org.junit.Assert.assertNull; import java.math.BigDecimal; import java.util.Arrays; -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.PositionedByteRange; import org.apache.hadoop.hbase.util.SimplePositionedMutableByteRange; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestStructNullExtension { /** diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestTerminatedWrapper.java hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestTerminatedWrapper.java index 6bb331a..e36a141 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestTerminatedWrapper.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestTerminatedWrapper.java @@ -20,7 +20,8 @@ package org.apache.hadoop.hbase.types; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; -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.apache.hadoop.hbase.util.Order; import org.apache.hadoop.hbase.util.PositionedByteRange; @@ -28,7 +29,7 @@ import org.apache.hadoop.hbase.util.SimplePositionedMutableByteRange; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestTerminatedWrapper { static final String[] VALUES_STRINGS = new String[] { diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestUnion2.java hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestUnion2.java index ff1699c..932be95 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestUnion2.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestUnion2.java @@ -20,14 +20,15 @@ package org.apache.hadoop.hbase.types; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -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.Order; import org.apache.hadoop.hbase.util.PositionedByteRange; import org.apache.hadoop.hbase.util.SimplePositionedMutableByteRange; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestUnion2 { /** diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java index cf3da34..bd4854e 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java @@ -24,13 +24,14 @@ import java.util.Map; import java.util.TreeMap; import junit.framework.TestCase; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.experimental.categories.Category; /** * Test order preservation characteristics of ordered Base64 dialect */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestBase64 extends TestCase { // Note: uris is sorted. We need to prove that the ordered Base64 // preserves that ordering diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestByteRangeWithKVSerialization.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestByteRangeWithKVSerialization.java index 34e229a..34326d6 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestByteRangeWithKVSerialization.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestByteRangeWithKVSerialization.java @@ -21,13 +21,14 @@ 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.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestByteRangeWithKVSerialization { static void writeCell(PositionedByteRange pbr, KeyValue kv) throws Exception { diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java index d465f72..d421198 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java @@ -29,12 +29,13 @@ import java.util.Random; import junit.framework.TestCase; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Assert; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestBytes extends TestCase { public void testNullHashCode() { byte [] b = null; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestConcatenatedLists.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestConcatenatedLists.java index ce1a616..aa28509 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestConcatenatedLists.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestConcatenatedLists.java @@ -24,13 +24,14 @@ import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; import static org.junit.Assert.*; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestConcatenatedLists { @Test public void testUnsupportedOps() { diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorClassLoader.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorClassLoader.java index 942c7e3..daba459 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorClassLoader.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorClassLoader.java @@ -30,7 +30,8 @@ import java.io.FileOutputStream; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; 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.apache.hadoop.io.IOUtils; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -38,7 +39,7 @@ import org.junit.experimental.categories.Category; /** * Test TestCoprocessorClassLoader. More tests are in TestClassLoading */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestCoprocessorClassLoader { private static final HBaseCommonTestingUtility TEST_UTIL = new HBaseCommonTestingUtility(); diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCounter.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCounter.java index a0f0552..1c25ee3 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCounter.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCounter.java @@ -18,12 +18,13 @@ package org.apache.hadoop.hbase.util; import java.util.concurrent.CountDownLatch; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestCounter { private static final int[] THREAD_COUNTS = {1, 10, 100}; private static final int DATA_COUNT = 1000000; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDrainBarrier.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDrainBarrier.java index 52cc38e..09927f2 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDrainBarrier.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDrainBarrier.java @@ -18,13 +18,14 @@ */ package org.apache.hadoop.hbase.util; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; import static org.junit.Assert.*; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestDrainBarrier { @Test diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDynamicClassLoader.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDynamicClassLoader.java index 11a545b..9269f2f 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDynamicClassLoader.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDynamicClassLoader.java @@ -27,14 +27,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; 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.Test; import org.junit.experimental.categories.Category; /** * Test TestDynamicClassLoader */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestDynamicClassLoader { private static final Log LOG = LogFactory.getLog(TestDynamicClassLoader.class); diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java index bd9efb5..ee087ef 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java @@ -18,7 +18,8 @@ */ package org.apache.hadoop.hbase.util; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -31,7 +32,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestEnvironmentEdgeManager { @Test diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestKeyLocker.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestKeyLocker.java index fa351de..bb05900 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestKeyLocker.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestKeyLocker.java @@ -18,14 +18,15 @@ package org.apache.hadoop.hbase.util; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; import java.util.concurrent.locks.ReentrantLock; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestKeyLocker { @Test public void testLocker(){ diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestLoadTestKVGenerator.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestLoadTestKVGenerator.java index 9eb627c..120f2b6 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestLoadTestKVGenerator.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestLoadTestKVGenerator.java @@ -23,13 +23,13 @@ import java.util.HashSet; import java.util.Random; import java.util.Set; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.test.LoadTestKVGenerator; import org.junit.Test; import org.junit.experimental.categories.Category; -import org.apache.hadoop.hbase.SmallTests; - -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestLoadTestKVGenerator { private static final int MIN_LEN = 10; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestOrder.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestOrder.java index 75136c6..8029e44 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestOrder.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestOrder.java @@ -24,11 +24,12 @@ import static org.junit.Assert.assertArrayEquals; import java.util.Arrays; import java.util.Collections; -import org.apache.hadoop.hbase.SmallTests; +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 TestOrder { byte[][] VALS = { Bytes.toBytes("foo"), Bytes.toBytes("bar"), Bytes.toBytes("baz") }; diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestOrderedBytes.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestOrderedBytes.java index c65ba10..7e7c3aa 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestOrderedBytes.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestOrderedBytes.java @@ -25,11 +25,12 @@ import java.math.BigDecimal; import java.util.Arrays; import java.util.Collections; -import org.apache.hadoop.hbase.SmallTests; +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 TestOrderedBytes { // integer constants for testing Numeric code paths diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestShowProperties.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestShowProperties.java index c9bbbb6..e6d154d 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestShowProperties.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestShowProperties.java @@ -20,7 +20,8 @@ package org.apache.hadoop.hbase.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -31,7 +32,7 @@ import java.util.Properties; * This test is there to dump the properties. It allows to detect possible env issues when * executing the tests on various environment. */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestShowProperties { private static final Log LOG = LogFactory.getLog(TestShowProperties.class); diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimpleMutableByteRange.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimpleMutableByteRange.java index 43949f8..88d4829 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimpleMutableByteRange.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimpleMutableByteRange.java @@ -17,12 +17,13 @@ */ package org.apache.hadoop.hbase.util; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestSimpleMutableByteRange { @Test diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimplePositionedMutableByteRange.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimplePositionedMutableByteRange.java index b097b36..ecc8c60 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimplePositionedMutableByteRange.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimplePositionedMutableByteRange.java @@ -19,12 +19,13 @@ package org.apache.hadoop.hbase.util; import java.nio.ByteBuffer; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestSimplePositionedMutableByteRange { @Test public void testPosition() { diff --git hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java index 24837af..e8a0d05 100644 --- hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java +++ hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java @@ -22,13 +22,14 @@ import static org.junit.Assert.assertTrue; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; import java.util.concurrent.atomic.AtomicBoolean; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestThreads { private static final Log LOG = LogFactory.getLog(TestThreads.class); diff --git hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestBulkDeleteProtocol.java hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestBulkDeleteProtocol.java index 16327ba..391360f 100644 --- hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestBulkDeleteProtocol.java +++ hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestBulkDeleteProtocol.java @@ -31,7 +31,8 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; @@ -55,7 +56,7 @@ import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.util.Bytes; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestBulkDeleteProtocol { private static final byte[] FAMILY1 = Bytes.toBytes("cf1"); private static final byte[] FAMILY2 = Bytes.toBytes("cf2"); diff --git hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRowCountEndpoint.java hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRowCountEndpoint.java index cc16483..98dca59 100644 --- hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRowCountEndpoint.java +++ hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRowCountEndpoint.java @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.coprocessor.example; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Table; @@ -29,6 +28,8 @@ import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; import org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos; import org.apache.hadoop.hbase.ipc.BlockingRpcCallback; import org.apache.hadoop.hbase.ipc.ServerRpcController; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.experimental.categories.Category; @@ -42,7 +43,7 @@ import static junit.framework.Assert.*; * Test case demonstrating client interactions with the {@link RowCountEndpoint} * sample coprocessor Service implementation. */ -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestRowCountEndpoint { private static final byte[] TEST_TABLE = Bytes.toBytes("testrowcounter"); private static final byte[] TEST_FAMILY = Bytes.toBytes("f"); diff --git hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java index af51504..7691586 100644 --- hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java +++ hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java @@ -27,13 +27,14 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.zookeeper.ZKUtil; @@ -41,7 +42,7 @@ import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.apache.zookeeper.ZooKeeper; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestZooKeeperScanPolicyObserver { private static final Log LOG = LogFactory.getLog(TestZooKeeperScanPolicyObserver.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-examples/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMapReduceExamples.java hbase-examples/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMapReduceExamples.java index f554e6b..1f10cb9 100644 --- hbase-examples/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMapReduceExamples.java +++ hbase-examples/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMapReduceExamples.java @@ -18,7 +18,8 @@ package org.apache.hadoop.hbase.mapreduce; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; @@ -43,7 +44,7 @@ import java.io.PrintStream; import static org.junit.Assert.*; import static org.mockito.Mockito.*; -@Category(LargeTests.class) +@Category({MapReduceTests.class, LargeTests.class}) public class TestMapReduceExamples { private static HBaseTestingUtility util = new HBaseTestingUtility(); diff --git hbase-examples/src/test/java/org/apache/hadoop/hbase/types/TestPBCell.java hbase-examples/src/test/java/org/apache/hadoop/hbase/types/TestPBCell.java index 952a319..a548b8a 100644 --- hbase-examples/src/test/java/org/apache/hadoop/hbase/types/TestPBCell.java +++ hbase-examples/src/test/java/org/apache/hadoop/hbase/types/TestPBCell.java @@ -23,13 +23,17 @@ import static org.junit.Assert.assertTrue; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellComparator; import org.apache.hadoop.hbase.KeyValue; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.CellProtos; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.PositionedByteRange; import org.apache.hadoop.hbase.util.SimplePositionedByteRange; import org.junit.Test; +import org.junit.experimental.categories.Category; +@Category({SmallTests.class, MiscTests.class}) public class TestPBCell { private static final PBCell CODEC = new PBCell(); diff --git hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/master/TestMetricsMasterSourceImpl.java hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/master/TestMetricsMasterSourceImpl.java index 4cdd606..0a784eb 100644 --- hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/master/TestMetricsMasterSourceImpl.java +++ hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/master/TestMetricsMasterSourceImpl.java @@ -19,9 +19,6 @@ package org.apache.hadoop.hbase.master; import org.apache.hadoop.hbase.CompatibilitySingletonFactory; -import org.apache.hadoop.hbase.master.MetricsMasterSource; -import org.apache.hadoop.hbase.master.MetricsMasterSourceFactory; -import org.apache.hadoop.hbase.master.MetricsMasterSourceImpl; import org.junit.Test; import static org.junit.Assert.assertSame; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java index 7ac0d32..0479945 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java @@ -26,6 +26,7 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.LoadTestTool; import org.apache.hadoop.util.ToolRunner; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestStripeCompactions.java hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestStripeCompactions.java index 1ac2834..ebf159e 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestStripeCompactions.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestStripeCompactions.java @@ -23,6 +23,7 @@ import java.io.IOException; import org.apache.hadoop.hbase.regionserver.HStore; import org.apache.hadoop.hbase.regionserver.StoreEngine; import org.apache.hadoop.hbase.regionserver.StripeStoreEngine; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.util.LoadTestTool; import org.junit.experimental.categories.Category; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithACL.java hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithACL.java index 296fb80..82eef1a 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithACL.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithACL.java @@ -27,6 +27,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.io.hfile.HFile; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.security.access.AccessController; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.util.LoadTestTool; import org.apache.hadoop.hbase.util.test.LoadTestDataGeneratorWithACL; import org.apache.hadoop.util.ToolRunner; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java index f4246a2..9212095 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java @@ -29,6 +29,7 @@ import org.apache.hadoop.hbase.io.hfile.HFileWriterV3; import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.SecureProtobufLogReader; import org.apache.hadoop.hbase.regionserver.wal.SecureProtobufLogWriter; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.util.ToolRunner; import org.apache.log4j.Level; import org.apache.log4j.Logger; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithTags.java hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithTags.java index e428cb2..f1b2c68 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithTags.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithTags.java @@ -22,6 +22,7 @@ import java.util.Arrays; import java.util.List; import org.apache.hadoop.hbase.io.hfile.HFile; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.util.LoadTestDataGeneratorWithTags; import org.apache.hadoop.hbase.util.LoadTestTool; import org.junit.experimental.categories.Category; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithVisibilityLabels.java hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithVisibilityLabels.java index 1dafbaa..8da811b 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithVisibilityLabels.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithVisibilityLabels.java @@ -28,6 +28,7 @@ import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.security.visibility.LoadTestDataGeneratorWithVisibilityLabels; import org.apache.hadoop.hbase.security.visibility.VisibilityClient; import org.apache.hadoop.hbase.security.visibility.VisibilityController; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.util.LoadTestTool; import org.junit.experimental.categories.Category; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestLazyCfLoading.java hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestLazyCfLoading.java index 750376a..9e00087 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestLazyCfLoading.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestLazyCfLoading.java @@ -36,6 +36,7 @@ import org.apache.hadoop.hbase.filter.CompareFilter; import org.apache.hadoop.hbase.filter.Filter; import org.apache.hadoop.hbase.filter.SingleColumnValueFilter; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.MultiThreadedWriter; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestManyRegions.java hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestManyRegions.java index 30f3d53..68c0334 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestManyRegions.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestManyRegions.java @@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.HBaseAdmin; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.util.RegionSplitter; import org.apache.hadoop.hbase.util.RegionSplitter.SplitAlgorithm; import org.junit.After; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java index 160dc66..cc22e43 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java @@ -32,6 +32,7 @@ import org.apache.hadoop.hbase.chaos.policies.Policy; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.ipc.RpcClient; import org.apache.hadoop.hbase.regionserver.DisabledRegionSplitPolicy; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.mapreduce.Counters; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.util.ToolRunner; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestsDriver.java hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestsDriver.java index 436bbe1..47ce9e1 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestsDriver.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestsDriver.java @@ -25,6 +25,7 @@ import java.util.regex.Pattern; import org.apache.commons.cli.CommandLine; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.util.AbstractHBaseTool; import org.apache.hadoop.util.ToolRunner; import org.junit.internal.TextListener; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java index 96a6a60..c6f014c 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java @@ -41,7 +41,7 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.IntegrationTestBase; import org.apache.hadoop.hbase.IntegrationTestingUtility; -import org.apache.hadoop.hbase.IntegrationTests; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java index e99677b..7fe5171 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java @@ -41,7 +41,7 @@ import org.apache.hadoop.hbase.HBaseCommonTestingUtility; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.IntegrationTestingUtility; -import org.apache.hadoop.hbase.IntegrationTests; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValue.Type; import org.apache.hadoop.hbase.TableName; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestTableMapReduceUtil.java hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestTableMapReduceUtil.java index 88e004a..e21dfec 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestTableMapReduceUtil.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestTableMapReduceUtil.java @@ -21,13 +21,11 @@ package org.apache.hadoop.hbase.mapreduce; import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeTrue; -import java.io.IOException; - import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.IntegrationTestingUtility; -import org.apache.hadoop.hbase.IntegrationTests; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestTableSnapshotInputFormat.java hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestTableSnapshotInputFormat.java index 26de202..55da93e 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestTableSnapshotInputFormat.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestTableSnapshotInputFormat.java @@ -27,7 +27,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.IntegrationTestBase; import org.apache.hadoop.hbase.IntegrationTestingUtility; -import org.apache.hadoop.hbase.IntegrationTests; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.util.ToolRunner; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java index 55cc70e..f695db9 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java @@ -36,7 +36,7 @@ import org.apache.hadoop.hbase.ClusterStatus; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.IntegrationTestingUtility; -import org.apache.hadoop.hbase.IntegrationTests; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.InvalidFamilyOperationException; import org.apache.hadoop.hbase.NamespaceExistException; import org.apache.hadoop.hbase.NamespaceNotFoundException; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java index c709f0d..a1b5162 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java @@ -47,7 +47,7 @@ import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.IntegrationTestBase; import org.apache.hadoop.hbase.IntegrationTestingUtility; -import org.apache.hadoop.hbase.IntegrationTests; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.MasterNotRunningException; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithVisibility.java hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithVisibility.java index be7e36f..8b84780 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithVisibility.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedListWithVisibility.java @@ -35,7 +35,7 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.IntegrationTestingUtility; -import org.apache.hadoop.hbase.IntegrationTests; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.chaos.factories.MonkeyFactory; import org.apache.hadoop.hbase.client.Admin; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java index 6bab237..08a8146 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java @@ -40,7 +40,7 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.IntegrationTestBase; import org.apache.hadoop.hbase.IntegrationTestingUtility; -import org.apache.hadoop.hbase.IntegrationTests; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.HBaseAdmin; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedMultiGetRequestsWithRegionReplicas.java hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedMultiGetRequestsWithRegionReplicas.java index 574fd67..575febe 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedMultiGetRequestsWithRegionReplicas.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedMultiGetRequestsWithRegionReplicas.java @@ -23,7 +23,7 @@ import java.util.List; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.IntegrationTestingUtility; -import org.apache.hadoop.hbase.IntegrationTests; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.util.LoadTestTool; import org.apache.hadoop.hbase.util.MultiThreadedReader; import org.apache.hadoop.util.ToolRunner; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.java hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.java index 63bd42f..9995124 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.java @@ -33,7 +33,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.IntegrationTestIngest; import org.apache.hadoop.hbase.IntegrationTestingUtility; -import org.apache.hadoop.hbase.IntegrationTests; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.chaos.factories.MonkeyFactory; import org.apache.hadoop.hbase.client.Admin; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.java hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.java index fc3ae3c..96743c8 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestWithCellVisibilityLoadAndVerify.java @@ -32,7 +32,6 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.IntegrationTestingUtility; -import org.apache.hadoop.hbase.IntegrationTests; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.Put; @@ -49,6 +48,7 @@ import org.apache.hadoop.hbase.security.visibility.Authorizations; import org.apache.hadoop.hbase.security.visibility.CellVisibility; import org.apache.hadoop.hbase.security.visibility.VisibilityClient; import org.apache.hadoop.hbase.security.visibility.VisibilityController; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.util.AbstractHBaseTool; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.BytesWritable; diff --git hbase-it/src/test/java/org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java hbase-it/src/test/java/org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java index 2ec5838..c96a6ac 100644 --- hbase-it/src/test/java/org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java +++ hbase-it/src/test/java/org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java @@ -22,7 +22,7 @@ import org.apache.commons.cli.CommandLine; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.IntegrationTestingUtility; -import org.apache.hadoop.hbase.IntegrationTests; +import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Get; diff --git hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/keyvalue/TestKeyValueTool.java hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/keyvalue/TestKeyValueTool.java index bb3a4c3..5bd4494 100644 --- hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/keyvalue/TestKeyValueTool.java +++ hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/keyvalue/TestKeyValueTool.java @@ -25,7 +25,8 @@ import java.util.List; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueTestUtil; -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.codec.prefixtree.row.TestRowData; import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataRandomKeyValuesWithTags; import org.apache.hadoop.hbase.codec.prefixtree.row.data.TestRowDataTrivialWithTags; @@ -36,7 +37,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) @RunWith(Parameterized.class) public class TestKeyValueTool { diff --git hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/blockmeta/TestBlockMeta.java hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/blockmeta/TestBlockMeta.java index eee991b..6bf14bf 100644 --- hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/blockmeta/TestBlockMeta.java +++ hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/blockmeta/TestBlockMeta.java @@ -23,13 +23,14 @@ import java.io.IOException; import java.nio.ByteBuffer; 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.codec.prefixtree.PrefixTreeBlockMeta; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestBlockMeta { static int BLOCK_START = 123; diff --git hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTokenizer.java hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTokenizer.java index dc32d6f..77cc5d3 100644 --- hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTokenizer.java +++ hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTokenizer.java @@ -21,7 +21,8 @@ package org.apache.hadoop.hbase.codec.prefixtree.builder; import java.util.Collection; import java.util.List; -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.codec.prefixtree.encode.tokenize.Tokenizer; import org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize.TokenizerNode; import org.apache.hadoop.hbase.codec.prefixtree.encode.tokenize.TokenizerRowSearchResult; @@ -34,7 +35,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -@Category(SmallTests.class) +@Category({MiscTests.class,SmallTests.class}) @RunWith(Parameterized.class) public class TestTokenizer { diff --git hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTreeDepth.java hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTreeDepth.java index 542b0e5..87fcf07 100644 --- hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTreeDepth.java +++ hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/builder/TestTreeDepth.java @@ -21,7 +21,8 @@ package org.apache.hadoop.hbase.codec.prefixtree.builder; import java.util.List; -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.codec.prefixtree.encode.tokenize.Tokenizer; import org.apache.hadoop.hbase.util.SimpleMutableByteRange; import org.apache.hadoop.hbase.util.Bytes; @@ -31,7 +32,7 @@ import org.junit.experimental.categories.Category; import com.google.common.collect.Lists; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestTreeDepth { @Test diff --git hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/TestColumnBuilder.java hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/TestColumnBuilder.java index 9a15866..c33a953 100644 --- hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/TestColumnBuilder.java +++ hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/column/TestColumnBuilder.java @@ -23,7 +23,8 @@ import java.io.IOException; import java.util.Collection; import java.util.List; -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.codec.prefixtree.PrefixTreeBlockMeta; import org.apache.hadoop.hbase.codec.prefixtree.decode.column.ColumnReader; import org.apache.hadoop.hbase.codec.prefixtree.encode.column.ColumnSectionWriter; @@ -43,7 +44,7 @@ import org.junit.runners.Parameterized.Parameters; import com.google.common.collect.Lists; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) @RunWith(Parameterized.class) public class TestColumnBuilder { diff --git hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestPrefixTreeSearcher.java hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestPrefixTreeSearcher.java index d7652cd..e0848c2 100644 --- hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestPrefixTreeSearcher.java +++ hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestPrefixTreeSearcher.java @@ -28,7 +28,8 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellComparator; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -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.codec.prefixtree.decode.DecoderFactory; import org.apache.hadoop.hbase.codec.prefixtree.encode.PrefixTreeEncoder; import org.apache.hadoop.hbase.codec.prefixtree.scanner.CellScannerPosition; @@ -41,7 +42,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) @RunWith(Parameterized.class) public class TestPrefixTreeSearcher { diff --git hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowEncoder.java hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowEncoder.java index 74d5cfc..d63144e 100644 --- hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowEncoder.java +++ hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/row/TestRowEncoder.java @@ -28,7 +28,8 @@ import java.util.List; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -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.codec.prefixtree.PrefixTreeBlockMeta; import org.apache.hadoop.hbase.codec.prefixtree.decode.PrefixTreeArraySearcher; import org.apache.hadoop.hbase.codec.prefixtree.encode.PrefixTreeEncoder; @@ -43,7 +44,7 @@ import org.junit.runners.Parameterized.Parameters; import com.google.common.collect.Lists; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) @RunWith(Parameterized.class) public class TestRowEncoder { diff --git hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/TestTimestampEncoder.java hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/TestTimestampEncoder.java index a94984d..65cbcc9 100644 --- hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/TestTimestampEncoder.java +++ hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/codec/prefixtree/timestamp/TestTimestampEncoder.java @@ -21,7 +21,8 @@ package org.apache.hadoop.hbase.codec.prefixtree.timestamp; import java.io.IOException; import java.util.Collection; -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.codec.prefixtree.PrefixTreeBlockMeta; import org.apache.hadoop.hbase.codec.prefixtree.decode.timestamp.TimestampDecoder; import org.apache.hadoop.hbase.codec.prefixtree.encode.other.LongEncoder; @@ -32,7 +33,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) @RunWith(Parameterized.class) public class TestTimestampEncoder { diff --git hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/bytes/TestByteRange.java hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/bytes/TestByteRange.java index 11057e0..028d604 100644 --- hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/bytes/TestByteRange.java +++ hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/bytes/TestByteRange.java @@ -20,13 +20,14 @@ package org.apache.hadoop.hbase.util.bytes; import junit.framework.Assert; -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.ByteRange; import org.apache.hadoop.hbase.util.SimpleMutableByteRange; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestByteRange { @Test diff --git hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestFIntTool.java hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestFIntTool.java index b2b1742..4d12335 100644 --- hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestFIntTool.java +++ hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestFIntTool.java @@ -21,15 +21,15 @@ package org.apache.hadoop.hbase.util.vint; import java.io.ByteArrayOutputStream; import java.io.IOException; -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.util.vint.UFIntTool; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; /********************** tests *************************/ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestFIntTool { @Test public void testLeadingZeros() { diff --git hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVIntTool.java hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVIntTool.java index d445f1a..b9cb372 100644 --- hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVIntTool.java +++ hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVIntTool.java @@ -23,13 +23,13 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Random; -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.util.vint.UVIntTool; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestVIntTool { @Test diff --git hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVLongTool.java hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVLongTool.java index 1354a41..ed637f6 100644 --- hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVLongTool.java +++ hbase-prefix-tree/src/test/java/org/apache/hadoop/hbase/util/vint/TestVLongTool.java @@ -22,14 +22,14 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.util.Random; -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.number.RandomNumberUtils; -import org.apache.hadoop.hbase.util.vint.UVLongTool; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestVLongTool { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java index 172395a..0e62d77 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java @@ -37,6 +37,8 @@ import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy; +import org.apache.hadoop.hbase.testclassification.FlakeyTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.Tool; @@ -53,7 +55,7 @@ import com.google.common.collect.Lists; * This can run as a junit test, or with a main() function which runs against * a real cluster (eg for testing with failures, region movement, etc) */ -@Category(MediumTests.class) +@Category({FlakeyTests.class, MediumTests.class}) public class TestAcidGuarantees implements Tool { protected static final Log LOG = LogFactory.getLog(TestAcidGuarantees.class); public static final byte [] TABLE_NAME = Bytes.toBytes("TestAcidGuarantees"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestCheckTestClasses.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestCheckTestClasses.java index 24241f1..06b98f7 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestCheckTestClasses.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestCheckTestClasses.java @@ -22,6 +22,8 @@ import static org.junit.Assert.assertTrue; import java.util.List; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -29,7 +31,7 @@ import org.junit.experimental.categories.Category; /** * Checks tests are categorized. */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestCheckTestClasses { /** * Throws an assertion if we find a test class without category (small/medium/large/integration). diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java index 37e12dc..4097efb 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java @@ -20,6 +20,8 @@ package org.apache.hadoop.hbase; import static org.junit.Assert.assertTrue; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread; import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; import org.junit.After; @@ -30,7 +32,7 @@ import org.junit.experimental.categories.Category; /** * Tests the boot order indifference between regionserver and master */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestClusterBootOrder { private static final long SLEEP_INTERVAL = 1000; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestCompare.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestCompare.java index b0665d4..ed61350 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestCompare.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestCompare.java @@ -20,13 +20,15 @@ package org.apache.hadoop.hbase; import junit.framework.TestCase; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.experimental.categories.Category; /** * Test comparing HBase objects. */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestCompare extends TestCase { /** diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestFSTableDescriptorForceCreation.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestFSTableDescriptorForceCreation.java index b4085ca..fe9de6a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestFSTableDescriptorForceCreation.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestFSTableDescriptorForceCreation.java @@ -25,11 +25,13 @@ import java.io.IOException; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.FSTableDescriptors; import org.junit.*; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestFSTableDescriptorForceCreation { private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java index f4ffa2b..f2ac593 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java @@ -23,6 +23,8 @@ import static org.junit.Assert.assertEquals; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; import org.junit.AfterClass; @@ -31,7 +33,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({MiscTests.class, LargeTests.class}) public class TestFullLogReconstruction { private final static HBaseTestingUtility diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java index 893c2d5..4db8f30 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java @@ -30,6 +30,8 @@ import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil; import org.apache.hadoop.hbase.util.Threads; @@ -40,7 +42,7 @@ import org.junit.experimental.categories.Category; * Test HBASE-3694 whether the GlobalMemStoreSize is the same as the summary * of all the online region's MemStoreSize */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestGlobalMemStoreSize { private final Log LOG = LogFactory.getLog(this.getClass().getName()); private static int regionServerNum = 4; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java index cb01558..4eac224 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java @@ -31,6 +31,8 @@ import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster; import org.apache.hadoop.hdfs.MiniDFSCluster; @@ -40,7 +42,7 @@ import org.junit.experimental.categories.Category; /** * Test our testing utility class */ -@Category(LargeTests.class) +@Category({MiscTests.class, LargeTests.class}) public class TestHBaseTestingUtility { private final Log LOG = LogFactory.getLog(this.getClass()); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptor.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptor.java index 2534609..132004d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptor.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptor.java @@ -25,12 +25,14 @@ 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.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.experimental.categories.Category; import org.junit.Test; /** Tests the HColumnDescriptor with appropriate arguments */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestHColumnDescriptor { @Test public void testPb() throws DeserializationException { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptorDefaultVersions.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptorDefaultVersions.java index 83aba8e..26a8d2c 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptorDefaultVersions.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestHColumnDescriptorDefaultVersions.java @@ -23,13 +23,10 @@ import static org.junit.Assert.assertEquals; import java.io.IOException; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hbase.HColumnDescriptor; -import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.master.MasterFileSystem; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSTableDescriptors; import org.apache.hadoop.hbase.util.FSUtils; @@ -46,7 +43,7 @@ import org.junit.rules.TestName; * Verify that the HColumnDescriptor version is set correctly by default, hbase-site.xml, and user * input */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestHColumnDescriptorDefaultVersions { @Rule diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestHDFSBlocksDistribution.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestHDFSBlocksDistribution.java index ea69406..2329fc2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestHDFSBlocksDistribution.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestHDFSBlocksDistribution.java @@ -18,6 +18,8 @@ */ package org.apache.hadoop.hbase; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -26,7 +28,7 @@ import java.util.Map; import static junit.framework.Assert.assertEquals; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestHDFSBlocksDistribution { @Test public void testAddHostsAndBlockWeight() throws Exception { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestHRegionLocation.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestHRegionLocation.java index 628feba..2ad5f9a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestHRegionLocation.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestHRegionLocation.java @@ -23,10 +23,12 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertTrue; +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 TestHRegionLocation { /** * HRegionLocations are equal if they have the same 'location' -- i.e. host and diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java index 0c0b165..c52eecb 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java @@ -31,6 +31,8 @@ import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver; import org.apache.hadoop.hbase.coprocessor.SampleRegionWALObserver; import org.apache.hadoop.hbase.exceptions.DeserializationException; +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 +40,7 @@ import org.junit.experimental.categories.Category; /** * Test setting values in the descriptor */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestHTableDescriptor { final static Log LOG = LogFactory.getLog(TestHTableDescriptor.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java index 990de0f..2718daa 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java @@ -46,6 +46,8 @@ import org.apache.hadoop.hbase.regionserver.StoreFile; import org.apache.hadoop.hbase.regionserver.compactions.CompactionContext; import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.HLogUtil; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; import org.apache.hadoop.hdfs.DFSClient; @@ -76,7 +78,7 @@ import com.google.common.collect.Lists; * has had some files removed because of a compaction. This sort of hurry's along and makes certain what is a chance * occurance. */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestIOFencing { static final Log LOG = LogFactory.getLog(TestIOFencing.class); static { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java index e57fdbd..6b5ad98 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java @@ -27,6 +27,8 @@ import java.nio.channels.ServerSocketChannel; 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.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -42,7 +44,7 @@ import org.junit.experimental.categories.Category; * the test ensures that we are running with java.net.preferIPv4Stack=true, so * that ZK will not fail to bind to ipv6 address using ClientCnxnSocketNIO. */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestIPv6NIOServerSocketChannel { private static final Log LOG = LogFactory.getLog(TestIPv6NIOServerSocketChannel.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java index f6d2746..ec9cc76 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java @@ -27,6 +27,8 @@ import java.net.URL; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -37,7 +39,7 @@ import org.junit.experimental.categories.Category; * Testing, info servers are disabled. This test enables then and checks that * they serve pages. */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestInfoServers { static final Log LOG = LogFactory.getLog(TestInfoServers.class); private final static HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXListener.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXListener.java index 719e04f..ed141a6 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXListener.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXListener.java @@ -28,6 +28,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; @@ -38,7 +40,7 @@ import org.junit.rules.ExpectedException; -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestJMXListener { private static final Log LOG = LogFactory.getLog(TestJMXListener.class); private static HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java index 729dca7..bbf4f32 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java @@ -23,12 +23,14 @@ import java.io.IOException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.master.HMaster; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.zookeeper.KeeperException; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestLocalHBaseCluster { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java index c812034..1a43796 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java @@ -37,6 +37,8 @@ import org.apache.hadoop.hbase.client.HConnectionManager; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; import org.junit.AfterClass; @@ -48,7 +50,7 @@ import org.junit.experimental.categories.Category; /** * Test {@link org.apache.hadoop.hbase.MetaTableAccessor}. */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) @SuppressWarnings("deprecation") public class TestMetaTableAccessor { private static final Log LOG = LogFactory.getLog(TestMetaTableAccessor.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessorNoCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessorNoCluster.java index b313d12..62b4b9a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessorNoCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessorNoCluster.java @@ -38,6 +38,8 @@ import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponse; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.junit.After; @@ -55,7 +57,7 @@ import com.google.protobuf.ServiceException; * Test MetaTableAccessor but without spinning up a cluster. * We mock regionserver back and forth (we do spin up a zk cluster). */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestMetaTableAccessorNoCluster { private static final Log LOG = LogFactory.getLog(TestMetaTableAccessorNoCluster.class); private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java index 8a439a8..05699e4 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java @@ -39,6 +39,8 @@ import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoReque import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetRequest; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetResponse; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; @@ -57,7 +59,7 @@ import com.google.protobuf.ServiceException; /** * Test {@link org.apache.hadoop.hbase.zookeeper.MetaTableLocator} */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestMetaTableLocator { private static final Log LOG = LogFactory.getLog(TestMetaTableLocator.class); private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java index e619d5e..8333954 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java @@ -42,6 +42,8 @@ import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; import org.junit.AfterClass; @@ -54,7 +56,7 @@ import org.junit.experimental.categories.Category; * Port of old TestScanMultipleVersions, TestTimestamp and TestGetRowVersions * from old testing framework to {@link HBaseTestingUtility}. */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestMultiVersions { private static final Log LOG = LogFactory.getLog(TestMultiVersions.class); private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java index 79166a4..baa43fa 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java @@ -39,6 +39,8 @@ import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.master.HMaster; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.zookeeper.ZKUtil; @@ -53,7 +55,7 @@ import org.junit.experimental.categories.Category; import com.google.common.collect.Sets; -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestNamespace { protected static final Log LOG = LogFactory.getLog(TestNamespace.class); private static HMaster master; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java index 2778122..9360b1f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java @@ -33,12 +33,14 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HealthChecker.HealthCheckerExitStatus; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.util.Shell; import org.junit.After; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestNodeHealthCheckChore { private static final Log LOG = LogFactory.getLog(TestNodeHealthCheckChore.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java index 6bce51d..e35fc08 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java @@ -31,6 +31,8 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.PerformanceEvaluation.RandomReadTest; import org.apache.hadoop.hbase.PerformanceEvaluation.TestOptions; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.codehaus.jackson.JsonGenerationException; import org.codehaus.jackson.map.JsonMappingException; import org.codehaus.jackson.map.ObjectMapper; @@ -42,7 +44,7 @@ import com.yammer.metrics.core.Histogram; import com.yammer.metrics.stats.Snapshot; import com.yammer.metrics.stats.UniformSample; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestPerformanceEvaluation { private static final HBaseTestingUtility HTU = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java index fd7cd6f..d46d73b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java @@ -36,6 +36,8 @@ import org.apache.hadoop.hbase.client.RegionLocator; import org.apache.hadoop.hbase.master.RegionStates; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.testclassification.FlakeyTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil; import org.apache.hadoop.hbase.util.Threads; @@ -50,7 +52,7 @@ import org.junit.runners.Parameterized.Parameters; /** * Test whether region re-balancing works. (HBASE-71) */ -@Category(LargeTests.class) +@Category({FlakeyTests.class, LargeTests.class}) @RunWith(value = Parameterized.class) public class TestRegionRebalancing { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java index b46ec28..c57a8cf 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java @@ -46,6 +46,8 @@ import org.apache.hadoop.hbase.io.TimeRange; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.RecoveryMode; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Writables; import org.apache.hadoop.io.DataInputBuffer; @@ -55,7 +57,7 @@ import org.junit.experimental.categories.Category; /** * Test HBase Writables serializations */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestSerialization { @Test public void testKeyValue() throws Exception { final String name = "testKeyValue2"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java index fd08358..97b518a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerLoad.java @@ -24,12 +24,14 @@ import static org.junit.Assert.*; import org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; import com.google.protobuf.ByteString; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestServerLoad { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerName.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerName.java index 9ac69cd..e5125c6 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerName.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerName.java @@ -24,12 +24,14 @@ import static org.junit.Assert.assertTrue; import java.util.regex.Pattern; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Addressing; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestServerName { @Test public void testGetHostNameMinusDomain() { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java index 80faad2..a0a810e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java @@ -48,6 +48,8 @@ import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.LoadBalancer; import org.apache.hadoop.hbase.master.balancer.SimpleLoadBalancer; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.Threads; @@ -72,7 +74,7 @@ import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({MiscTests.class, LargeTests.class}) public class TestZooKeeper { private final Log LOG = LogFactory.getLog(this.getClass()); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java index a486f4b..8e6518b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java @@ -35,11 +35,11 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.PathFilter; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.Stoppable; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.master.cleaner.HFileCleaner; import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy; import org.apache.hadoop.hbase.regionserver.HRegion; @@ -61,7 +61,7 @@ import org.junit.experimental.categories.Category; * Test that the {@link HFileArchiver} correctly removes all the parts of a region when cleaning up * a region */ -@Category(MediumTests.class) +@Category({MediumTests.class, MiscTests.class}) public class TestHFileArchiving { private static final Log LOG = LogFactory.getLog(TestHFileArchiving.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/backup/example/TestZooKeeperTableArchiveClient.java hbase-server/src/test/java/org/apache/hadoop/hbase/backup/example/TestZooKeeperTableArchiveClient.java index cbe47b6..953121f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/backup/example/TestZooKeeperTableArchiveClient.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/backup/example/TestZooKeeperTableArchiveClient.java @@ -35,7 +35,8 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.Stoppable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.master.cleaner.BaseHFileCleanerDelegate; @@ -62,7 +63,7 @@ import org.mockito.stubbing.Answer; * Spin up a small cluster and check that the hfiles of region are properly long-term archived as * specified via the {@link ZKTableArchiveClient}. */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestZooKeeperTableArchiveClient { private static final Log LOG = LogFactory.getLog(TestZooKeeperTableArchiveClient.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java index b91c962..b6b446d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java @@ -43,7 +43,6 @@ import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.InvalidFamilyOperationException; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MasterNotRunningException; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.NotServingRegionException; @@ -63,6 +62,8 @@ import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.regionserver.wal.HLogUtilsForTests; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.hbase.zookeeper.ZKTableStateClientSideReader; @@ -83,7 +84,7 @@ import com.google.protobuf.ServiceException; * Spins up the minicluster once at test start and then takes it down afterward. * Add any testing of HBaseAdmin functionality here. */ -@Category(LargeTests.class) +@Category({LargeTests.class, ClientTests.class}) public class TestAdmin { final Log LOG = LogFactory.getLog(getClass()); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientOperationInterrupt.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientOperationInterrupt.java index b29456f..6d58d03 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientOperationInterrupt.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientOperationInterrupt.java @@ -25,12 +25,13 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver; import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; import org.apache.hadoop.hbase.coprocessor.ObserverContext; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Threads; import org.junit.AfterClass; @@ -46,7 +47,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -@Category(MediumTests.class) +@Category({MediumTests.class, ClientTests.class}) public class TestClientOperationInterrupt { private static final Log LOG = LogFactory.getLog(TestClientOperationInterrupt.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java index 546b9ea..f8f7bb3 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java @@ -27,7 +27,6 @@ import org.apache.commons.logging.impl.Log4JLogger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MiniHBaseCluster.MiniHBaseClusterRegionServer; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.CoordinatedStateManager; @@ -37,6 +36,8 @@ import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponse; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.regionserver.RSRpcServices; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.log4j.Level; import org.junit.AfterClass; @@ -51,7 +52,7 @@ import com.google.protobuf.ServiceException; * Test the scenario where a HRegionServer#scan() call, while scanning, timeout at client side and * getting retried. This scenario should not result in some data being skipped at RS side. */ -@Category(MediumTests.class) +@Category({MediumTests.class, ClientTests.class}) public class TestClientScannerRPCTimeout { final Log LOG = LogFactory.getLog(getClass()); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientTimeouts.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientTimeouts.java index 0bb73ca..abb1ce1 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientTimeouts.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientTimeouts.java @@ -33,10 +33,11 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.MasterNotRunningException; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.ipc.RpcClient; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -48,7 +49,7 @@ import com.google.protobuf.Message; import com.google.protobuf.RpcController; import com.google.protobuf.ServiceException; -@Category(MediumTests.class) +@Category({MediumTests.class, ClientTests.class}) public class TestClientTimeouts { final Log LOG = LogFactory.getLog(getClass()); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java index 1dfcfbd..1e87e6e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java @@ -17,25 +17,20 @@ */ package org.apache.hadoop.hbase.client; -import static org.junit.Assert.assertEquals; - import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.NamespaceNotFoundException; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.master.MasterFileSystem; import org.apache.hadoop.hbase.master.snapshot.SnapshotManager; import org.apache.hadoop.hbase.snapshot.SnapshotDoesNotExistException; import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; import org.junit.AfterClass; @@ -47,7 +42,7 @@ import org.junit.experimental.categories.Category; /** * Test clone snapshots from the client */ -@Category(LargeTests.class) +@Category({LargeTests.class, ClientTests.class}) public class TestCloneSnapshotFromClient { final Log LOG = LogFactory.getLog(getClass()); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClientWithRegionReplicas.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClientWithRegionReplicas.java index 933740d..5c2eca9 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClientWithRegionReplicas.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClientWithRegionReplicas.java @@ -17,10 +17,11 @@ */ package org.apache.hadoop.hbase.client; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({LargeTests.class, ClientTests.class}) public class TestCloneSnapshotFromClientWithRegionReplicas extends TestCloneSnapshotFromClient { @Override diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestConnectionUtils.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestConnectionUtils.java index 4120ec3..ac0a0bd 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestConnectionUtils.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestConnectionUtils.java @@ -19,7 +19,8 @@ */ 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.junit.Test; import org.junit.experimental.categories.Category; @@ -28,7 +29,7 @@ import java.util.TreeSet; import static org.junit.Assert.assertTrue; -@Category(SmallTests.class) +@Category({SmallTests.class, ClientTests.class}) public class TestConnectionUtils { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java index 3b53c0a..e5b0928 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java @@ -60,7 +60,6 @@ import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.RegionLocations; import org.apache.hadoop.hbase.ServerName; @@ -96,6 +95,8 @@ import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.regionserver.NoSuchColumnFamilyException; import org.apache.hadoop.hbase.regionserver.Store; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.Pair; @@ -114,7 +115,7 @@ import org.junit.experimental.categories.Category; * Sets up the HBase mini cluster once at start and runs through all client tests. * Each creates a table named for the method and does its stuff against that. */ -@Category(LargeTests.class) +@Category({LargeTests.class, ClientTests.class}) @SuppressWarnings ("deprecation") public class TestFromClientSide { final Log LOG = LogFactory.getLog(getClass()); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java index 5858e75..7b15544 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java @@ -36,9 +36,10 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; import org.junit.After; @@ -48,7 +49,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({LargeTests.class, ClientTests.class}) public class TestFromClientSide3 { final Log LOG = LogFactory.getLog(getClass()); private final static HBaseTestingUtility TEST_UTIL diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideNoCodec.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideNoCodec.java index 1a2017a..a7e37fd 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideNoCodec.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideNoCodec.java @@ -25,8 +25,9 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.ipc.RpcClient; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -37,7 +38,7 @@ import org.junit.experimental.categories.Category; * Do some ops and prove that client and server can work w/o codecs; that we can pb all the time. * Good for third-party clients or simple scripts that want to talk direct to hbase. */ -@Category(MediumTests.class) +@Category({MediumTests.class, ClientTests.class}) public class TestFromClientSideNoCodec { protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); /** diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideWithCoprocessor.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideWithCoprocessor.java index 27099a5..e832590 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideWithCoprocessor.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideWithCoprocessor.java @@ -18,7 +18,8 @@ package org.apache.hadoop.hbase.client; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; import org.apache.hadoop.hbase.coprocessor.MultiRowMutationEndpoint; import org.apache.hadoop.hbase.regionserver.NoOpScanPolicyObserver; @@ -29,7 +30,7 @@ import org.junit.experimental.categories.Category; * Test all client operations with a coprocessor that * just implements the default flush/compact/scan policy */ -@Category(LargeTests.class) +@Category({LargeTests.class, ClientTests.class}) public class TestFromClientSideWithCoprocessor extends TestFromClientSide { @BeforeClass public static void setUpBeforeClass() throws Exception { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHBaseAdminNoCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHBaseAdminNoCluster.java index 82819da..7521bb7 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHBaseAdminNoCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHBaseAdminNoCluster.java @@ -22,11 +22,12 @@ import static org.junit.Assert.fail; import java.io.IOException; 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.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.MasterNotRunningException; import org.apache.hadoop.hbase.PleaseHoldException; import org.apache.hadoop.hbase.TableName; @@ -40,7 +41,7 @@ import org.mortbay.log.Log; import com.google.protobuf.RpcController; import com.google.protobuf.ServiceException; -@Category(SmallTests.class) +@Category({SmallTests.class, ClientTests.class}) public class TestHBaseAdminNoCluster { /** * Verify that PleaseHoldException gets retried. diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java index 7a818aa..d86ca3f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHCM.java @@ -52,7 +52,8 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.FlakeyTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.RegionLocations; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; @@ -89,7 +90,7 @@ import com.google.common.collect.Lists; /** * This class is for testing HBaseConnectionManager features */ -@Category(MediumTests.class) +@Category({MediumTests.class, FlakeyTests.class}) public class TestHCM { private static final Log LOG = LogFactory.getLog(TestHCM.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexer.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexer.java index 2f0bf37..4fa6678 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableMultiplexer.java @@ -29,14 +29,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({LargeTests.class, ClientTests.class}) public class TestHTableMultiplexer { final Log LOG = LogFactory.getLog(getClass()); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableUtil.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableUtil.java index 31db75a..891eea7 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableUtil.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHTableUtil.java @@ -26,7 +26,8 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -37,7 +38,7 @@ import org.junit.experimental.categories.Category; * This class provides tests for the {@link HTableUtil} class * */ -@Category(MediumTests.class) +@Category({MediumTests.class, ClientTests.class}) public class TestHTableUtil { final Log LOG = LogFactory.getLog(getClass()); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIntraRowPagination.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIntraRowPagination.java index 0fb190a..add8221 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIntraRowPagination.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIntraRowPagination.java @@ -26,17 +26,18 @@ import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.HTestConst; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.RegionScanner; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; /** * Test scan/get offset and limit settings within one row through HRegion API. */ -@Category(SmallTests.class) +@Category({SmallTests.class, ClientTests.class}) public class TestIntraRowPagination { private static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java index 77c1cbc..f0bc1ec 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaScanner.java @@ -38,8 +38,9 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.StoppableImplementation; import org.apache.hadoop.hbase.util.Threads; @@ -49,7 +50,7 @@ import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({MediumTests.class, ClientTests.class}) public class TestMetaScanner { final Log LOG = LogFactory.getLog(getClass()); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java index 6e2ff13..5a7b83a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultiParallel.java @@ -36,11 +36,12 @@ import org.apache.commons.logging.impl.Log4JLogger; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Waiter; import org.apache.hadoop.hbase.exceptions.OperationConflictException; import org.apache.hadoop.hbase.ipc.RpcClient; import org.apache.hadoop.hbase.ipc.RpcServer; +import org.apache.hadoop.hbase.testclassification.FlakeyTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil; import org.apache.hadoop.hbase.util.Threads; @@ -52,7 +53,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({MediumTests.class, FlakeyTests.class}) public class TestMultiParallel { private static final Log LOG = LogFactory.getLog(TestMultiParallel.class); { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java index a28b828..abb919f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMultipleTimestamps.java @@ -28,6 +28,8 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.*; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; import org.junit.AfterClass; @@ -41,7 +43,7 @@ import org.junit.experimental.categories.Category; * Sets up the HBase mini cluster once at start. Each creates a table * named for the method and does its stuff against that. */ -@Category(LargeTests.class) +@Category({LargeTests.class, ClientTests.class}) public class TestMultipleTimestamps { final Log LOG = LogFactory.getLog(getClass()); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutDeleteEtcCellIteration.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutDeleteEtcCellIteration.java index bc0bc58..c46056d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutDeleteEtcCellIteration.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutDeleteEtcCellIteration.java @@ -28,7 +28,8 @@ import java.util.ConcurrentModificationException; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.KeyValue; -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; @@ -36,7 +37,7 @@ import org.junit.experimental.categories.Category; /** * Test that I can Iterate Client Actions that hold Cells (Get does not have Cells). */ -@Category(SmallTests.class) +@Category({SmallTests.class, ClientTests.class}) public class TestPutDeleteEtcCellIteration { private static final byte [] ROW = new byte [] {'r'}; private static final long TIMESTAMP = System.currentTimeMillis(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutWithDelete.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutWithDelete.java index aaf37cb..5ae5ff8 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutWithDelete.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestPutWithDelete.java @@ -19,6 +19,8 @@ package org.apache.hadoop.hbase.client; import org.apache.hadoop.hbase.*; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -27,7 +29,7 @@ import org.junit.experimental.categories.Category; import static org.junit.Assert.assertTrue; -@Category(MediumTests.class) +@Category({MediumTests.class, ClientTests.class}) public class TestPutWithDelete { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java index 20a30ea..e1aef05 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java @@ -30,7 +30,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Waiter; import org.apache.hadoop.hbase.client.replication.ReplicationAdmin; import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver; @@ -40,6 +39,8 @@ import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequ import org.apache.hadoop.hbase.protobuf.RequestConverter; import org.apache.hadoop.hbase.regionserver.StorefileRefresherChore; import org.apache.hadoop.hbase.regionserver.TestHRegionServerBulkLoad; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster; @@ -58,7 +59,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; -@Category(MediumTests.class) +@Category({MediumTests.class, ClientTests.class}) public class TestReplicaWithCluster { private static final Log LOG = LogFactory.getLog(TestReplicaWithCluster.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicasClient.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicasClient.java index de05500..983cd55 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicasClient.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicasClient.java @@ -40,7 +40,6 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.MasterNotRunningException; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.NotServingRegionException; import org.apache.hadoop.hbase.RegionLocations; import org.apache.hadoop.hbase.TableNotFoundException; @@ -54,6 +53,8 @@ import org.apache.hadoop.hbase.regionserver.InternalScanner; import org.apache.hadoop.hbase.regionserver.RegionScanner; import org.apache.hadoop.hbase.regionserver.StorefileRefresherChore; import org.apache.hadoop.hbase.regionserver.TestRegionServerNoMaster; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.zookeeper.KeeperException; import org.junit.After; @@ -68,7 +69,7 @@ import org.junit.experimental.categories.Category; * Tests for region replicas. Sad that we cannot isolate these without bringing up a whole * cluster. See {@link org.apache.hadoop.hbase.regionserver.TestRegionServerNoMaster}. */ -@Category(MediumTests.class) +@Category({MediumTests.class, ClientTests.class}) @SuppressWarnings("deprecation") public class TestReplicasClient { private static final Log LOG = LogFactory.getLog(TestReplicasClient.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java index f67f491..5bbd8be 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java @@ -33,12 +33,13 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.master.MasterFileSystem; import org.apache.hadoop.hbase.master.snapshot.SnapshotManager; import org.apache.hadoop.hbase.regionserver.NoSuchColumnFamilyException; import org.apache.hadoop.hbase.snapshot.CorruptedSnapshotException; import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; import org.junit.After; @@ -51,7 +52,7 @@ import org.junit.experimental.categories.Category; /** * Test restore snapshots from the client */ -@Category(LargeTests.class) +@Category({LargeTests.class, ClientTests.class}) public class TestRestoreSnapshotFromClient { final Log LOG = LogFactory.getLog(getClass()); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClientWithRegionReplicas.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClientWithRegionReplicas.java index 7ab14ec..94cf44d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClientWithRegionReplicas.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClientWithRegionReplicas.java @@ -17,10 +17,11 @@ */ package org.apache.hadoop.hbase.client; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({LargeTests.class, ClientTests.class}) public class TestRestoreSnapshotFromClientWithRegionReplicas extends TestRestoreSnapshotFromClient { @Override diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResult.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResult.java index a0e1a45..fd4b01a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResult.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestResult.java @@ -34,11 +34,12 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.KeyValue; -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.experimental.categories.Category; -@Category(SmallTests.class) +@Category({SmallTests.class, ClientTests.class}) public class TestResult extends TestCase { private static final Log LOG = LogFactory.getLog(TestResult.class.getName()); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java index 414c4c8..1740cc8 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java @@ -29,13 +29,14 @@ import org.apache.hadoop.hbase.CellScannable; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; import org.apache.hadoop.hbase.coprocessor.ProtobufCoprocessorService; import org.apache.hadoop.hbase.ipc.DelegatingPayloadCarryingRpcController; import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController; import org.apache.hadoop.hbase.ipc.RpcControllerFactory; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -44,7 +45,7 @@ import org.junit.experimental.categories.Category; import com.google.common.collect.Lists; -@Category(MediumTests.class) +@Category({MediumTests.class, ClientTests.class}) public class TestRpcControllerFactory { public static class StaticRpcControllerFactory extends RpcControllerFactory { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java index 402f798..61de851 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannerTimeout.java @@ -26,9 +26,10 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.Before; @@ -39,7 +40,7 @@ import org.junit.experimental.categories.Category; /** * Test various scanner timeout issues. */ -@Category(LargeTests.class) +@Category({LargeTests.class, ClientTests.class}) public class TestScannerTimeout { private final static HBaseTestingUtility diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java index 55a808c..0165bac 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestScannersFromClientSide.java @@ -30,7 +30,6 @@ import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HTestConst; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.filter.ColumnPrefixFilter; import org.apache.hadoop.hbase.filter.ColumnRangeFilter; @@ -39,6 +38,8 @@ import org.apache.hadoop.hbase.master.RegionState.State; import org.apache.hadoop.hbase.master.RegionStates; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.junit.After; @@ -51,7 +52,7 @@ import org.junit.experimental.categories.Category; /** * A client-side test, mostly testing scanners with various parameters. */ -@Category(MediumTests.class) +@Category({MediumTests.class, ClientTests.class}) public class TestScannersFromClientSide { private static final Log LOG = LogFactory.getLog(TestScannersFromClientSide.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotCloneIndependence.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotCloneIndependence.java index 5f2d2c5..a1ead55 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotCloneIndependence.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotCloneIndependence.java @@ -31,10 +31,11 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.master.snapshot.SnapshotManager; import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy; import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; import org.junit.AfterClass; @@ -47,7 +48,7 @@ import org.junit.experimental.categories.Category; /** * Test to verify that the cloned table is independent of the table from which it was cloned */ -@Category(LargeTests.class) +@Category({LargeTests.class, ClientTests.class}) public class TestSnapshotCloneIndependence { private static final Log LOG = LogFactory.getLog(TestSnapshotCloneIndependence.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java index b5c1359..c17da6d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClient.java @@ -31,7 +31,6 @@ import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.master.snapshot.SnapshotManager; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription; @@ -39,6 +38,8 @@ import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy; import org.apache.hadoop.hbase.snapshot.SnapshotCreationException; import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils; import org.apache.hadoop.hbase.snapshot.SnapshotManifestV1; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; import org.junit.After; @@ -55,7 +56,7 @@ import com.google.common.collect.Lists; *

* This is an end-to-end test for the snapshot utility */ -@Category(LargeTests.class) +@Category({LargeTests.class, ClientTests.class}) public class TestSnapshotFromClient { private static final Log LOG = LogFactory.getLog(TestSnapshotFromClient.class); protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClientWithRegionReplicas.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClientWithRegionReplicas.java index 08d42a2..9f8cc3e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClientWithRegionReplicas.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotFromClientWithRegionReplicas.java @@ -17,10 +17,11 @@ */ package org.apache.hadoop.hbase.client; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({LargeTests.class, ClientTests.class}) public class TestSnapshotFromClientWithRegionReplicas extends TestSnapshotFromClient { @Override diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java index f417649..fa129f9 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestSnapshotMetadata.java @@ -33,13 +33,14 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.master.snapshot.SnapshotManager; import org.apache.hadoop.hbase.regionserver.BloomType; import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy; import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; import org.junit.AfterClass; @@ -51,7 +52,7 @@ import org.junit.experimental.categories.Category; /** * Test class to verify that metadata is consistent before and after a snapshot attempt. */ -@Category(MediumTests.class) +@Category({MediumTests.class, ClientTests.class}) public class TestSnapshotMetadata { private static final Log LOG = LogFactory.getLog(TestSnapshotMetadata.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTableSnapshotScanner.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTableSnapshotScanner.java index 5732cc5..62211b2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTableSnapshotScanner.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTableSnapshotScanner.java @@ -29,11 +29,12 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.mapreduce.TestTableSnapshotInputFormat; import org.apache.hadoop.hbase.master.snapshot.SnapshotManager; import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; import org.junit.After; @@ -41,7 +42,7 @@ import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({LargeTests.class, ClientTests.class}) public class TestTableSnapshotScanner { private static final Log LOG = LogFactory.getLog(TestTableSnapshotInputFormat.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java index 3e382ea..12a0457 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestTimestampsFilter.java @@ -30,6 +30,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.filter.Filter; import org.apache.hadoop.hbase.filter.TimestampsFilter; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; import org.junit.AfterClass; @@ -43,7 +45,7 @@ import org.junit.experimental.categories.Category; * Sets up the HBase mini cluster once at start. Each creates a table * named for the method and does its stuff against that. */ -@Category(MediumTests.class) +@Category({MediumTests.class, ClientTests.class}) public class TestTimestampsFilter { final Log LOG = LogFactory.getLog(getClass()); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java index 77bc64e..4091019 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java @@ -25,6 +25,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -39,7 +41,7 @@ import static org.junit.Assert.assertFalse; /** * Unit testing of ReplicationAdmin */ -@Category(MediumTests.class) +@Category({MediumTests.class, ClientTests.class}) public class TestReplicationAdmin { private static final Log LOG = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/codec/TestCellMessageCodec.java hbase-server/src/test/java/org/apache/hadoop/hbase/codec/TestCellMessageCodec.java index 97d08ac..b51de80 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/codec/TestCellMessageCodec.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/codec/TestCellMessageCodec.java @@ -32,9 +32,8 @@ import org.apache.commons.logging.LogFactory; 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.Codec; -import org.apache.hadoop.hbase.codec.MessageCodec; +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; @@ -42,7 +41,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 TestCellMessageCodec { public static final Log LOG = LogFactory.getLog(TestCellMessageCodec.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java hbase-server/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java index 5b30625..f4ad44c 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraint.java @@ -29,7 +29,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; @@ -46,7 +47,7 @@ import org.junit.experimental.categories.Category; /** * Do the complex testing of constraints against a minicluster */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestConstraint { private static final Log LOG = LogFactory .getLog(TestConstraint.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraints.java hbase-server/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraints.java index a706318..afd55bb 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraints.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/constraint/TestConstraints.java @@ -26,7 +26,8 @@ import java.util.List; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HTableDescriptor; -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.TableName; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.constraint.TestConstraint.CheckWasRunConstraint; @@ -38,7 +39,7 @@ import org.junit.experimental.categories.Category; /** * Test reading/writing the constraints into the {@link HTableDescriptor} */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestConstraints { @SuppressWarnings("unchecked") diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestAggregateProtocol.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestAggregateProtocol.java index d358a13..e1a7a8d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestAggregateProtocol.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestAggregateProtocol.java @@ -34,6 +34,8 @@ import org.apache.hadoop.hbase.filter.Filter; import org.apache.hadoop.hbase.filter.PrefixFilter; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.EmptyMsg; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.LongMsg; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -44,7 +46,7 @@ import org.junit.experimental.categories.Category; * A test class to cover aggregate functions, that can be implemented using * Coprocessors. */ -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestAggregateProtocol { protected static Log myLog = LogFactory.getLog(TestAggregateProtocol.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBatchCoprocessorEndpoint.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBatchCoprocessorEndpoint.java index 8891525..c99a1f6 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBatchCoprocessorEndpoint.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBatchCoprocessorEndpoint.java @@ -27,6 +27,8 @@ import java.util.TreeMap; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -34,7 +36,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; @@ -56,7 +57,7 @@ import com.google.protobuf.ServiceException; /** * TestEndpoint: test cases to verify the batch execution of coprocessor Endpoint */ -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestBatchCoprocessorEndpoint { private static final Log LOG = LogFactory.getLog(TestBatchCoprocessorEndpoint.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBigDecimalColumnInterpreter.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBigDecimalColumnInterpreter.java index 06773bd..43b5ea9 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBigDecimalColumnInterpreter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBigDecimalColumnInterpreter.java @@ -33,6 +33,8 @@ import org.apache.hadoop.hbase.filter.Filter; import org.apache.hadoop.hbase.filter.PrefixFilter; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.BigDecimalMsg; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.EmptyMsg; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -42,7 +44,7 @@ import org.junit.experimental.categories.Category; /** * A test class to test BigDecimalColumnInterpreter for AggregationsProtocol */ -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestBigDecimalColumnInterpreter { protected static Log myLog = LogFactory.getLog(TestBigDecimalColumnInterpreter.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java index 850aedb..accd764 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java @@ -24,9 +24,10 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.TestServerCustomProtocol; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.ClassLoaderTestHelper; import org.apache.hadoop.hbase.util.CoprocessorClassLoader; import org.apache.hadoop.hdfs.MiniDFSCluster; @@ -49,7 +50,7 @@ import static org.junit.Assert.assertFalse; /** * Test coprocessors class loading. */ -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestClassLoading { private static final Log LOG = LogFactory.getLog(TestClassLoading.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java index c8e2c8c..64732b0 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java @@ -32,6 +32,8 @@ import java.util.TreeMap; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -41,7 +43,6 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HBaseAdmin; @@ -66,7 +67,7 @@ import com.google.protobuf.ServiceException; /** * TestEndpoint: test cases to verify coprocessor Endpoint */ -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestCoprocessorEndpoint { private static final Log LOG = LogFactory.getLog(TestCoprocessorEndpoint.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java index 9792a8e..c3791c3 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorInterface.java @@ -49,7 +49,6 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.Server; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Scan; @@ -61,6 +60,8 @@ import org.apache.hadoop.hbase.regionserver.ScanType; import org.apache.hadoop.hbase.regionserver.SplitTransaction; import org.apache.hadoop.hbase.regionserver.Store; import org.apache.hadoop.hbase.regionserver.StoreFile; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.PairOfSameType; import org.junit.Rule; import org.junit.Test; @@ -68,7 +69,7 @@ import org.junit.experimental.categories.Category; import org.junit.rules.TestName; import org.mockito.Mockito; -@Category(SmallTests.class) +@Category({CoprocessorTests.class, SmallTests.class}) public class TestCoprocessorInterface { @Rule public TestName name = new TestName(); static final Log LOG = LogFactory.getLog(TestCoprocessorInterface.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorStop.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorStop.java index 8138582..2ef13f7 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorStop.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorStop.java @@ -24,11 +24,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; -import org.apache.hadoop.hbase.master.HMaster; -import org.apache.hadoop.hbase.master.MasterCoprocessorHost; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -40,7 +40,7 @@ import static org.junit.Assert.assertTrue; * Tests for master and regionserver coprocessor stop method * */ -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestCoprocessorStop { private static final Log LOG = LogFactory.getLog(TestCoprocessorStop.class); private static HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestDoubleColumnInterpreter.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestDoubleColumnInterpreter.java index 6fec206..8669a6c 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestDoubleColumnInterpreter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestDoubleColumnInterpreter.java @@ -25,7 +25,6 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.HTable; @@ -37,6 +36,8 @@ import org.apache.hadoop.hbase.filter.Filter; import org.apache.hadoop.hbase.filter.PrefixFilter; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.DoubleMsg; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.EmptyMsg; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -46,7 +47,7 @@ import org.junit.experimental.categories.Category; /** * A test class to test DoubleColumnInterpreter for AggregateProtocol */ -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestDoubleColumnInterpreter { protected static Log myLog = LogFactory.getLog(TestDoubleColumnInterpreter.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestHTableWrapper.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestHTableWrapper.java index cbeb532..af50b52 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestHTableWrapper.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestHTableWrapper.java @@ -27,7 +27,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Coprocessor; import org.apache.hadoop.hbase.CoprocessorEnvironment; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Append; import org.apache.hadoop.hbase.client.Delete; @@ -45,6 +44,8 @@ import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.client.coprocessor.Batch; import org.apache.hadoop.hbase.ipc.CoprocessorRpcChannel; import org.apache.hadoop.hbase.master.MasterCoprocessorHost; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.VersionInfo; import org.junit.After; @@ -60,7 +61,7 @@ import static org.junit.Assert.*; * Tests class {@link org.apache.hadoop.hbase.client.HTableWrapper} * by invoking its methods and briefly asserting the result is reasonable. */ -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestHTableWrapper { private static final HBaseTestingUtility util = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java index fc57493..81db6b4 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithAbort.java @@ -34,13 +34,13 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.MasterCoprocessorHost; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.ZooKeeperNodeTracker; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; @@ -55,7 +55,7 @@ import org.junit.experimental.categories.Category; * error message describing the set of its loaded coprocessors for crash diagnosis. * (HBASE-4014). */ -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestMasterCoprocessorExceptionWithAbort { public static class MasterTracker extends ZooKeeperNodeTracker { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java index b832547..5048c73 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterCoprocessorExceptionWithRemove.java @@ -32,13 +32,13 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.MasterCoprocessorHost; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.ZooKeeperNodeTracker; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; @@ -54,7 +54,7 @@ import org.junit.experimental.categories.Category; * back to the client. * (HBASE-4014). */ -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestMasterCoprocessorExceptionWithRemove { public static class MasterTracker extends ZooKeeperNodeTracker { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java index 79acf4c..84bccf2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestMasterObserver.java @@ -39,13 +39,11 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.master.AssignmentManager; import org.apache.hadoop.hbase.master.HMaster; @@ -57,6 +55,8 @@ import org.apache.hadoop.hbase.protobuf.RequestConverter; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.GetTableDescriptorsRequest; import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Threads; import org.junit.AfterClass; @@ -68,7 +68,7 @@ import org.junit.experimental.categories.Category; * Tests invocation of the {@link org.apache.hadoop.hbase.coprocessor.MasterObserver} * interface hooks at all appropriate times during normal HMaster operations. */ -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestMasterObserver { private static final Log LOG = LogFactory.getLog(TestMasterObserver.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestOpenTableInCoprocessor.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestOpenTableInCoprocessor.java index 9f81151..f6e7437 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestOpenTableInCoprocessor.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestOpenTableInCoprocessor.java @@ -31,7 +31,6 @@ import java.util.concurrent.TimeUnit; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Durability; @@ -42,6 +41,8 @@ import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Threads; import org.junit.After; import org.junit.AfterClass; @@ -52,7 +53,7 @@ import org.junit.experimental.categories.Category; /** * Test that a coprocessor can open a connection and write to another table, inside a hook. */ -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestOpenTableInCoprocessor { private static final TableName otherTable = TableName.valueOf("otherTable"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverBypass.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverBypass.java index bb16add..3e41859 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverBypass.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverBypass.java @@ -29,7 +29,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Delete; @@ -40,6 +39,8 @@ import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper; @@ -50,7 +51,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestRegionObserverBypass { private static HBaseTestingUtility util; private static final TableName tableName = TableName.valueOf("test"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java index d7ec064..4890edd 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverInterface.java @@ -42,7 +42,6 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; @@ -71,6 +70,8 @@ import org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost; import org.apache.hadoop.hbase.regionserver.ScanType; import org.apache.hadoop.hbase.regionserver.Store; import org.apache.hadoop.hbase.regionserver.StoreFile; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.JVMClusterUtil; @@ -80,7 +81,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestRegionObserverInterface { static final Log LOG = LogFactory.getLog(TestRegionObserverInterface.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverScannerOpenHook.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverScannerOpenHook.java index 3365a95..11bcda4 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverScannerOpenHook.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverScannerOpenHook.java @@ -39,7 +39,6 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Get; @@ -62,11 +61,13 @@ import org.apache.hadoop.hbase.regionserver.Store; import org.apache.hadoop.hbase.regionserver.StoreScanner; import org.apache.hadoop.hbase.regionserver.compactions.CompactionContext; import org.apache.hadoop.hbase.regionserver.wal.HLog; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestRegionObserverScannerOpenHook { private static HBaseTestingUtility UTIL = new HBaseTestingUtility(); static final Path DIR = UTIL.getDataTestDir(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverStacking.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverStacking.java index 41dae08..126a2d2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverStacking.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionObserverStacking.java @@ -31,17 +31,18 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({CoprocessorTests.class, SmallTests.class}) public class TestRegionObserverStacking extends TestCase { private static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java index d16bfd7..469dd4e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithAbort.java @@ -30,6 +30,8 @@ import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.junit.Assert; @@ -44,7 +46,7 @@ import static org.junit.Assert.*; * error message describing the set of its loaded coprocessors for crash * diagnosis. (HBASE-4014). */ -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestRegionServerCoprocessorExceptionWithAbort { static final Log LOG = LogFactory.getLog(TestRegionServerCoprocessorExceptionWithAbort.class); private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java index 014b689..af1cd59 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorExceptionWithRemove.java @@ -27,6 +27,8 @@ import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.junit.AfterClass; @@ -43,7 +45,7 @@ import static org.junit.Assert.*; * back to the client. * (HBASE-4014). */ -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestRegionServerCoprocessorExceptionWithRemove { public static class BuggyRegionObserver extends SimpleRegionObserver { @SuppressWarnings("null") diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerObserver.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerObserver.java index f9d15c8..5139373 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerObserver.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerObserver.java @@ -32,7 +32,6 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.MetaTableAccessor; @@ -43,6 +42,8 @@ import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.regionserver.RegionMergeTransaction; import org.apache.hadoop.hbase.regionserver.RegionServerCoprocessorHost; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -51,7 +52,7 @@ import org.junit.experimental.categories.Category; * Tests invocation of the {@link org.apache.hadoop.hbase.coprocessor.RegionServerObserver} * interface hooks at all appropriate times during normal HMaster operations. */ -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestRegionServerObserver { private static final Log LOG = LogFactory.getLog(TestRegionServerObserver.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java index 76612ce..8f2a1e3 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java @@ -35,6 +35,8 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; @@ -42,7 +44,6 @@ import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.IsolationLevel; @@ -81,7 +82,7 @@ import com.sun.org.apache.commons.logging.LogFactory; * Verifies ProcessEndpoint works. * The tested RowProcessor performs two scans and a read-modify-write. */ -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestRowProcessorEndpoint { static final Log LOG = LogFactory.getLog(TestRowProcessorEndpoint.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java index 3ce3307..75fe6d2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java @@ -45,7 +45,6 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.regionserver.HRegion; @@ -55,6 +54,8 @@ import org.apache.hadoop.hbase.regionserver.wal.HLogSplitter; import org.apache.hadoop.hbase.regionserver.wal.WALCoprocessorHost; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.testclassification.CoprocessorTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdge; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; @@ -71,7 +72,7 @@ import org.junit.experimental.categories.Category; * {@link org.apache.hadoop.hbase.coprocessor.MasterObserver} interface hooks at * all appropriate times during normal HMaster operations. */ -@Category(MediumTests.class) +@Category({CoprocessorTests.class, MediumTests.class}) public class TestWALObserver { private static final Log LOG = LogFactory.getLog(TestWALObserver.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); @@ -418,4 +419,4 @@ public class TestWALObserver { htd.addFamily(c); return htd; } -} \ No newline at end of file +} diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestForeignExceptionDispatcher.java hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestForeignExceptionDispatcher.java index e5c47b1..229b170 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestForeignExceptionDispatcher.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestForeignExceptionDispatcher.java @@ -22,7 +22,8 @@ import static org.junit.Assert.fail; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; @@ -31,7 +32,7 @@ import org.mockito.Mockito; * Test that we propagate errors through an dispatcher exactly once via different failure * injection mechanisms. */ -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestForeignExceptionDispatcher { private static final Log LOG = LogFactory.getLog(TestForeignExceptionDispatcher.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestForeignExceptionSerialization.java hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestForeignExceptionSerialization.java index 11363fe..f893555 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestForeignExceptionSerialization.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestForeignExceptionSerialization.java @@ -22,7 +22,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -31,7 +32,7 @@ import com.google.protobuf.InvalidProtocolBufferException; /** * Test that we correctly serialize exceptions from a remote source */ -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestForeignExceptionSerialization { private static final String srcName = "someNode"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestTimeoutExceptionInjector.java hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestTimeoutExceptionInjector.java index 641dbe0..49f6164 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestTimeoutExceptionInjector.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/errorhandling/TestTimeoutExceptionInjector.java @@ -21,7 +21,8 @@ import static org.junit.Assert.fail; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; @@ -29,7 +30,7 @@ import org.mockito.Mockito; /** * Test the {@link TimeoutExceptionInjector} to ensure we fulfill contracts */ -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestTimeoutExceptionInjector { private static final Log LOG = LogFactory.getLog(TestTimeoutExceptionInjector.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/executor/TestExecutorService.java hbase-server/src/test/java/org/apache/hadoop/hbase/executor/TestExecutorService.java index faac76e..0561ac4 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/executor/TestExecutorService.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/executor/TestExecutorService.java @@ -32,13 +32,14 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.executor.ExecutorService.Executor; import org.apache.hadoop.hbase.executor.ExecutorService.ExecutorStatus; -import org.apache.hadoop.hbase.executor.ExecutorType; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; import static org.mockito.Mockito.*; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestExecutorService { private static final Log LOG = LogFactory.getLog(TestExecutorService.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestBitComparator.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestBitComparator.java index 423b7a5..21414f0 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestBitComparator.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestBitComparator.java @@ -15,7 +15,8 @@ */ package org.apache.hadoop.hbase.filter; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -24,7 +25,7 @@ import static org.junit.Assert.assertEquals; /** * Tests for the bit comparator */ -@Category(SmallTests.class) +@Category({FilterTests.class, SmallTests.class}) public class TestBitComparator { private static byte[] zeros = new byte[]{0, 0, 0, 0, 0, 0}; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPaginationFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPaginationFilter.java index 9e549c0..4d0329b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPaginationFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPaginationFilter.java @@ -21,9 +21,10 @@ package org.apache.hadoop.hbase.filter; import static org.junit.Assert.assertTrue; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.FilterProtos; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Before; import org.junit.Test; @@ -33,7 +34,7 @@ import org.junit.experimental.categories.Category; * Test for the ColumnPaginationFilter, used mainly to test the successful serialization of the filter. * More test functionality can be found within {@link org.apache.hadoop.hbase.filter.TestFilter#testColumnPaginationFilter()} */ -@Category(SmallTests.class) +@Category({FilterTests.class, SmallTests.class}) public class TestColumnPaginationFilter { private static final byte[] ROW = Bytes.toBytes("row_1_test"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java index 327cabc..0fbad42 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnPrefixFilter.java @@ -33,11 +33,13 @@ import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.InternalScanner; +import org.apache.hadoop.hbase.testclassification.FilterTests; +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({FilterTests.class, SmallTests.class}) public class TestColumnPrefixFilter { private final static HBaseTestingUtility TEST_UTIL = new diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java index c501149..dc96d50 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java @@ -35,6 +35,8 @@ import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Test; import org.junit.After; @@ -115,7 +117,7 @@ class StringRange { } -@Category(MediumTests.class) +@Category({FilterTests.class, MediumTests.class}) public class TestColumnRangeFilter { private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestComparatorSerialization.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestComparatorSerialization.java index c617cc0..223416f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestComparatorSerialization.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestComparatorSerialization.java @@ -24,13 +24,14 @@ import static org.junit.Assert.assertTrue; import java.util.regex.Pattern; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({FilterTests.class, SmallTests.class}) public class TestComparatorSerialization { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java index 757420c..2907088 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestDependentColumnFilter.java @@ -33,6 +33,8 @@ import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; import org.apache.hadoop.hbase.filter.Filter.ReturnCode; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.InternalScanner; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; @@ -44,7 +46,7 @@ import static org.junit.Assert.assertTrue; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({FilterTests.class, SmallTests.class}) public class TestDependentColumnFilter { private final Log LOG = LogFactory.getLog(this.getClass()); private static final byte[][] ROWS = { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilter.java index ec0f989..319b5f5 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilter.java @@ -38,19 +38,19 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; -import org.apache.hadoop.hbase.filter.Filter.ReturnCode; import org.apache.hadoop.hbase.filter.FilterList.Operator; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.InternalScanner; import org.apache.hadoop.hbase.regionserver.RegionScanner; import org.apache.hadoop.hbase.regionserver.wal.HLog; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; import org.junit.Assert; @@ -63,7 +63,7 @@ import com.google.common.base.Throwables; /** * Test filters at the HRegion doorstep. */ -@Category(SmallTests.class) +@Category({FilterTests.class, SmallTests.class}) public class TestFilter { private final static Log LOG = LogFactory.getLog(TestFilter.class); private HRegion region; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java index 8e06f31..b8a3b05 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterList.java @@ -31,12 +31,13 @@ import java.util.List; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; import org.apache.hadoop.hbase.filter.Filter.ReturnCode; import org.apache.hadoop.hbase.filter.FilterList.Operator; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -47,7 +48,7 @@ import com.google.common.collect.Lists; * Tests filter sets * */ -@Category(SmallTests.class) +@Category({FilterTests.class, SmallTests.class}) public class TestFilterList { static final int MAX_PAGES = 2; static final char FIRST_CHAR = 'a'; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterSerialization.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterSerialization.java index c1dde0d..08ce3d5 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterSerialization.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterSerialization.java @@ -24,7 +24,8 @@ import static org.junit.Assert.assertTrue; import java.util.LinkedList; import java.util.TreeSet; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.util.Bytes; @@ -32,7 +33,7 @@ import org.apache.hadoop.hbase.util.Pair; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({FilterTests.class, SmallTests.class}) public class TestFilterSerialization { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterWithScanLimits.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterWithScanLimits.java index 3955d36..504877d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterWithScanLimits.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterWithScanLimits.java @@ -39,7 +39,6 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.MasterNotRunningException; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.ZooKeeperConnectionException; import org.apache.hadoop.hbase.client.HBaseAdmin; @@ -52,6 +51,8 @@ import org.apache.hadoop.hbase.client.ScannerCallable; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.ipc.RpcClient; import org.apache.hadoop.hbase.ipc.RpcServer; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.log4j.Level; import org.junit.AfterClass; @@ -62,7 +63,7 @@ import org.junit.experimental.categories.Category; /** * Test if Filter is incompatible with scan-limits */ -@Category(MediumTests.class) +@Category({FilterTests.class, MediumTests.class}) public class TestFilterWithScanLimits { private static final Log LOG = LogFactory .getLog(TestFilterWithScanLimits.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterWrapper.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterWrapper.java index 46a7042..615fabb 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterWrapper.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFilterWrapper.java @@ -43,6 +43,8 @@ import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; @@ -50,14 +52,13 @@ import org.junit.BeforeClass; import org.junit.Test; import static org.junit.Assert.*; -import org.apache.hadoop.hbase.MediumTests; import org.junit.experimental.categories.Category; /** * Test if the FilterWrapper retains the same semantics defined in the * {@link org.apache.hadoop.hbase.filter.Filter} */ -@Category(MediumTests.class) +@Category({FilterTests.class, MediumTests.class}) public class TestFilterWrapper { private static final Log LOG = LogFactory.getLog(TestFilterWrapper.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFirstKeyValueMatchingQualifiersFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFirstKeyValueMatchingQualifiersFilter.java index 5ee0c9b..fb384a7 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFirstKeyValueMatchingQualifiersFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFirstKeyValueMatchingQualifiersFilter.java @@ -23,11 +23,12 @@ import java.util.TreeSet; import junit.framework.TestCase; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({FilterTests.class, SmallTests.class}) public class TestFirstKeyValueMatchingQualifiersFilter extends TestCase { private static final byte[] ROW = Bytes.toBytes("test"); private static final byte[] COLUMN_FAMILY = Bytes.toBytes("test"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFuzzyRowAndColumnRangeFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFuzzyRowAndColumnRangeFilter.java index d64a5ad..8395817 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFuzzyRowAndColumnRangeFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFuzzyRowAndColumnRangeFilter.java @@ -27,13 +27,14 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; import org.junit.After; @@ -47,7 +48,7 @@ import com.google.common.collect.Lists; /** */ -@Category(MediumTests.class) +@Category({FilterTests.class, MediumTests.class}) public class TestFuzzyRowAndColumnRangeFilter { private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private final Log LOG = LogFactory.getLog(this.getClass()); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFuzzyRowFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFuzzyRowFilter.java index 504b670..4eb53bb 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFuzzyRowFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestFuzzyRowFilter.java @@ -17,12 +17,13 @@ */ package org.apache.hadoop.hbase.filter; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({FilterTests.class, SmallTests.class}) public class TestFuzzyRowFilter { @Test public void testSatisfies() { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestInclusiveStopFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestInclusiveStopFilter.java index f3ab522..e527ca8 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestInclusiveStopFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestInclusiveStopFilter.java @@ -18,12 +18,8 @@ */ package org.apache.hadoop.hbase.filter; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; - -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Before; @@ -31,12 +27,11 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; /** * Tests the inclusive stop row filter */ -@Category(SmallTests.class) +@Category({FilterTests.class, SmallTests.class}) public class TestInclusiveStopFilter { private final byte [] STOP_ROW = Bytes.toBytes("stop_row"); private final byte [] GOOD_ROW = Bytes.toBytes("good_row"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestInvocationRecordFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestInvocationRecordFilter.java index 718f2fd..4288d4e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestInvocationRecordFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestInvocationRecordFilter.java @@ -28,7 +28,6 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; @@ -36,6 +35,8 @@ import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.InternalScanner; import org.apache.hadoop.hbase.regionserver.wal.HLog; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; import org.junit.Assert; @@ -47,7 +48,7 @@ import org.junit.experimental.categories.Category; * Test the invocation logic of the filters. A filter must be invoked only for * the columns that are requested for. */ -@Category(SmallTests.class) +@Category({FilterTests.class, SmallTests.class}) public class TestInvocationRecordFilter { private static final byte[] TABLE_NAME_BYTES = Bytes diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestMultipleColumnPrefixFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestMultipleColumnPrefixFilter.java index 827d204..0db5ecf 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestMultipleColumnPrefixFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestMultipleColumnPrefixFilter.java @@ -33,11 +33,13 @@ import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.InternalScanner; +import org.apache.hadoop.hbase.testclassification.FilterTests; +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({FilterTests.class, SmallTests.class}) public class TestMultipleColumnPrefixFilter { private final static HBaseTestingUtility TEST_UTIL = new diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestNullComparator.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestNullComparator.java index 62639b8..2f13da1 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestNullComparator.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestNullComparator.java @@ -16,12 +16,13 @@ package org.apache.hadoop.hbase.filter; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({FilterTests.class, SmallTests.class}) public class TestNullComparator { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestPageFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestPageFilter.java index 24bedc8..139bf6f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestPageFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestPageFilter.java @@ -24,14 +24,15 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; /** * Tests for the page filter */ -@Category(SmallTests.class) +@Category({FilterTests.class, SmallTests.class}) public class TestPageFilter { static final int ROW_LIMIT = 3; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestParseFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestParseFilter.java index dd93b91..132cf9e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestParseFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestParseFilter.java @@ -21,20 +21,11 @@ package org.apache.hadoop.hbase.filter; import static org.junit.Assert.*; import java.io.IOException; -import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -import org.apache.hadoop.hbase.*; -import org.apache.hadoop.hbase.client.Put; -import org.apache.hadoop.hbase.client.Scan; -import org.apache.hadoop.hbase.regionserver.HRegion; -import org.apache.hadoop.hbase.regionserver.InternalScanner; + +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; import org.junit.Before; @@ -46,7 +37,7 @@ import org.junit.experimental.categories.Category; * It tests the entire work flow from when a string is given by the user * and how it is parsed to construct the corresponding Filter object */ -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestParseFilter { ParseFilter f; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestPrefixFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestPrefixFilter.java index ffdf6bb..02a55ba 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestPrefixFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestPrefixFilter.java @@ -19,20 +19,16 @@ package org.apache.hadoop.hbase.filter; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; - import static org.junit.Assert.*; -@Category(SmallTests.class) +@Category({FilterTests.class, SmallTests.class}) public class TestPrefixFilter { Filter mainFilter; static final char FIRST_CHAR = 'a'; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestRandomRowFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestRandomRowFilter.java index b192262..8effca5 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestRandomRowFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestRandomRowFilter.java @@ -19,12 +19,8 @@ package org.apache.hadoop.hbase.filter; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; - -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Before; import org.junit.Test; @@ -32,7 +28,7 @@ import org.junit.experimental.categories.Category; import static org.junit.Assert.*; -@Category(SmallTests.class) +@Category({FilterTests.class, SmallTests.class}) public class TestRandomRowFilter { protected RandomRowFilter quarterChanceFilter; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestSingleColumnValueExcludeFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestSingleColumnValueExcludeFilter.java index af7e196..7aa298c 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestSingleColumnValueExcludeFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestSingleColumnValueExcludeFilter.java @@ -20,8 +20,9 @@ package org.apache.hadoop.hbase.filter; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; +import org.apache.hadoop.hbase.testclassification.FilterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -37,7 +38,7 @@ import java.util.ArrayList; * tested. That is, method filterKeyValue(KeyValue). * */ -@Category(SmallTests.class) +@Category({FilterTests.class, SmallTests.class}) public class TestSingleColumnValueExcludeFilter { private static final byte[] ROW = Bytes.toBytes("test"); private static final byte[] COLUMN_FAMILY = Bytes.toBytes("test"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestSingleColumnValueFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestSingleColumnValueFilter.java index ceaff9c..17f8c83 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestSingleColumnValueFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestSingleColumnValueFilter.java @@ -24,8 +24,9 @@ import static org.junit.Assert.assertTrue; import java.util.regex.Pattern; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; +import org.apache.hadoop.hbase.testclassification.FilterTests; +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 the value filter */ -@Category(SmallTests.class) +@Category({FilterTests.class, SmallTests.class}) public class TestSingleColumnValueFilter { private static final byte[] ROW = Bytes.toBytes("test"); private static final byte[] COLUMN_FAMILY = Bytes.toBytes("test"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/fs/TestBlockReorder.java hbase-server/src/test/java/org/apache/hadoop/hbase/fs/TestBlockReorder.java index f83fbf3..f21176b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/fs/TestBlockReorder.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/fs/TestBlockReorder.java @@ -37,12 +37,13 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.regionserver.wal.HLogUtil; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hdfs.DFSClient; import org.apache.hadoop.hdfs.DistributedFileSystem; @@ -64,7 +65,7 @@ import org.junit.experimental.categories.Category; /** * Tests for the hdfs fix from HBASE-6435. */ -@Category(LargeTests.class) +@Category({MiscTests.class, LargeTests.class}) public class TestBlockReorder { private static final Log LOG = LogFactory.getLog(TestBlockReorder.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/http/HttpServerFunctionalTest.java hbase-server/src/test/java/org/apache/hadoop/hbase/http/HttpServerFunctionalTest.java index 8844386..5c832be 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/http/HttpServerFunctionalTest.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/http/HttpServerFunctionalTest.java @@ -21,10 +21,7 @@ package org.apache.hadoop.hbase.http; import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.security.authorize.AccessControlList; import org.junit.Assert; -import org.junit.experimental.categories.Category; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.http.HttpServer; import org.apache.hadoop.hbase.http.HttpServer.Builder; import java.io.File; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestGlobalFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestGlobalFilter.java index 3f0260b..b06dea1 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestGlobalFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestGlobalFilter.java @@ -36,15 +36,13 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.http.FilterContainer; -import org.apache.hadoop.hbase.http.FilterInitializer; -import org.apache.hadoop.hbase.http.HttpServer; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.net.NetUtils; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestGlobalFilter extends HttpServerFunctionalTest { static final Log LOG = LogFactory.getLog(HttpServer.class); static final Set RECORDS = new TreeSet(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHtmlQuoting.java hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHtmlQuoting.java index 969668c..82fbe04 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHtmlQuoting.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHtmlQuoting.java @@ -21,14 +21,13 @@ import static org.junit.Assert.*; import javax.servlet.http.HttpServletRequest; -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.http.HtmlQuoting; -import org.apache.hadoop.hbase.http.HttpServer; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestHtmlQuoting { @Test public void testNeedsQuoting() throws Exception { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpRequestLog.java hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpRequestLog.java index db6cd1b..8fea254 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpRequestLog.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpRequestLog.java @@ -17,9 +17,8 @@ */ package org.apache.hadoop.hbase.http; -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.http.HttpRequestLog; -import org.apache.hadoop.hbase.http.HttpRequestLogAppender; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.log4j.Logger; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -30,7 +29,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestHttpRequestLog { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpRequestLogAppender.java hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpRequestLogAppender.java index 208cbaa..a17b9e9 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpRequestLogAppender.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpRequestLogAppender.java @@ -17,14 +17,14 @@ */ package org.apache.hadoop.hbase.http; -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.http.HttpRequestLogAppender; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestHttpRequestLogAppender { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServer.java hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServer.java index b92eabc..ffb924c 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServer.java @@ -54,7 +54,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeys; -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.http.HttpServer.QuotingInputFilter.RequestQuoter; import org.apache.hadoop.hbase.http.resource.JerseyResource; import org.apache.hadoop.net.NetUtils; @@ -72,7 +73,7 @@ import org.mockito.internal.util.reflection.Whitebox; import org.mortbay.jetty.Connector; import org.mortbay.util.ajax.JSON; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestHttpServer extends HttpServerFunctionalTest { static final Log LOG = LogFactory.getLog(TestHttpServer.class); private static HttpServer server; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServerLifecycle.java hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServerLifecycle.java index 2d139e1..623a157 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServerLifecycle.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServerLifecycle.java @@ -17,14 +17,13 @@ */ package org.apache.hadoop.hbase.http; -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.http.HttpRequestLogAppender; -import org.apache.hadoop.hbase.http.HttpServer; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.log4j.Logger; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestHttpServerLifecycle extends HttpServerFunctionalTest { /** diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServerWebapps.java hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServerWebapps.java index ce6da2b..db394a8 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServerWebapps.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServerWebapps.java @@ -17,19 +17,19 @@ */ package org.apache.hadoop.hbase.http; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.Log; -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.http.HttpServer; import java.io.FileNotFoundException; /** * Test webapp loading */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestHttpServerWebapps extends HttpServerFunctionalTest { private static final Log log = LogFactory.getLog(TestHttpServerWebapps.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestPathFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestPathFilter.java index 9fade20..5854ea2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestPathFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestPathFilter.java @@ -36,15 +36,13 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.http.FilterContainer; -import org.apache.hadoop.hbase.http.FilterInitializer; -import org.apache.hadoop.hbase.http.HttpServer; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.net.NetUtils; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestPathFilter extends HttpServerFunctionalTest { static final Log LOG = LogFactory.getLog(HttpServer.class); static final Set RECORDS = new TreeSet(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestSSLHttpServer.java hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestSSLHttpServer.java index 8244ba9..1b79aff 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestSSLHttpServer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestSSLHttpServer.java @@ -29,7 +29,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileUtil; -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.http.ssl.KeyStoreTestUtil; import org.apache.hadoop.io.IOUtils; import org.apache.hadoop.net.NetUtils; @@ -44,7 +45,7 @@ import org.junit.experimental.categories.Category; * HTTPS using the created certficates and calls an echo servlet using the * corresponding HTTPS URL. */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestSSLHttpServer extends HttpServerFunctionalTest { private static final String BASEDIR = System.getProperty("test.build.dir", "target/test-dir") + "/" + TestSSLHttpServer.class.getSimpleName(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestServletFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestServletFilter.java index 631bd09..f9857e4 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestServletFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestServletFilter.java @@ -36,13 +36,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.GenericTestUtils; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.net.NetUtils; import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestServletFilter extends HttpServerFunctionalTest { static final Log LOG = LogFactory.getLog(HttpServer.class); static volatile String uri = null; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/http/conf/TestConfServlet.java hbase-server/src/test/java/org/apache/hadoop/hbase/http/conf/TestConfServlet.java index f805cd6..0385355 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/http/conf/TestConfServlet.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/http/conf/TestConfServlet.java @@ -27,8 +27,8 @@ import javax.xml.parsers.DocumentBuilderFactory; import junit.framework.TestCase; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.http.conf.ConfServlet; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mortbay.util.ajax.JSON; @@ -42,7 +42,7 @@ import org.xml.sax.InputSource; * Basic test case that the ConfServlet can write configuration * to its output in XML and JSON format. */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestConfServlet extends TestCase { private static final String TEST_KEY = "testconfservlet.key"; private static final String TEST_VAL = "testval"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/http/jmx/TestJMXJsonServlet.java hbase-server/src/test/java/org/apache/hadoop/hbase/http/jmx/TestJMXJsonServlet.java index b95feba..031ddce 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/http/jmx/TestJMXJsonServlet.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/http/jmx/TestJMXJsonServlet.java @@ -23,7 +23,8 @@ import java.util.regex.Pattern; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -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.http.HttpServer; import org.apache.hadoop.hbase.http.HttpServerFunctionalTest; import org.junit.AfterClass; @@ -31,7 +32,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestJMXJsonServlet extends HttpServerFunctionalTest { private static final Log LOG = LogFactory.getLog(TestJMXJsonServlet.class); private static HttpServer server; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/http/lib/TestStaticUserWebFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/http/lib/TestStaticUserWebFilter.java index 998c852..81bcbd5 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/http/lib/TestStaticUserWebFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/http/lib/TestStaticUserWebFilter.java @@ -28,7 +28,8 @@ import javax.servlet.http.HttpServletRequestWrapper; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeys; -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.http.ServerConfigurationKeys; import org.apache.hadoop.hbase.http.lib.StaticUserWebFilter.StaticUserFilter; import org.junit.Test; @@ -36,7 +37,7 @@ import org.junit.experimental.categories.Category; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestStaticUserWebFilter { private FilterConfig mockConfig(String username) { FilterConfig mock = Mockito.mock(FilterConfig.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/http/log/TestLogLevel.java hbase-server/src/test/java/org/apache/hadoop/hbase/http/log/TestLogLevel.java index a60437c..d7942d1 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/http/log/TestLogLevel.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/http/log/TestLogLevel.java @@ -22,9 +22,9 @@ import static org.junit.Assert.assertTrue; import java.io.*; import java.net.*; -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.http.HttpServer; -import org.apache.hadoop.hbase.http.log.LogLevel; import org.apache.hadoop.net.NetUtils; import org.apache.commons.logging.*; import org.apache.commons.logging.impl.*; @@ -32,7 +32,7 @@ import org.apache.log4j.*; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestLogLevel { static final PrintStream out = System.out; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestFileLink.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestFileLink.java index 570727a..777b3cd 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestFileLink.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestFileLink.java @@ -33,7 +33,8 @@ import org.apache.hadoop.fs.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hdfs.MiniDFSCluster; import org.junit.Test; @@ -43,7 +44,7 @@ import org.junit.experimental.categories.Category; * Test that FileLink switches between alternate locations * when the current location moves or gets deleted. */ -@Category(MediumTests.class) +@Category({IOTests.class, MediumTests.class}) public class TestFileLink { /** * Test, on HDFS, that the FileLink is still readable diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java index 7f25005..f2b26c1 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHFileLink.java @@ -18,31 +18,17 @@ package org.apache.hadoop.hbase.io; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.FSDataInputStream; -import org.apache.hadoop.fs.FSDataOutputStream; -import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.regionserver.HRegion; -import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; -import org.apache.hadoop.hbase.util.HFileArchiveUtil; import org.apache.hadoop.hbase.util.Pair; -import org.apache.hadoop.hdfs.MiniDFSCluster; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; import java.util.regex.Matcher; import static org.junit.Assert.assertEquals; @@ -53,7 +39,7 @@ import static org.junit.Assert.assertTrue; * Test that FileLink switches between alternate locations * when the current location moves or gets deleted. */ -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestHFileLink { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java index eb0023e..18595a8 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java @@ -34,19 +34,20 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.io.hfile.CacheConfig; import org.apache.hadoop.hbase.io.hfile.HFile; import org.apache.hadoop.hbase.io.hfile.HFileContext; import org.apache.hadoop.hbase.io.hfile.HFileContextBuilder; import org.apache.hadoop.hbase.io.hfile.HFileScanner; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestHalfStoreFileReader { private static HBaseTestingUtility TEST_UTIL; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java index 7f4ca52..578af7e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java @@ -38,7 +38,6 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.io.hfile.BlockCacheKey; @@ -49,6 +48,8 @@ import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HStore; import org.apache.hadoop.hbase.regionserver.KeyValueSkipListSet; import org.apache.hadoop.hbase.regionserver.TimeRangeTracker; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.ClassSize; import org.junit.BeforeClass; import org.junit.Test; @@ -60,7 +61,7 @@ import static org.junit.Assert.assertEquals; * Testing the sizing that HeapSize offers and compares to the size given by * ClassSize. */ -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestHeapSize { static final Log LOG = LogFactory.getLog(TestHeapSize.class); // List of classes implementing HeapSize diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestImmutableBytesWritable.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestImmutableBytesWritable.java index 9c306ae..5716197 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestImmutableBytesWritable.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestImmutableBytesWritable.java @@ -21,7 +21,8 @@ package org.apache.hadoop.hbase.io; import junit.framework.TestCase; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.experimental.categories.Category; @@ -29,7 +30,7 @@ import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestImmutableBytesWritable extends TestCase { public void testHash() throws Exception { assertEquals( diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestReference.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestReference.java index ae1fc49..80295ff 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestReference.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestReference.java @@ -23,14 +23,15 @@ import java.io.IOException; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; /** * Reference tests that run on local fs. */ -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestReference { private final HBaseTestingUtility HTU = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestBufferedDataBlockEncoder.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestBufferedDataBlockEncoder.java index 31e3b14..9330cea 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestBufferedDataBlockEncoder.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestBufferedDataBlockEncoder.java @@ -18,11 +18,12 @@ package org.apache.hadoop.hbase.io.encoding; import static org.junit.Assert.assertEquals; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.IOTests; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({IOTests.class, MediumTests.class}) public class TestBufferedDataBlockEncoder { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestChangingEncoding.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestChangingEncoding.java index b7bb02c..c961e4e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestChangingEncoding.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestChangingEncoding.java @@ -34,7 +34,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Get; @@ -44,6 +43,8 @@ import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Threads; import org.junit.After; @@ -56,7 +57,7 @@ import org.junit.experimental.categories.Category; /** * Tests changing data block encoding settings of a column family. */ -@Category(LargeTests.class) +@Category({IOTests.class, LargeTests.class}) public class TestChangingEncoding { private static final Log LOG = LogFactory.getLog(TestChangingEncoding.class); static final String CF = "EncodingTestCF"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java index 15c32ba..cabb67f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestDataBlockEncoders.java @@ -35,12 +35,13 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValue.Type; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.io.compress.Compression; import org.apache.hadoop.hbase.io.hfile.HFileBlock.Writer.BufferGrabbingByteArrayOutputStream; import org.apache.hadoop.hbase.io.hfile.HFileContext; import org.apache.hadoop.hbase.io.hfile.HFileContextBuilder; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.test.RedundantKVGenerator; import org.junit.Test; @@ -53,7 +54,7 @@ import org.junit.runners.Parameterized.Parameters; * Test all of the data block encoding algorithms for correctness. Most of the * class generate data which will test different branches in code. */ -@Category(LargeTests.class) +@Category({IOTests.class, LargeTests.class}) @RunWith(Parameterized.class) public class TestDataBlockEncoders { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java index bc87acd..86c210d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestEncodedSeekers.java @@ -29,7 +29,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; @@ -39,6 +38,8 @@ import org.apache.hadoop.hbase.io.hfile.HFile; import org.apache.hadoop.hbase.io.hfile.LruBlockCache; import org.apache.hadoop.hbase.regionserver.BloomType; import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Strings; import org.apache.hadoop.hbase.util.test.LoadTestKVGenerator; @@ -51,7 +52,7 @@ import org.junit.runners.Parameterized.Parameters; /** * Tests encoded seekers by loading and reading values. */ -@Category(MediumTests.class) +@Category({IOTests.class, MediumTests.class}) @RunWith(Parameterized.class) public class TestEncodedSeekers { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestLoadAndSwitchEncodeOnDisk.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestLoadAndSwitchEncodeOnDisk.java index 0ebef3b..26183ac 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestLoadAndSwitchEncodeOnDisk.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestLoadAndSwitchEncodeOnDisk.java @@ -24,7 +24,8 @@ import java.util.NavigableMap; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; @@ -43,7 +44,7 @@ import org.junit.runners.Parameterized.Parameters; /** * Uses the load tester */ -@Category(MediumTests.class) +@Category({IOTests.class, MediumTests.class}) public class TestLoadAndSwitchEncodeOnDisk extends TestMiniClusterLoadSequential { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestPrefixTree.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestPrefixTree.java index 710aed9..d5e479b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestPrefixTree.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestPrefixTree.java @@ -26,7 +26,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.HTable; @@ -35,6 +34,8 @@ import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -43,7 +44,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TestName; -@Category(MediumTests.class) +@Category({IOTests.class, MediumTests.class}) public class TestPrefixTree { private static final String row4 = "a-b-B-2-1402397300-1402416535"; private static final byte[] row4_bytes = Bytes.toBytes(row4); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestPrefixTreeEncoding.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestPrefixTreeEncoding.java index 034771c..facafa3 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestPrefixTreeEncoding.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestPrefixTreeEncoding.java @@ -38,13 +38,14 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.codec.prefixtree.PrefixTreeCodec; import org.apache.hadoop.hbase.io.compress.Compression.Algorithm; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoder.EncodedSeeker; import org.apache.hadoop.hbase.io.hfile.HFileContext; import org.apache.hadoop.hbase.io.hfile.HFileContextBuilder; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.CollectionBackedScanner; import org.junit.Assert; @@ -59,7 +60,7 @@ import org.junit.runners.Parameterized.Parameters; * Tests scanning/seeking data with PrefixTree Encoding. */ @RunWith(Parameterized.class) -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestPrefixTreeEncoding { private static final Log LOG = LogFactory.getLog(TestPrefixTreeEncoding.class); private static final String CF = "EncodingTestCF"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestSeekToBlockWithEncoders.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestSeekToBlockWithEncoders.java index ab60c8b..c053449 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestSeekToBlockWithEncoders.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestSeekToBlockWithEncoders.java @@ -27,15 +27,16 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.io.compress.Compression; import org.apache.hadoop.hbase.io.hfile.HFileContext; import org.apache.hadoop.hbase.io.hfile.HFileContextBuilder; +import org.apache.hadoop.hbase.testclassification.IOTests; +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({IOTests.class, SmallTests.class}) public class TestSeekToBlockWithEncoders { /** diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java index aca0021..4080249 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestBlockCacheReporting.java @@ -28,7 +28,8 @@ 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.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.io.hfile.TestCacheConfig.DataCacheEntry; import org.apache.hadoop.hbase.io.hfile.TestCacheConfig.IndexCacheEntry; import org.codehaus.jackson.JsonGenerationException; @@ -38,7 +39,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestBlockCacheReporting { private static final Log LOG = LogFactory.getLog(TestBlockCacheReporting.class); private Configuration conf; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheConfig.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheConfig.java index 2aacc67..c5fcc3c 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheConfig.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheConfig.java @@ -35,7 +35,8 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.io.hfile.bucket.BucketCache; import org.apache.hadoop.hbase.util.Threads; import org.junit.After; @@ -50,7 +51,7 @@ import org.junit.experimental.categories.Category; // (seconds). It is large because it depends on being able to reset the global // blockcache instance which is in a global variable. Experience has it that // tests clash on the global variable if this test is run as small sized test. -@Category(LargeTests.class) +@Category({IOTests.class, LargeTests.class}) public class TestCacheConfig { private static final Log LOG = LogFactory.getLog(TestCacheConfig.class); private Configuration conf; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java index d8c8669..fbbccf2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java @@ -41,7 +41,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.fs.HFileSystem; @@ -50,6 +49,8 @@ import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.regionserver.BloomType; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.StoreFile; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.BloomFilterFactory; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.ChecksumType; @@ -67,7 +68,7 @@ import org.junit.runners.Parameterized.Parameters; * types: data blocks, non-root index blocks, and Bloom filter blocks. */ @RunWith(Parameterized.class) -@Category(MediumTests.class) +@Category({IOTests.class, MediumTests.class}) public class TestCacheOnWrite { private static final Log LOG = LogFactory.getLog(TestCacheOnWrite.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java index 1bec7f4..600b407 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java @@ -21,10 +21,11 @@ package org.apache.hadoop.hbase.io.hfile; import java.nio.ByteBuffer; import junit.framework.TestCase; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestCachedBlockQueue extends TestCase { public void testQueue() throws Exception { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestChecksum.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestChecksum.java index 8b29ea1..00c6aa5 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestChecksum.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestChecksum.java @@ -37,7 +37,8 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.fs.HFileSystem; import org.apache.hadoop.hbase.io.FSDataInputStreamWrapper; import org.apache.hadoop.hbase.io.compress.Compression; @@ -46,7 +47,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestChecksum { // change this value to activate more logs private static final boolean detailedLogging = true; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestFixedFileTrailer.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestFixedFileTrailer.java index 4d17650..1b6731a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestFixedFileTrailer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestFixedFileTrailer.java @@ -28,6 +28,8 @@ import java.util.Collection; import java.util.List; import org.apache.hadoop.hbase.*; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Before; import org.junit.Test; @@ -46,7 +48,7 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @RunWith(Parameterized.class) -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestFixedFileTrailer { private static final Log LOG = LogFactory.getLog(TestFixedFileTrailer.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestForceCacheImportantBlocks.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestForceCacheImportantBlocks.java index 35b4c61..2af3a6e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestForceCacheImportantBlocks.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestForceCacheImportantBlocks.java @@ -25,7 +25,8 @@ import java.util.Collection; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.io.compress.Compression; @@ -49,7 +50,7 @@ import org.junit.runners.Parameterized.Parameters; * need to reveal more about what is being cached whether DATA or INDEX blocks and then we could * do more verification in this test. */ -@Category(MediumTests.class) +@Category({IOTests.class, MediumTests.class}) @RunWith(Parameterized.class) public class TestForceCacheImportantBlocks { private final HBaseTestingUtility TEST_UTIL = HBaseTestingUtility.createLocalHTU(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java index 11ac986..4b14d14 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java @@ -37,11 +37,12 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValue.Type; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.io.compress.Compression; import org.apache.hadoop.hbase.io.hfile.HFile.Reader; import org.apache.hadoop.hbase.io.hfile.HFile.Writer; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.Writable; import org.junit.experimental.categories.Category; @@ -54,7 +55,7 @@ import org.junit.experimental.categories.Category; * Remove after tfile is committed and use the tfile version of this class * instead.

*/ -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestHFile extends HBaseTestCase { static final Log LOG = LogFactory.getLog(TestHFile.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java index 96247c2..254af72 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlock.java @@ -50,12 +50,13 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.fs.HFileSystem; 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.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.ChecksumType; import org.apache.hadoop.hbase.util.ClassSize; @@ -69,7 +70,7 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; import org.mockito.Mockito; -@Category(MediumTests.class) +@Category({IOTests.class, MediumTests.class}) @RunWith(Parameterized.class) public class TestHFileBlock { // change this value to activate more logs diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockCompatibility.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockCompatibility.java index 166e2cb..d52be19 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockCompatibility.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockCompatibility.java @@ -39,7 +39,6 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.fs.HFileSystem; import org.apache.hadoop.hbase.io.FSDataInputStreamWrapper; import org.apache.hadoop.hbase.io.compress.Compression; @@ -47,6 +46,8 @@ import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext; import org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext; import org.apache.hadoop.hbase.io.hfile.HFileBlock.BlockWritable; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.ChecksumType; import org.apache.hadoop.io.WritableUtils; @@ -64,7 +65,7 @@ import com.google.common.base.Preconditions; * This class has unit tests to prove that older versions of * HFiles (without checksums) are compatible with current readers. */ -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) @RunWith(Parameterized.class) public class TestHFileBlockCompatibility { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java index 1e0d9e6..d30b2cf 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileBlockIndex.java @@ -46,12 +46,13 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.fs.HFileSystem; import org.apache.hadoop.hbase.io.compress.Compression; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.io.hfile.HFileBlockIndex.BlockIndexChunk; import org.apache.hadoop.hbase.io.hfile.HFileBlockIndex.BlockIndexReader; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.ClassSize; import org.junit.Before; @@ -62,7 +63,7 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @RunWith(Parameterized.class) -@Category(MediumTests.class) +@Category({IOTests.class, MediumTests.class}) public class TestHFileBlockIndex { @Parameters diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileDataBlockEncoder.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileDataBlockEncoder.java index 3f2c84b..3cdc92b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileDataBlockEncoder.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileDataBlockEncoder.java @@ -29,13 +29,14 @@ import java.util.List; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.io.HeapSize; import org.apache.hadoop.hbase.io.compress.Compression.Algorithm; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext; import org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext; import org.apache.hadoop.hbase.io.hfile.HFileBlock.Writer.BufferGrabbingByteArrayOutputStream; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.ChecksumType; import org.apache.hadoop.hbase.util.test.RedundantKVGenerator; import org.junit.Test; @@ -45,7 +46,7 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @RunWith(Parameterized.class) -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestHFileDataBlockEncoder { private HFileDataBlockEncoder blockEncoder; private RedundantKVGenerator generator = new RedundantKVGenerator(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileEncryption.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileEncryption.java index 6ec45a6..78193b5 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileEncryption.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileEncryption.java @@ -36,12 +36,13 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.io.compress.Compression; import org.apache.hadoop.hbase.io.crypto.Cipher; import org.apache.hadoop.hbase.io.crypto.Encryption; import org.apache.hadoop.hbase.io.crypto.KeyProviderForTesting; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.test.RedundantKVGenerator; import org.junit.BeforeClass; @@ -50,7 +51,7 @@ import org.junit.experimental.categories.Category; import static org.junit.Assert.*; -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestHFileEncryption { private static final Log LOG = LogFactory.getLog(TestHFileEncryption.class); private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileInlineToRootChunkConversion.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileInlineToRootChunkConversion.java index 23334ac..4c60217 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileInlineToRootChunkConversion.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileInlineToRootChunkConversion.java @@ -24,7 +24,8 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -40,7 +41,7 @@ import org.junit.experimental.categories.Category; * another entry to the root-level block, and that would prevent us from upgrading the leaf-level * chunk to the root chunk, thus not triggering the bug. */ -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestHFileInlineToRootChunkConversion { private final HBaseTestingUtility testUtil = new HBaseTestingUtility(); private final Configuration conf = testUtil.getConfiguration(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java index 2bdffa1..8cc10e6 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFilePerformance.java @@ -34,7 +34,6 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.io.crypto.Encryption; import org.apache.hadoop.hbase.io.crypto.KeyProviderForTesting; import org.apache.hadoop.hbase.io.crypto.aes.AES; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java index 7310525..426e1de 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileSeek.java @@ -42,9 +42,10 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.RawLocalFileSystem; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.io.hfile.HFile.Reader; import org.apache.hadoop.hbase.io.hfile.HFile.Writer; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.io.BytesWritable; import org.junit.experimental.categories.Category; @@ -56,7 +57,7 @@ import org.junit.experimental.categories.Category; * Remove after tfile is committed and use the tfile version of this class * instead.

*/ -@Category(MediumTests.class) +@Category({IOTests.class, MediumTests.class}) public class TestHFileSeek extends TestCase { private static final boolean USE_PREAD = true; private MyOptions options; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileWriterV2.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileWriterV2.java index b27f5b3..12b0639 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileWriterV2.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileWriterV2.java @@ -41,10 +41,11 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValue.KVComparator; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.io.compress.Compression; import org.apache.hadoop.hbase.io.compress.Compression.Algorithm; import org.apache.hadoop.hbase.io.hfile.HFile.FileInfo; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Writables; import org.apache.hadoop.io.Text; @@ -57,7 +58,7 @@ import org.junit.experimental.categories.Category; * Testing writing a version 2 {@link HFile}. This is a low-level test written * during the development of {@link HFileWriterV2}. */ -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestHFileWriterV2 { private static final Log LOG = LogFactory.getLog(TestHFileWriterV2.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileWriterV3.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileWriterV3.java index b19efff..471a44d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileWriterV3.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileWriterV3.java @@ -42,11 +42,12 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValue.KVComparator; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.io.compress.Compression; import org.apache.hadoop.hbase.io.compress.Compression.Algorithm; import org.apache.hadoop.hbase.io.hfile.HFile.FileInfo; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Writables; import org.apache.hadoop.io.Text; @@ -63,7 +64,7 @@ import org.junit.runners.Parameterized.Parameters; * during the development of {@link HFileWriterV3}. */ @RunWith(Parameterized.class) -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestHFileWriterV3 { private static final Log LOG = LogFactory.getLog(TestHFileWriterV3.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLazyDataBlockDecompression.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLazyDataBlockDecompression.java index e752dd2..2fd3684 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLazyDataBlockDecompression.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLazyDataBlockDecompression.java @@ -27,9 +27,10 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.io.FSDataInputStreamWrapper; import org.apache.hadoop.hbase.io.compress.Compression; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; import org.junit.Before; @@ -51,7 +52,7 @@ import static org.junit.Assert.*; * A kind of integration test at the intersection of {@link HFileBlock}, {@link CacheConfig}, * and {@link LruBlockCache}. */ -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) @RunWith(Parameterized.class) public class TestLazyDataBlockDecompression { private static final Log LOG = LogFactory.getLog(TestLazyDataBlockDecompression.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java index 29e2dd6..ec60bcd 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java @@ -24,7 +24,8 @@ import static org.junit.Assert.assertTrue; import java.nio.ByteBuffer; import java.util.Random; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.io.HeapSize; import org.apache.hadoop.hbase.io.hfile.LruBlockCache.EvictionThread; import org.apache.hadoop.hbase.util.ClassSize; @@ -38,7 +39,7 @@ import org.junit.experimental.categories.Category; * evictions run when they're supposed to and do what they should, * and that cached blocks are accessible when expected to be. */ -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestLruBlockCache { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruCachedBlock.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruCachedBlock.java index a2baf55..141c95b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruCachedBlock.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruCachedBlock.java @@ -20,13 +20,14 @@ package org.apache.hadoop.hbase.io.hfile; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestLruCachedBlock { LruCachedBlock block; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestPrefetch.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestPrefetch.java index 6e0a2ca..4ceafb4 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestPrefetch.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestPrefetch.java @@ -29,15 +29,16 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.fs.HFileSystem; import org.apache.hadoop.hbase.regionserver.StoreFile; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestPrefetch { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java index 596387a..3a0fdf7 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestReseekTo.java @@ -29,8 +29,9 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.Tag; +import org.apache.hadoop.hbase.testclassification.IOTests; +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 +39,7 @@ import org.junit.experimental.categories.Category; /** * Test {@link HFileScanner#reseekTo(byte[])} */ -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestReseekTo { private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingKeyRange.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingKeyRange.java index 4eb4fd1..55aa97b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingKeyRange.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingKeyRange.java @@ -32,7 +32,8 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Scan; @@ -51,7 +52,7 @@ import org.junit.runners.Parameterized.Parameters; * Test the optimization that does not scan files where all key ranges are excluded. */ @RunWith(Parameterized.class) -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestScannerSelectionUsingKeyRange { private static final HBaseTestingUtility TEST_UTIL = HBaseTestingUtility.createLocalHTU(); private static TableName TABLE = TableName.valueOf("myTable"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.java index af982d0..e31ebb9 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.java @@ -33,13 +33,13 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HStore; import org.apache.hadoop.hbase.regionserver.InternalScanner; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.Threads; @@ -54,7 +54,7 @@ import org.junit.runners.Parameterized.Parameters; * expired. */ @RunWith(Parameterized.class) -@Category(MediumTests.class) +@Category({IOTests.class, MediumTests.class}) public class TestScannerSelectionUsingTTL { private static final Log LOG = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java index 9297e64..b7be1bb 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestSeekTo.java @@ -27,15 +27,16 @@ import org.apache.hadoop.hbase.HBaseTestCase; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.Tag; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.experimental.categories.Category; /** * Test {@link HFileScanner#seekTo(byte[])} and its variants. */ -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestSeekTo extends HBaseTestCase { static boolean switchKVs = false; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.java index c526834..d29be01 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketCache.java @@ -27,7 +27,8 @@ import java.util.Arrays; import java.util.List; import java.util.Random; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.io.hfile.BlockCacheKey; import org.apache.hadoop.hbase.io.hfile.CacheTestUtils; import org.apache.hadoop.hbase.io.hfile.Cacheable; @@ -47,7 +48,7 @@ import org.junit.runners.Parameterized; * concurrency */ @RunWith(Parameterized.class) -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestBucketCache { private static final Random RAND = new Random(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketWriterThread.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketWriterThread.java index 8a6296a..32227a1 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketWriterThread.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestBucketWriterThread.java @@ -18,7 +18,8 @@ */ package org.apache.hadoop.hbase.io.hfile.bucket; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.io.hfile.BlockCacheKey; import org.apache.hadoop.hbase.io.hfile.Cacheable; import org.apache.hadoop.hbase.io.hfile.bucket.BucketCache.BucketEntry; @@ -43,7 +44,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestBucketWriterThread { public static final int MAX_NUMBER_OF_TRIES_BEFORE_TEST_FAILURE = 1000000; private BucketCache bc; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestByteBufferIOEngine.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestByteBufferIOEngine.java index aa1bf15..511f942 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestByteBufferIOEngine.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestByteBufferIOEngine.java @@ -22,14 +22,15 @@ import static org.junit.Assert.assertTrue; import java.nio.ByteBuffer; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; /** * Basic test for {@link ByteBufferIOEngine} */ -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestByteBufferIOEngine { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.java hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.java index 49c1971..8306114 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/bucket/TestFileIOEngine.java @@ -24,15 +24,15 @@ import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.io.hfile.bucket.FileIOEngine; +import org.apache.hadoop.hbase.testclassification.IOTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; /** * Basic test for {@link FileIOEngine} */ -@Category(SmallTests.class) +@Category({IOTests.class, SmallTests.class}) public class TestFileIOEngine { @Test public void testFileIOEngine() throws IOException { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestBufferChain.java hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestBufferChain.java index 465bc04..e8f6464 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestBufferChain.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestBufferChain.java @@ -25,7 +25,8 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.channels.FileChannel; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RPCTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; import org.junit.Before; @@ -36,7 +37,7 @@ import org.mockito.Mockito; import com.google.common.base.Charsets; import com.google.common.io.Files; -@Category(SmallTests.class) +@Category({RPCTests.class, SmallTests.class}) public class TestBufferChain { private File tmpFile; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestCallRunner.java hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestCallRunner.java index 075fb02..be16529 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestCallRunner.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestCallRunner.java @@ -17,13 +17,14 @@ */ package org.apache.hadoop.hbase.ipc; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RPCTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.security.UserProvider; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; -@Category(SmallTests.class) +@Category({RPCTests.class, SmallTests.class}) public class TestCallRunner { /** * Does nothing but exercise a {@link CallRunner} outside of {@link RpcServer} context. diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java index e3d9e68..5fb48ae 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestDelayedRpc.java @@ -33,7 +33,8 @@ 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.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RPCTests; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.ipc.protobuf.generated.TestDelayedRpcProtos; import org.apache.hadoop.hbase.ipc.protobuf.generated.TestDelayedRpcProtos.TestArg; @@ -57,7 +58,7 @@ import com.google.protobuf.ServiceException; * be delayed. Check that the last two, which are undelayed, return before the * first one. */ -@Category(MediumTests.class) // Fails sometimes with small tests +@Category({RPCTests.class, MediumTests.class}) // Fails sometimes with small tests public class TestDelayedRpc { private static final Log LOG = LogFactory.getLog(TestDelayedRpc.class); public static RpcServerInterface rpcServer; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestHBaseClient.java hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestHBaseClient.java index 246e9b7..3d7dddb 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestHBaseClient.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestHBaseClient.java @@ -19,9 +19,8 @@ package org.apache.hadoop.hbase.ipc; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.MediumTests; -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.util.EnvironmentEdge; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RPCTests; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.ManualEnvironmentEdge; import org.junit.Assert; @@ -30,7 +29,7 @@ import org.junit.experimental.categories.Category; import java.net.InetSocketAddress; -@Category(MediumTests.class) // Can't be small, we're playing with the EnvironmentEdge +@Category({RPCTests.class, MediumTests.class}) // Can't be small, we're playing with the EnvironmentEdge public class TestHBaseClient { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestIPC.java hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestIPC.java index 0b11cd1..9ab20e6 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestIPC.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestIPC.java @@ -48,7 +48,8 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RPCTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.RowMutations; import org.apache.hadoop.hbase.codec.Codec; @@ -88,7 +89,7 @@ import com.google.protobuf.ServiceException; /** * Some basic ipc tests. */ -@Category(SmallTests.class) +@Category({RPCTests.class, SmallTests.class}) public class TestIPC { public static final Log LOG = LogFactory.getLog(TestIPC.class); static byte [] CELL_BYTES = Bytes.toBytes("xyz"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestProtoBufRpc.java hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestProtoBufRpc.java index fe4321f..d7b7b47 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestProtoBufRpc.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestProtoBufRpc.java @@ -24,7 +24,8 @@ import com.google.common.collect.Lists; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RPCTests; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.ipc.protobuf.generated.TestProtos; import org.apache.hadoop.hbase.ipc.protobuf.generated.TestRpcServiceProtos; @@ -51,7 +52,7 @@ import com.google.protobuf.ServiceException; * This test depends on test.proto definition of types in src/test/protobuf/test.proto * and protobuf service definition from src/test/protobuf/test_rpc_service.proto */ -@Category(MediumTests.class) +@Category({RPCTests.class, MediumTests.class}) public class TestProtoBufRpc { public final static String ADDRESS = "localhost"; public static int PORT = 0; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcMetrics.java hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcMetrics.java index 1885e0e..af764f4 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcMetrics.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestRpcMetrics.java @@ -20,7 +20,8 @@ package org.apache.hadoop.hbase.ipc; import org.apache.hadoop.hbase.CompatibilityFactory; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RPCTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.test.MetricsAssertHelper; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -28,7 +29,7 @@ import org.junit.experimental.categories.Category; import static org.junit.Assert.*; -@Category(SmallTests.class) +@Category({RPCTests.class, SmallTests.class}) public class TestRpcMetrics { public MetricsAssertHelper HELPER = CompatibilityFactory.getInstance(MetricsAssertHelper.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java index 9d51915..11ac43f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java @@ -27,7 +27,8 @@ import com.google.protobuf.Message; 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.RPCTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.ipc.RpcServer.Call; import org.apache.hadoop.hbase.protobuf.generated.RPCProtos; import org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader; @@ -57,7 +58,7 @@ import static org.mockito.Mockito.timeout; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -@Category(SmallTests.class) +@Category({RPCTests.class, SmallTests.class}) public class TestSimpleRpcScheduler { public static final Log LOG = LogFactory.getLog(TestSimpleRpcScheduler.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestDriver.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestDriver.java index e89dbb0..a268b76 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestDriver.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestDriver.java @@ -18,7 +18,8 @@ */ package org.apache.hadoop.hbase.mapred; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.util.ProgramDriver; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -27,7 +28,7 @@ import org.mockito.Mockito; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; -@Category(SmallTests.class) +@Category({MapReduceTests.class, SmallTests.class}) public class TestDriver { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestGroupingTableMap.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestGroupingTableMap.java index b3d4bd1..90ed73b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestGroupingTableMap.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestGroupingTableMap.java @@ -35,7 +35,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.util.Bytes; @@ -48,7 +49,7 @@ import org.junit.experimental.categories.Category; import com.google.common.collect.ImmutableList; -@Category(SmallTests.class) +@Category({MapReduceTests.class, SmallTests.class}) public class TestGroupingTableMap { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestIdentityTableMap.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestIdentityTableMap.java index dc289fa..3fad1fe 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestIdentityTableMap.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestIdentityTableMap.java @@ -24,7 +24,8 @@ import static org.mockito.Mockito.verify; import java.io.IOException; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.mapred.OutputCollector; @@ -33,7 +34,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; -@Category(SmallTests.class) +@Category({MapReduceTests.class, SmallTests.class}) public class TestIdentityTableMap { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestRowCounter.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestRowCounter.java index c872a26..6c7e445 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestRowCounter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestRowCounter.java @@ -31,7 +31,8 @@ import java.io.IOException; import java.io.PrintStream; import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.mapred.RowCounter.RowCounterMapper; @@ -44,7 +45,7 @@ import org.mockito.Mockito; import com.google.common.base.Joiner; -@Category(SmallTests.class) +@Category({MapReduceTests.class, SmallTests.class}) public class TestRowCounter { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestSplitTable.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestSplitTable.java index d60a5e7..216041d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestSplitTable.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestSplitTable.java @@ -22,14 +22,15 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; +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({MapReduceTests.class, SmallTests.class}) public class TestSplitTable { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java index 1cdde7c..6a6da1f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java @@ -41,6 +41,8 @@ import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.Before; @@ -54,7 +56,7 @@ import org.mockito.stubbing.Answer; * This tests the TableInputFormat and its recovery semantics * */ -@Category(LargeTests.class) +@Category({MapReduceTests.class, LargeTests.class}) public class TestTableInputFormat { private static final Log LOG = LogFactory.getLog(TestTableInputFormat.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduce.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduce.java index 218e73b..c827751 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduce.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduce.java @@ -26,7 +26,8 @@ import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.fs.FileUtil; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; @@ -46,7 +47,7 @@ import org.junit.experimental.categories.Category; * on our tables is simple - take every row in the table, reverse the value of * a particular cell, and write it back to the table. */ -@Category(LargeTests.class) +@Category({MapReduceTests.class, LargeTests.class}) @SuppressWarnings("deprecation") public class TestTableMapReduce extends TestTableMapReduceBase { private static final Log LOG = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduceUtil.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduceUtil.java index e527f97..451fce5 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduceUtil.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduceUtil.java @@ -33,7 +33,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Table; @@ -55,7 +56,7 @@ import org.junit.experimental.categories.Category; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -@Category(LargeTests.class) +@Category({MapReduceTests.class, LargeTests.class}) public class TestTableMapReduceUtil { private static final Log LOG = LogFactory diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableSnapshotInputFormat.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableSnapshotInputFormat.java index 9fb83e1..eabedec 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableSnapshotInputFormat.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableSnapshotInputFormat.java @@ -23,11 +23,12 @@ import static org.mockito.Mockito.mock; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.mapreduce.TableSnapshotInputFormatTestBase; +import org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapred.InputSplit; @@ -47,7 +48,7 @@ import org.junit.experimental.categories.Category; import java.io.IOException; import java.util.Iterator; -@Category(LargeTests.class) +@Category({VerySlowMapReduceTests.class, LargeTests.class}) public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBase { private static final byte[] aaa = Bytes.toBytes("aaa"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellCounter.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellCounter.java index 72f48b1..092a18f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellCounter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellCounter.java @@ -24,9 +24,10 @@ import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.LocalFileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.LauncherSecurityManager; import org.apache.hadoop.mapreduce.Job; @@ -42,7 +43,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -@Category(LargeTests.class) +@Category({MapReduceTests.class, LargeTests.class}) public class TestCellCounter { private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); private static final byte[] ROW1 = Bytes.toBytes("row1"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCopyTable.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCopyTable.java index 8d171a6..73a0d1e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCopyTable.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCopyTable.java @@ -30,7 +30,8 @@ import java.io.PrintStream; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; @@ -48,7 +49,7 @@ import org.junit.experimental.categories.Category; /** * Basic test for the CopyTable M/R tool */ -@Category(LargeTests.class) +@Category({MapReduceTests.class, LargeTests.class}) public class TestCopyTable { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static MiniHBaseCluster cluster; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestGroupingTableMapper.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestGroupingTableMapper.java index c359137..fc7b102 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestGroupingTableMapper.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestGroupingTableMapper.java @@ -21,7 +21,8 @@ import java.util.List; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.util.Bytes; @@ -31,7 +32,7 @@ import org.junit.experimental.categories.Category; import static org.mockito.Mockito.*; -@Category(SmallTests.class) +@Category({MapReduceTests.class, SmallTests.class}) public class TestGroupingTableMapper { /** diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java index c257cf3..8f6e167 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java @@ -52,7 +52,6 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.HadoopShims; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.PerformanceEvaluation; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HBaseAdmin; @@ -74,6 +73,8 @@ import org.apache.hadoop.hbase.regionserver.BloomType; import org.apache.hadoop.hbase.regionserver.HStore; import org.apache.hadoop.hbase.regionserver.StoreFile; import org.apache.hadoop.hbase.regionserver.TimeRangeTracker; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.Threads; @@ -95,7 +96,7 @@ import org.mockito.Mockito; * Creates a few inner classes to implement splits and an inputformat that * emits keys and values like those of {@link PerformanceEvaluation}. */ -@Category(LargeTests.class) +@Category({VerySlowMapReduceTests.class, LargeTests.class}) public class TestHFileOutputFormat { private final static int ROWSPERSPLIT = 1024; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java index edfd339..c14b9a6 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java @@ -50,7 +50,6 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.HadoopShims; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.PerformanceEvaluation; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HBaseAdmin; @@ -71,6 +70,8 @@ import org.apache.hadoop.hbase.io.hfile.HFile.Reader; import org.apache.hadoop.hbase.regionserver.BloomType; import org.apache.hadoop.hbase.regionserver.StoreFile; import org.apache.hadoop.hbase.regionserver.TimeRangeTracker; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.Threads; @@ -92,7 +93,7 @@ import org.mockito.Mockito; * Creates a few inner classes to implement splits and an inputformat that * emits keys and values like those of {@link PerformanceEvaluation}. */ -@Category(LargeTests.class) +@Category({VerySlowMapReduceTests.class, LargeTests.class}) public class TestHFileOutputFormat2 { private final static int ROWSPERSPLIT = 1024; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHLogRecordReader.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHLogRecordReader.java index 22acfa9..bfe5aa7 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHLogRecordReader.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHLogRecordReader.java @@ -38,11 +38,12 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.mapreduce.HLogInputFormat.HLogRecordReader; import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.HLogFactory; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.MapReduceTestUtil; @@ -55,7 +56,7 @@ import org.junit.experimental.categories.Category; /** * JUnit tests for the HLogRecordReader */ -@Category(MediumTests.class) +@Category({MapReduceTests.class, MediumTests.class}) public class TestHLogRecordReader { private final Log LOG = LogFactory.getLog(getClass()); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHRegionPartitioner.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHRegionPartitioner.java index d02b378..bf4d8a0 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHRegionPartitioner.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHRegionPartitioner.java @@ -17,7 +17,8 @@ package org.apache.hadoop.hbase.mapreduce; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; @@ -27,7 +28,7 @@ import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; -@Category(MediumTests.class) +@Category({MapReduceTests.class, MediumTests.class}) public class TestHRegionPartitioner { private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java index f89808f..91ff718 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java @@ -43,7 +43,6 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Durability; @@ -63,6 +62,8 @@ import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.HLogKey; import org.apache.hadoop.hbase.regionserver.wal.WALActionsListener; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.LauncherSecurityManager; import org.apache.hadoop.mapreduce.Job; @@ -81,7 +82,7 @@ import org.mockito.stubbing.Answer; /** * Tests the table import and table export MR job functionality */ -@Category(MediumTests.class) +@Category({VerySlowMapReduceTests.class, MediumTests.class}) public class TestImportExport { private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); private static final byte[] ROW1 = Bytes.toBytes("row1"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithOperationAttributes.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithOperationAttributes.java index 1c13468..f31a916 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithOperationAttributes.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithOperationAttributes.java @@ -37,8 +37,9 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; @@ -60,7 +61,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({MapReduceTests.class, LargeTests.class}) public class TestImportTSVWithOperationAttributes implements Configurable { protected static final Log LOG = LogFactory.getLog(TestImportTSVWithOperationAttributes.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithVisibilityLabels.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithVisibilityLabels.java index 9494fa4..b15d04e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithVisibilityLabels.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithVisibilityLabels.java @@ -41,8 +41,9 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; @@ -69,7 +70,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({MapReduceTests.class, LargeTests.class}) public class TestImportTSVWithVisibilityLabels implements Configurable { protected static final Log LOG = LogFactory.getLog(TestImportTSVWithVisibilityLabels.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java index 8e64f77..8706d9c 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java @@ -41,12 +41,13 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapred.Utils.OutputFileUtils.OutputFilesFilter; @@ -59,7 +60,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({VerySlowMapReduceTests.class, LargeTests.class}) public class TestImportTsv implements Configurable { protected static final Log LOG = LogFactory.getLog(TestImportTsv.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsvParser.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsvParser.java index 912a9a8..81e0a70 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsvParser.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsvParser.java @@ -27,7 +27,8 @@ import static org.junit.Assert.fail; import java.util.ArrayList; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser; import org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.BadTsvLineException; import org.apache.hadoop.hbase.mapreduce.ImportTsv.TsvParser.ParsedLine; @@ -43,7 +44,7 @@ import com.google.common.collect.Iterables; /** * Tests for {@link TsvParser}. */ -@Category(SmallTests.class) +@Category({MapReduceTests.class, SmallTests.class}) public class TestImportTsvParser { private void assertBytesEquals(byte[] a, byte[] b) { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java index 2695706..48bf766 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFiles.java @@ -32,7 +32,8 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HTable; @@ -53,7 +54,7 @@ import org.junit.experimental.categories.Category; * functionality. These tests run faster than the full MR cluster * tests in TestHFileOutputFormat */ -@Category(LargeTests.class) +@Category({MapReduceTests.class, LargeTests.class}) public class TestLoadIncrementalHFiles { private static final byte[] QUALIFIER = Bytes.toBytes("myqual"); private static final byte[] FAMILY = Bytes.toBytes("myfam"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java index c89bd51..6ea14c9 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java @@ -42,7 +42,6 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableExistsException; import org.apache.hadoop.hbase.MetaTableAccessor; @@ -58,6 +57,8 @@ import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.regionserver.TestHRegionServerBulkLoad; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; import org.junit.AfterClass; @@ -73,7 +74,7 @@ import com.google.protobuf.ServiceException; /** * Test cases for the atomic load error handling of the bulk load functionality. */ -@Category(LargeTests.class) +@Category({MapReduceTests.class, LargeTests.class}) public class TestLoadIncrementalHFilesSplitRecovery { final static Log LOG = LogFactory.getLog(TestHRegionServerBulkLoad.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableInputFormat.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableInputFormat.java index 74af66d..a78b859 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableInputFormat.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultiTableInputFormat.java @@ -33,11 +33,12 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.Job; @@ -54,7 +55,7 @@ import org.junit.experimental.categories.Category; * tested in a MapReduce job to see if that is handed over and done properly * too. */ -@Category(LargeTests.class) +@Category({VerySlowMapReduceTests.class, LargeTests.class}) public class TestMultiTableInputFormat { static final Log LOG = LogFactory.getLog(TestMultiTableInputFormat.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultithreadedTableMapper.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultithreadedTableMapper.java index 93dbbeb..e63e746 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultithreadedTableMapper.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultithreadedTableMapper.java @@ -36,6 +36,8 @@ import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; @@ -52,7 +54,7 @@ import static org.junit.Assert.assertTrue; * on our tables is simple - take every row in the table, reverse the value of * a particular cell, and write it back to the table. */ -@Category(LargeTests.class) +@Category({MapReduceTests.class, LargeTests.class}) public class TestMultithreadedTableMapper { private static final Log LOG = LogFactory.getLog(TestMultithreadedTableMapper.class); private static final HBaseTestingUtility UTIL = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java index 09aa652..592992f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java @@ -31,7 +31,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.mapreduce.RowCounter.RowCounterMapper; @@ -48,7 +49,7 @@ import org.junit.experimental.categories.Category; /** * Test the rowcounter map reduce job. */ -@Category(MediumTests.class) +@Category({MapReduceTests.class, MediumTests.class}) public class TestRowCounter { final Log LOG = LogFactory.getLog(getClass()); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSecureLoadIncrementalHFiles.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSecureLoadIncrementalHFiles.java index bac110d..fcd8216 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSecureLoadIncrementalHFiles.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSecureLoadIncrementalHFiles.java @@ -19,7 +19,8 @@ */ package org.apache.hadoop.hbase.mapreduce; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; import org.apache.hadoop.hbase.security.UserProvider; import org.apache.hadoop.hbase.security.access.AccessControlLists; import org.apache.hadoop.hbase.security.access.SecureTestUtil; @@ -38,7 +39,7 @@ import org.junit.experimental.categories.Category; * invaluable as it verifies the other mechanisms that need to be * supported as part of a LoadIncrementalFiles call. */ -@Category(LargeTests.class) +@Category({MapReduceTests.class, LargeTests.class}) public class TestSecureLoadIncrementalHFiles extends TestLoadIncrementalHFiles{ @BeforeClass diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSecureLoadIncrementalHFilesSplitRecovery.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSecureLoadIncrementalHFilesSplitRecovery.java index f4619e8..76a6d57 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSecureLoadIncrementalHFilesSplitRecovery.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSecureLoadIncrementalHFilesSplitRecovery.java @@ -18,7 +18,8 @@ package org.apache.hadoop.hbase.mapreduce; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; import org.apache.hadoop.hbase.security.UserProvider; import org.apache.hadoop.hbase.security.access.AccessControlLists; import org.apache.hadoop.hbase.security.access.SecureTestUtil; @@ -40,7 +41,7 @@ import org.junit.experimental.categories.Category; * invaluable as it verifies the other mechanisms that need to be * supported as part of a LoadIncrementalFiles call. */ -@Category(LargeTests.class) +@Category({MapReduceTests.class, LargeTests.class}) public class TestSecureLoadIncrementalHFilesSplitRecovery extends TestLoadIncrementalHFilesSplitRecovery { //This "overrides" the parent static method diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSimpleTotalOrderPartitioner.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSimpleTotalOrderPartitioner.java index 5e77708..119df80 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSimpleTotalOrderPartitioner.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSimpleTotalOrderPartitioner.java @@ -23,6 +23,8 @@ import static org.junit.Assert.assertEquals; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.experimental.categories.Category; @@ -31,7 +33,7 @@ import org.junit.Test; /** * Test of simple partitioner. */ -@Category(SmallTests.class) +@Category({MapReduceTests.class, SmallTests.class}) public class TestSimpleTotalOrderPartitioner { protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); Configuration conf = TEST_UTIL.getConfiguration(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan1.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan1.java index 77ea47a..47cb834 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan1.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan1.java @@ -20,7 +20,8 @@ package org.apache.hadoop.hbase.mapreduce; import java.io.IOException; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -28,7 +29,7 @@ import org.junit.experimental.categories.Category; * TestTableInputFormatScan part 1. * @see TestTableInputFormatScanBase */ -@Category(LargeTests.class) +@Category({VerySlowMapReduceTests.class, LargeTests.class}) public class TestTableInputFormatScan1 extends TestTableInputFormatScanBase { /** diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan2.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan2.java index f35bbd1..02f893f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan2.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScan2.java @@ -20,7 +20,8 @@ package org.apache.hadoop.hbase.mapreduce; import java.io.IOException; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -28,7 +29,7 @@ import org.junit.experimental.categories.Category; * TestTableInputFormatScan part 2. * @see TestTableInputFormatScanBase */ -@Category(LargeTests.class) +@Category({VerySlowMapReduceTests.class, LargeTests.class}) public class TestTableInputFormatScan2 extends TestTableInputFormatScanBase { /** diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduce.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduce.java index 11a54d4..fa345f2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduce.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduce.java @@ -18,38 +18,27 @@ */ package org.apache.hadoop.hbase.mapreduce; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import java.io.File; import java.io.IOException; -import java.util.Iterator; import java.util.Map; import java.util.NavigableMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hbase.Cell; -import org.apache.hadoop.hbase.CellUtil; -import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; -import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.lib.output.FileOutputFormat; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; import org.junit.experimental.categories.Category; /** @@ -57,7 +46,8 @@ import org.junit.experimental.categories.Category; * on our tables is simple - take every row in the table, reverse the value of * a particular cell, and write it back to the table. */ -@Category(LargeTests.class) + +@Category({VerySlowMapReduceTests.class, LargeTests.class}) public class TestTableMapReduce extends TestTableMapReduceBase { private static final Log LOG = LogFactory.getLog(TestTableMapReduce.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduceUtil.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduceUtil.java index a2ec2ec..8c0b26c 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduceUtil.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduceUtil.java @@ -19,7 +19,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.LongWritable; @@ -31,7 +32,7 @@ import org.junit.experimental.categories.Category; /** * Test different variants of initTableMapperJob method */ -@Category(SmallTests.class) +@Category({MapReduceTests.class, SmallTests.class}) public class TestTableMapReduceUtil { /* diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSnapshotInputFormat.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSnapshotInputFormat.java index ea23889..903e0c0 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSnapshotInputFormat.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSnapshotInputFormat.java @@ -29,12 +29,13 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HDFSBlocksDistribution; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.hadoop.hbase.mapreduce.TableSnapshotInputFormat.TableSnapshotRegionSplit; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.NullWritable; import org.apache.hadoop.mapreduce.InputSplit; @@ -50,7 +51,7 @@ import org.junit.experimental.categories.Category; import com.google.common.collect.Lists; -@Category(LargeTests.class) +@Category({VerySlowMapReduceTests.class, LargeTests.class}) public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBase { private static final byte[] bbb = Bytes.toBytes("bbb"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSplit.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSplit.java index e40c5fc..59f787f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSplit.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSplit.java @@ -19,7 +19,8 @@ package org.apache.hadoop.hbase.mapreduce; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.util.ReflectionUtils; import org.junit.Assert; import org.junit.Test; @@ -30,7 +31,7 @@ import java.util.HashSet; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -@Category(SmallTests.class) +@Category({MapReduceTests.class, SmallTests.class}) public class TestTableSplit { @Test public void testHashCode() { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTimeRangeMapRed.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTimeRangeMapRed.java index e6520df..58d1b6e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTimeRangeMapRed.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTimeRangeMapRed.java @@ -42,6 +42,8 @@ import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.MapWritable; import org.apache.hadoop.io.Text; @@ -54,7 +56,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({MapReduceTests.class, LargeTests.class}) public class TestTimeRangeMapRed { private final static Log log = LogFactory.getLog(TestTimeRangeMapRed.class); private static final HBaseTestingUtility UTIL = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java index a586af5..f227692 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java @@ -33,12 +33,11 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; +import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MiniHBaseCluster; -import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; @@ -49,6 +48,8 @@ import org.apache.hadoop.hbase.mapreduce.WALPlayer.HLogKeyValueMapper; import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.HLogKey; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.LauncherSecurityManager; import org.apache.hadoop.mapreduce.Mapper; @@ -63,7 +64,7 @@ import org.mockito.stubbing.Answer; /** * Basic test for the WALPlayer M/R tool */ -@Category(LargeTests.class) +@Category({MapReduceTests.class, LargeTests.class}) public class TestWALPlayer { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static MiniHBaseCluster cluster; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/hadoopbackport/TestJarFinder.java hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/hadoopbackport/TestJarFinder.java index fb56993..944475e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/hadoopbackport/TestJarFinder.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/hadoopbackport/TestJarFinder.java @@ -19,7 +19,8 @@ package org.apache.hadoop.hbase.mapreduce.hadoopbackport; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MapReduceTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -41,7 +42,7 @@ import java.util.jar.Manifest; /** * This file was forked from hadoop/common/branches/branch-2@1350012. */ -@Category(SmallTests.class) +@Category({MapReduceTests.class, SmallTests.class}) public class TestJarFinder { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java index 5596cb3..0d023c0 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestActiveMasterManager.java @@ -30,11 +30,12 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.CoordinatedStateManager; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.client.HConnection; import org.apache.hadoop.hbase.monitoring.MonitoredTask; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.zookeeper.ClusterStatusTracker; import org.apache.hadoop.hbase.zookeeper.MasterAddressTracker; import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; @@ -51,7 +52,7 @@ import org.mockito.Mockito; /** * Test the {@link ActiveMasterManager}. */ -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestActiveMasterManager { private final static Log LOG = LogFactory.getLog(TestActiveMasterManager.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentListener.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentListener.java index 383baf8..fccff59 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentListener.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentListener.java @@ -28,7 +28,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.ServerName; @@ -46,7 +47,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestAssignmentListener { private static final Log LOG = LogFactory.getLog(TestAssignmentListener.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java index 4b5556e..b24d9bf 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java @@ -40,7 +40,6 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.MiniHBaseCluster.MiniHBaseClusterRegionServer; @@ -64,6 +63,8 @@ import org.apache.hadoop.hbase.master.balancer.StochasticLoadBalancer; import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode; import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos; import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.FSUtils; @@ -78,7 +79,7 @@ import org.junit.experimental.categories.Category; /** * This tests AssignmentManager with a testing cluster. */ -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestAssignmentManagerOnCluster { private final static byte[] FAMILY = Bytes.toBytes("FAMILY"); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java index 288d115..4d590b2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitor.java @@ -48,7 +48,6 @@ import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.NotAllMetaRegionsOnlineException; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.TableDescriptors; import org.apache.hadoop.hbase.MetaMockingUtil; import org.apache.hadoop.hbase.client.HConnection; @@ -70,6 +69,8 @@ import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionAction; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResult; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException; import org.apache.hadoop.hbase.regionserver.HStore; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.HFileArchiveUtil; @@ -86,7 +87,7 @@ import com.google.protobuf.RpcController; import com.google.protobuf.Service; import com.google.protobuf.ServiceException; -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestCatalogJanitor { private static final Log LOG = LogFactory.getLog(TestCatalogJanitor.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java index 5791380..72403bf 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClockSkewDetection.java @@ -28,12 +28,14 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.CoordinatedStateManager; import org.apache.hadoop.hbase.client.HConnection; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestClockSkewDetection { private static final Log LOG = LogFactory.getLog(TestClockSkewDetection.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClusterStatusPublisher.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClusterStatusPublisher.java index 299fb06..5d47ede 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClusterStatusPublisher.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestClusterStatusPublisher.java @@ -20,8 +20,9 @@ package org.apache.hadoop.hbase.master; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.ManualEnvironmentEdge; import org.apache.hadoop.hbase.util.Pair; @@ -33,7 +34,7 @@ import org.junit.experimental.categories.Category; import java.util.ArrayList; import java.util.List; -@Category(MediumTests.class) // Plays with the ManualEnvironmentEdge +@Category({MasterTests.class, MediumTests.class}) // Plays with the ManualEnvironmentEdge public class TestClusterStatusPublisher { private ManualEnvironmentEdge mee = new ManualEnvironmentEdge(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDeadServer.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDeadServer.java index 27b8e8c..40d26f4 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDeadServer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDeadServer.java @@ -17,8 +17,9 @@ */ package org.apache.hadoop.hbase.master; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.ServerName; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.ManualEnvironmentEdge; import org.apache.hadoop.hbase.util.Pair; @@ -32,7 +33,7 @@ import java.util.Set; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestDeadServer { final ServerName hostname123 = ServerName.valueOf("127.0.0.1", 123, 3L); final ServerName hostname123_2 = ServerName.valueOf("127.0.0.1", 123, 4L); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java index cf9f726..fee569d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java @@ -60,7 +60,6 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.ServerName; @@ -91,6 +90,8 @@ import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.HLogFactory; import org.apache.hadoop.hbase.regionserver.wal.HLogUtil; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.FSUtils; @@ -111,7 +112,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({MasterTests.class, LargeTests.class}) @SuppressWarnings("deprecation") public class TestDistributedLogSplitting { private static final Log LOG = LogFactory.getLog(TestSplitLogManager.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterCommandLine.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterCommandLine.java index cad7045..2cb42f7 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterCommandLine.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterCommandLine.java @@ -20,12 +20,13 @@ package org.apache.hadoop.hbase.master; import static org.junit.Assert.*; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestHMasterCommandLine { private static final HBaseTestingUtility TESTING_UTIL = new HBaseTestingUtility(); @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java index 95c1cdf..ccf9812 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestHMasterRPCException.java @@ -33,13 +33,15 @@ import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos; import org.apache.hadoop.hbase.protobuf.generated.MasterProtos.IsMasterRunningRequest; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.junit.Test; import org.junit.experimental.categories.Category; import com.google.protobuf.BlockingRpcChannel; import com.google.protobuf.ServiceException; -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestHMasterRPCException { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java index 69e6761..9feb893 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java @@ -33,7 +33,6 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.PleaseHoldException; @@ -43,6 +42,8 @@ import org.apache.hadoop.hbase.UnknownRegionException; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; import org.junit.AfterClass; @@ -52,7 +53,7 @@ import org.junit.experimental.categories.Category; import com.google.common.base.Joiner; -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestMaster { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static final Log LOG = LogFactory.getLog(TestMaster.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java index 360cfdd..7537e35 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailover.java @@ -37,7 +37,6 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.ServerName; @@ -47,6 +46,8 @@ import org.apache.hadoop.hbase.master.RegionState.State; import org.apache.hadoop.hbase.protobuf.RequestConverter; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.testclassification.FlakeyTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSTableDescriptors; import org.apache.hadoop.hbase.util.FSUtils; @@ -55,7 +56,7 @@ import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({FlakeyTests.class, LargeTests.class}) public class TestMasterFailover { private static final Log LOG = LogFactory.getLog(TestMasterFailover.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailoverBalancerPersistence.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailoverBalancerPersistence.java index c5d0ff5..395fc31 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailoverBalancerPersistence.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFailoverBalancerPersistence.java @@ -20,9 +20,10 @@ package org.apache.hadoop.hbase.master; import org.apache.hadoop.hbase.ClusterStatus; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MasterNotRunningException; import org.apache.hadoop.hbase.MiniHBaseCluster; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.util.JVMClusterUtil; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -33,7 +34,7 @@ import java.util.List; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -@Category(LargeTests.class) +@Category({MasterTests.class, LargeTests.class}) public class TestMasterFailoverBalancerPersistence { /** diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFileSystem.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFileSystem.java index 8f57ee4..0534643 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFileSystem.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterFileSystem.java @@ -30,9 +30,10 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.SplitLogTask; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.zookeeper.ZKSplitLog; import org.apache.hadoop.hbase.zookeeper.ZKUtil; @@ -47,7 +48,7 @@ import org.junit.experimental.categories.Category; /** * Test the master filesystem in a local cluster */ -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestMasterFileSystem { private static final Log LOG = LogFactory.getLog(TestMasterFileSystem.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java index 2bae847..e31f599 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java @@ -25,20 +25,21 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.CompatibilityFactory; import org.apache.hadoop.hbase.CoordinatedStateManager; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos; import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos; import org.apache.hadoop.hbase.test.MetricsAssertHelper; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.zookeeper.KeeperException; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestMasterMetrics { private static final Log LOG = LogFactory.getLog(TestMasterMetrics.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java index cb1ffcd..efaa111 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java @@ -22,16 +22,15 @@ import static org.junit.Assert.*; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.master.HMaster; -import org.apache.hadoop.hbase.MediumTests; -import org.apache.hadoop.hbase.master.MetricsMasterWrapperImpl; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Threads; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestMasterMetricsWrapper { private static final Log LOG = LogFactory.getLog(TestMasterMetricsWrapper.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java index e643a5b..c2f44e2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterNoCluster.java @@ -38,7 +38,6 @@ import org.apache.hadoop.hbase.CoordinatedStateManagerFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MetaMockingUtil; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerLoad; @@ -51,6 +50,8 @@ import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.monitoring.MonitoredTask; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerReportRequest; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; @@ -75,7 +76,7 @@ import com.google.protobuf.ServiceException; * TODO: Speed up the zk connection by Master. It pauses 5 seconds establishing * session. */ -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestMasterNoCluster { private static final Log LOG = LogFactory.getLog(TestMasterNoCluster.class); private static final HBaseTestingUtility TESTUTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterOperationsForRegionReplicas.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterOperationsForRegionReplicas.java index 5f409fe..9c89e2b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterOperationsForRegionReplicas.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterOperationsForRegionReplicas.java @@ -38,7 +38,6 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.RegionLocations; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; @@ -52,13 +51,15 @@ import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.RegionReplicaUtil; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestMasterOperationsForRegionReplicas { final static Log LOG = LogFactory.getLog(TestRegionPlacement.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java index be3fe1a..d04afdf 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java @@ -29,19 +29,20 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({MasterTests.class, LargeTests.class}) public class TestMasterRestartAfterDisablingTable { private static final Log LOG = LogFactory.getLog(TestMasterRestartAfterDisablingTable.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterShutdown.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterShutdown.java index 9a3ec91..837b714 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterShutdown.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterShutdown.java @@ -29,14 +29,15 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.ClusterStatus; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.LocalHBaseCluster; import org.apache.hadoop.hbase.MiniHBaseCluster; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({MasterTests.class, LargeTests.class}) public class TestMasterShutdown { /** * Simple test of shutdown. diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java index fbc2c1a..31d772a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterStatusServlet.java @@ -32,6 +32,8 @@ import java.util.regex.Pattern; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.client.HBaseAdmin; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.MasterAddressTracker; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; @@ -50,7 +52,7 @@ import com.google.common.collect.Maps; /** * Tests for the master status page and its template. */ -@Category(MediumTests.class) +@Category({MasterTests.class,MediumTests.class}) public class TestMasterStatusServlet { private HMaster master; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java index 44b9573..5f9f0b8 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java @@ -26,7 +26,6 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; @@ -34,6 +33,8 @@ import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.Assert; @@ -47,7 +48,7 @@ import org.junit.experimental.categories.Category; * Test transitions of state across the master. Sets up the cluster once and * then runs a couple of tests. */ -@Category(LargeTests.class) +@Category({MasterTests.class, LargeTests.class}) public class TestMasterTransitions { private static final Log LOG = LogFactory.getLog(TestMasterTransitions.class); private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java index 7062473..c607459 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlacement.java @@ -44,7 +44,6 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.ServerName; @@ -62,6 +61,8 @@ import org.apache.hadoop.hbase.master.balancer.FavoredNodesPlan.Position; import org.apache.hadoop.hbase.master.balancer.LoadBalancerFactory; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HRegionServer; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; import org.apache.zookeeper.KeeperException; @@ -70,8 +71,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; - -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestRegionPlacement { final static Log LOG = LogFactory.getLog(TestRegionPlacement.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlan.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlan.java index a42a04c..388924b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlan.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionPlan.java @@ -22,12 +22,13 @@ import static org.junit.Assert.assertNotEquals; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestRegionPlan { @Test public void test() { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java index 4c4df39..d9845e1 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRegionState.java @@ -18,17 +18,16 @@ package org.apache.hadoop.hbase.master; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestRegionState { @Test public void test() { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java index 7fc00b5..1f672d3 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRestartCluster.java @@ -31,12 +31,13 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableExistsException; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.MetaScanner; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil; import org.apache.hadoop.hbase.util.Threads; @@ -44,7 +45,7 @@ import org.junit.After; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({MasterTests.class, LargeTests.class}) public class TestRestartCluster { private static final Log LOG = LogFactory.getLog(TestRestartCluster.class); private HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java index 8bdafda..d58b689 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java @@ -32,12 +32,13 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread; import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; @@ -47,7 +48,7 @@ import org.junit.experimental.categories.Category; /** * Tests the restarting of everything as done during rolling restarts. */ -@Category(LargeTests.class) +@Category({MasterTests.class, LargeTests.class}) public class TestRollingRestart { private static final Log LOG = LogFactory.getLog(TestRollingRestart.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java index 42a9b6b..43e0f66 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestSplitLogManager.java @@ -52,7 +52,6 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.SplitLogCounters; @@ -65,6 +64,8 @@ import org.apache.hadoop.hbase.master.SplitLogManager.Task; import org.apache.hadoop.hbase.master.SplitLogManager.TaskBatch; import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.RecoveryMode; import org.apache.hadoop.hbase.regionserver.TestMasterAddressTracker.NodeCreationListener; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.apache.hadoop.hbase.zookeeper.ZKSplitLog; import org.apache.hadoop.hbase.zookeeper.ZKUtil; @@ -81,7 +82,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestSplitLogManager { private static final Log LOG = LogFactory.getLog(TestSplitLogManager.class); private final ServerName DUMMY_MASTER = ServerName.valueOf("dummy-master,1,1"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java index a04e4d0..376729b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java @@ -43,7 +43,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.NotServingRegionException; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableNotDisabledException; @@ -54,6 +53,8 @@ import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment; import org.apache.hadoop.hbase.coprocessor.ObserverContext; import org.apache.hadoop.hbase.exceptions.LockTimeoutException; import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.LoadTestTool; import org.apache.hadoop.hbase.util.StoppableImplementation; @@ -67,7 +68,7 @@ import org.junit.experimental.categories.Category; /** * Tests the default table lock manager */ -@Category(LargeTests.class) +@Category({MasterTests.class, LargeTests.class}) public class TestTableLockManager { private static final Log LOG = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java index 0507e26..6a9f97d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestBaseLoadBalancer.java @@ -41,7 +41,6 @@ import org.apache.hadoop.hbase.ClusterStatus; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseIOException; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.master.LoadBalancer; import org.apache.hadoop.hbase.master.MasterServices; @@ -51,6 +50,8 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.RegionReplicaUtil; import org.apache.hadoop.hbase.master.RackManager; import org.apache.hadoop.hbase.master.balancer.BaseLoadBalancer.Cluster.MoveRegionAction; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -58,7 +59,7 @@ import org.mockito.Mockito; import com.google.common.collect.Lists; -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestBaseLoadBalancer extends BalancerTestBase { private static LoadBalancer loadBalancer; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java index 9b7ade8..15ff805 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestDefaultLoadBalancer.java @@ -31,11 +31,12 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.master.LoadBalancer; import org.apache.hadoop.hbase.master.RegionPlan; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -44,7 +45,7 @@ import org.mockito.Mockito; /** * Test the load balancer that is created by default. */ -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestDefaultLoadBalancer extends BalancerTestBase { private static final Log LOG = LogFactory.getLog(TestDefaultLoadBalancer.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestFavoredNodeAssignmentHelper.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestFavoredNodeAssignmentHelper.java index c5c46de..4dc7d32 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestFavoredNodeAssignmentHelper.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestFavoredNodeAssignmentHelper.java @@ -31,9 +31,10 @@ import java.util.TreeMap; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.master.RackManager; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Triple; import org.junit.BeforeClass; @@ -41,7 +42,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestFavoredNodeAssignmentHelper { private static List servers = new ArrayList(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestServerAndLoad.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestServerAndLoad.java index c067f9d..2cfaf4e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestServerAndLoad.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestServerAndLoad.java @@ -21,11 +21,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestServerAndLoad { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java index bc33cce..94063e4 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancer.java @@ -40,7 +40,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.ClusterStatus; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.FlakeyTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.RegionLoad; import org.apache.hadoop.hbase.ServerLoad; import org.apache.hadoop.hbase.ServerName; @@ -53,7 +54,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({FlakeyTests.class, MediumTests.class}) public class TestStochasticLoadBalancer extends BalancerTestBase { public static final String REGION_KEY = "testRegion"; private static StochasticLoadBalancer loadBalancer; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestCleanerChore.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestCleanerChore.java index 16773c9..92c7bb6 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestCleanerChore.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestCleanerChore.java @@ -29,8 +29,9 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.Stoppable; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.StoppableImplementation; import org.junit.After; @@ -40,7 +41,7 @@ import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestCleanerChore { private static final Log LOG = LogFactory.getLog(TestCleanerChore.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java index 5f56d30..a0b479f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileCleaner.java @@ -32,10 +32,11 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.CoordinatedStateManager; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.client.HConnection; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.EnvironmentEdge; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; @@ -45,7 +46,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestHFileCleaner { private static final Log LOG = LogFactory.getLog(TestHFileCleaner.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java index dc63528..f4fff62 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestHFileLinkCleaner.java @@ -31,11 +31,12 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.CoordinatedStateManager; import org.apache.hadoop.hbase.client.HConnection; import org.apache.hadoop.hbase.io.HFileLink; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.HFileArchiveUtil; import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; @@ -47,7 +48,7 @@ import org.junit.experimental.categories.Category; * Test the HFileLink Cleaner. * HFiles with links cannot be deleted until a link is present. */ -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestHFileLinkCleaner { private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java index c460518..2400584 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestLogsCleaner.java @@ -32,6 +32,8 @@ import org.apache.hadoop.hbase.client.HConnection; import org.apache.hadoop.hbase.replication.ReplicationFactory; import org.apache.hadoop.hbase.replication.ReplicationQueues; import org.apache.hadoop.hbase.replication.regionserver.Replication; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.junit.AfterClass; @@ -39,7 +41,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestLogsCleaner { private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java index 9d2dda2..9a72e77 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java @@ -36,10 +36,8 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.snapshot.DisabledTableSnapshotHandler; @@ -57,6 +55,8 @@ import org.apache.hadoop.hbase.snapshot.SnapshotDescriptionUtils; import org.apache.hadoop.hbase.snapshot.SnapshotReferenceUtil; import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils; import org.apache.hadoop.hbase.snapshot.UnknownSnapshotException; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.FSUtils; @@ -74,7 +74,7 @@ import com.google.protobuf.ServiceException; /** * Test the master-related aspects of a snapshot */ -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestSnapshotFromMaster { private static final Log LOG = LogFactory.getLog(TestSnapshotFromMaster.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestCreateTableHandler.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestCreateTableHandler.java index 0038225..70da886 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestCreateTableHandler.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestCreateTableHandler.java @@ -32,7 +32,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.TableName; @@ -41,6 +40,8 @@ import org.apache.hadoop.hbase.master.MasterFileSystem; import org.apache.hadoop.hbase.master.MasterServices; import org.apache.hadoop.hbase.master.RegionState.State; import org.apache.hadoop.hbase.master.RegionStates; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; import org.junit.After; @@ -48,7 +49,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestCreateTableHandler { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static final Log LOG = LogFactory.getLog(TestCreateTableHandler.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestTableDeleteFamilyHandler.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestTableDeleteFamilyHandler.java index 97182df..f56c7a6 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestTableDeleteFamilyHandler.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestTableDeleteFamilyHandler.java @@ -32,10 +32,10 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; import org.junit.AfterClass; @@ -44,7 +44,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({MasterTests.class, LargeTests.class}) public class TestTableDeleteFamilyHandler { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestTableDescriptorModification.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestTableDescriptorModification.java index 7fdb72a..3fe3977 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestTableDescriptorModification.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/handler/TestTableDescriptorModification.java @@ -29,11 +29,11 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.master.MasterFileSystem; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSTableDescriptors; import org.apache.hadoop.hbase.util.FSUtils; @@ -49,7 +49,7 @@ import org.junit.rules.TestName; * Verify that the HTableDescriptor is updated after * addColumn(), deleteColumn() and modifyTable() operations. */ -@Category(LargeTests.class) +@Category({MasterTests.class, LargeTests.class}) public class TestTableDescriptorModification { @Rule public TestName name = new TestName(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotFileCache.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotFileCache.java index e0b3782..198ce6a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotFileCache.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotFileCache.java @@ -31,7 +31,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription; import org.apache.hadoop.hbase.regionserver.wal.HLogUtil; import org.apache.hadoop.hbase.snapshot.SnapshotDescriptionUtils; @@ -47,7 +48,7 @@ import org.junit.experimental.categories.Category; /** * Test that we correctly reload the cache, filter directories, etc. */ -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestSnapshotFileCache { private static final Log LOG = LogFactory.getLog(TestSnapshotFileCache.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotHFileCleaner.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotHFileCleaner.java index 04371d4..5e5b004 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotHFileCleaner.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotHFileCleaner.java @@ -28,7 +28,8 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.snapshot.SnapshotDescriptionUtils; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; @@ -39,7 +40,7 @@ import org.junit.experimental.categories.Category; /** * Test that the snapshot hfile cleaner finds hfiles referenced in a snapshot */ -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestSnapshotHFileCleaner { private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotLogCleaner.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotLogCleaner.java index e96e6df..9a7d469 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotLogCleaner.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotLogCleaner.java @@ -26,7 +26,8 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.snapshot.SnapshotDescriptionUtils; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; @@ -37,7 +38,7 @@ import org.junit.experimental.categories.Category; /** * Test that the snapshot log cleaner finds logs referenced in a snapshot */ -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestSnapshotLogCleaner { private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotManager.java index 68dcc0f..7dd6377 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotManager.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/snapshot/TestSnapshotManager.java @@ -29,7 +29,8 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; import org.apache.hadoop.hbase.executor.ExecutorService; import org.apache.hadoop.hbase.master.MasterFileSystem; import org.apache.hadoop.hbase.master.MasterServices; @@ -46,7 +47,7 @@ import org.mockito.Mockito; /** * Test basic snapshot manager functionality */ -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestSnapshotManager { private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsHistogram.java hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsHistogram.java index 0d853fa..5b148f2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsHistogram.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsHistogram.java @@ -25,7 +25,8 @@ import static org.mockito.Mockito.verify; import java.util.Random; -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.metrics.histogram.MetricsHistogram; import org.apache.hadoop.metrics.MetricsRecord; import org.junit.Assert; @@ -35,7 +36,7 @@ import org.junit.experimental.categories.Category; import com.yammer.metrics.stats.Snapshot; @SuppressWarnings("deprecation") -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestMetricsHistogram { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestMemoryBoundedLogMessageBuffer.java hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestMemoryBoundedLogMessageBuffer.java index a43511e..f64b297 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestMemoryBoundedLogMessageBuffer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestMemoryBoundedLogMessageBuffer.java @@ -24,7 +24,8 @@ import static org.junit.Assert.assertTrue; import java.io.PrintWriter; import java.io.StringWriter; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -33,7 +34,7 @@ import org.junit.experimental.categories.Category; * Ensures that it uses no more memory than it's supposed to, * and that it properly deals with multibyte encodings. */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestMemoryBoundedLogMessageBuffer { private static final long TEN_KB = 10 * 1024; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java index df0ed16e..e54d0f6 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/monitoring/TestTaskMonitor.java @@ -22,11 +22,12 @@ import static org.junit.Assert.*; import java.util.concurrent.atomic.AtomicBoolean; -import org.apache.hadoop.hbase.SmallTests; +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 TestTaskMonitor { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedure.java hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedure.java index dc256c3..c424b6d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedure.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedure.java @@ -29,7 +29,8 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.errorhandling.ForeignException; import org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher; import org.junit.Before; @@ -39,7 +40,7 @@ import org.junit.experimental.categories.Category; /** * Demonstrate how Procedure handles single members, multiple members, and errors semantics */ -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestProcedure { ProcedureCoordinator coord; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureCoordinator.java hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureCoordinator.java index 5032570..710e631 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureCoordinator.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureCoordinator.java @@ -41,7 +41,8 @@ import java.util.List; import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.errorhandling.ForeignException; import org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher; import org.junit.After; @@ -59,7 +60,7 @@ import com.google.common.collect.Lists; * This only works correctly when we do class level parallelization of tests. If we do method * level serialization this class will likely throw all kinds of errors. */ -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestProcedureCoordinator { // general test constants private static final long WAKE_FREQUENCY = 1000; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureManager.java index 624ef1a..a2c86a1 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureManager.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureManager.java @@ -26,14 +26,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.client.Admin; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestProcedureManager { static final Log LOG = LogFactory.getLog(TestProcedureManager.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureMember.java hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureMember.java index 8ede860..2d7a68f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureMember.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureMember.java @@ -27,7 +27,6 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyZeroInteractions; import static org.mockito.Mockito.when; @@ -35,7 +34,8 @@ import static org.mockito.Mockito.when; import java.io.IOException; import java.util.concurrent.ThreadPoolExecutor; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.errorhandling.ForeignException; import org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher; import org.apache.hadoop.hbase.errorhandling.TimeoutException; @@ -51,7 +51,7 @@ import org.mockito.stubbing.Answer; /** * Test the procedure member, and it's error handling mechanisms. */ -@Category(SmallTests.class) +@Category({MasterTests.class, SmallTests.class}) public class TestProcedureMember { private static final long WAKE_FREQUENCY = 100; private static final long TIMEOUT = 100000; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java index b55a6ea..211e9e6 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedure.java @@ -38,7 +38,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.errorhandling.ForeignException; import org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher; import org.apache.hadoop.hbase.errorhandling.TimeoutException; @@ -60,7 +61,7 @@ import com.google.common.collect.Lists; /** * Cluster-wide testing of a distributed three-phase commit using a 'real' zookeeper cluster */ -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestZKProcedure { private static final Log LOG = LogFactory.getLog(TestZKProcedure.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedureControllers.java hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedureControllers.java index 0529142..52d4552 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedureControllers.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestZKProcedureControllers.java @@ -31,7 +31,8 @@ import java.util.concurrent.CountDownLatch; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MasterTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.errorhandling.ForeignException; import org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; @@ -52,7 +53,7 @@ import com.google.common.collect.Lists; /** * Test zookeeper-based, procedure controllers */ -@Category(MediumTests.class) +@Category({MasterTests.class, MediumTests.class}) public class TestZKProcedureControllers { static final Log LOG = LogFactory.getLog(TestZKProcedureControllers.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestProtobufUtil.java hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestProtobufUtil.java index d51f007..b2d8b38 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestProtobufUtil.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestProtobufUtil.java @@ -22,15 +22,15 @@ import static org.junit.Assert.assertEquals; import java.io.IOException; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.client.Append; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Increment; import org.apache.hadoop.hbase.client.Put; -import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Column; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto; @@ -48,7 +48,7 @@ import com.google.protobuf.ByteString; /** * Class to test ProtobufUtil. */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestProtobufUtil { @Test public void testException() throws IOException { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestReplicationProtobuf.java hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestReplicationProtobuf.java index b648d5e..057a35d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestReplicationProtobuf.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/protobuf/TestReplicationProtobuf.java @@ -26,13 +26,14 @@ import java.util.List; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellScanner; 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.util.Bytes; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestReplicationProtobuf { /** * Little test to check we can basically convert list of a list of KVs into a CellScanner diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java index b22228c..6af8716 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestAtomicOperation.java @@ -43,7 +43,6 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MultithreadedTestUtil; import org.apache.hadoop.hbase.MultithreadedTestUtil.TestContext; import org.apache.hadoop.hbase.MultithreadedTestUtil.TestThread; @@ -62,6 +61,8 @@ import org.apache.hadoop.hbase.filter.BinaryComparator; import org.apache.hadoop.hbase.filter.CompareFilter.CompareOp; import org.apache.hadoop.hbase.io.HeapSize; import org.apache.hadoop.hbase.regionserver.wal.HLog; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; import org.junit.Before; @@ -75,7 +76,7 @@ import org.junit.rules.TestName; * Testing of HRegion.incrementColumnValue, HRegion.increment, * and HRegion.append */ -@Category(MediumTests.class) // Starts 100 threads +@Category({VerySlowRegionServerTests.class, MediumTests.class}) // Starts 100 threads public class TestAtomicOperation { static final Log LOG = LogFactory.getLog(TestAtomicOperation.class); @Rule public TestName name = new TestName(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java index 58c4ba6..64666ab 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksRead.java @@ -35,7 +35,8 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Durability; @@ -50,7 +51,7 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestBlocksRead extends HBaseTestCase { static final Log LOG = LogFactory.getLog(TestBlocksRead.class); static final BloomType[] BLOOM_TYPE = new BloomType[] { BloomType.ROWCOL, diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksScanned.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksScanned.java index 04442df..0833a6a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksScanned.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksScanned.java @@ -25,7 +25,8 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.io.compress.Compression; @@ -38,7 +39,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; @SuppressWarnings("deprecation") -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestBlocksScanned extends HBaseTestCase { private static byte [] FAMILY = Bytes.toBytes("family"); private static byte [] COL = Bytes.toBytes("col"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.java index 8699954..1f63a48 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.java @@ -37,7 +37,8 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.fs.HFileSystem; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; @@ -68,7 +69,7 @@ import org.junit.runners.Parameterized.Parameters; * index blocks, and Bloom filter blocks, as specified by the column family. */ @RunWith(Parameterized.class) -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestCacheOnWriteInSchema { private static final Log LOG = LogFactory.getLog(TestCacheOnWriteInSchema.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java index ff2716c..baea563 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestClusterId.java @@ -31,7 +31,8 @@ import org.apache.hadoop.hbase.CoordinatedStateManager; import org.apache.hadoop.hbase.CoordinatedStateManagerFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.JVMClusterUtil; @@ -45,7 +46,7 @@ import org.junit.experimental.categories.Category; /** * Test metrics incremented on region server operations. */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestClusterId { private final HBaseTestingUtility TEST_UTIL = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java index ff65d33..81ff370 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java @@ -35,13 +35,15 @@ import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Durability; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TestName; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestColumnSeeking { @Rule public TestName name = new TestName(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java index 6e70b3e..4900ef4 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompaction.java @@ -50,7 +50,8 @@ import org.apache.hadoop.hbase.HBaseTestCase.HRegionIncommon; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Put; @@ -77,7 +78,7 @@ import org.mockito.stubbing.Answer; /** * Test compaction framework and common functions */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestCompaction { @Rule public TestName name = new TestName(); static final Log LOG = LogFactory.getLog(TestCompaction.class.getName()); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionState.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionState.java index b55654f..0f3db18 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionState.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionState.java @@ -30,11 +30,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -42,7 +43,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; /** Unit tests to test retrieving table/region compaction state*/ -@Category(LargeTests.class) +@Category({VerySlowRegionServerTests.class, LargeTests.class}) public class TestCompactionState { final static Log LOG = LogFactory.getLog(TestCompactionState.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionWithCoprocessor.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionWithCoprocessor.java index 09e7832..4ad92a3 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionWithCoprocessor.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionWithCoprocessor.java @@ -17,7 +17,8 @@ */ package org.apache.hadoop.hbase.regionserver; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; import org.junit.experimental.categories.Category; @@ -25,7 +26,7 @@ import org.junit.experimental.categories.Category; * Make sure compaction tests still pass with the preFlush and preCompact * overridden to implement the default behavior */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestCompactionWithCoprocessor extends TestCompaction { /** constructor */ public TestCompactionWithCoprocessor() throws Exception { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompoundBloomFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompoundBloomFilter.java index 08be35e..d7b4a04 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompoundBloomFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompoundBloomFilter.java @@ -38,7 +38,8 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.io.hfile.BlockCache; import org.apache.hadoop.hbase.io.hfile.CacheConfig; @@ -60,7 +61,7 @@ import org.junit.experimental.categories.Category; * Tests writing Bloom filter blocks in the same part of the file as data * blocks. */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestCompoundBloomFilter { private static final HBaseTestingUtility TEST_UTIL = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultCompactSelection.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultCompactSelection.java index 67e036f..a78e1d5 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultCompactSelection.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultCompactSelection.java @@ -34,7 +34,8 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest; import org.apache.hadoop.hbase.regionserver.compactions.RatioBasedCompactionPolicy; @@ -47,7 +48,7 @@ import org.junit.experimental.categories.Category; import com.google.common.collect.Lists; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestDefaultCompactSelection extends TestCase { private final static Log LOG = LogFactory.getLog(TestDefaultCompactSelection.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java index 383f424..d8f792a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultMemStore.java @@ -42,7 +42,8 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueTestUtil; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdge; @@ -54,7 +55,7 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; /** memstore test case */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestDefaultMemStore extends TestCase { private final Log LOG = LogFactory.getLog(this.getClass()); private DefaultMemStore memstore; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultStoreEngine.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultStoreEngine.java index e6de958..c185075 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultStoreEngine.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDefaultStoreEngine.java @@ -22,7 +22,8 @@ package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.KeyValue.KVComparator; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.regionserver.compactions.RatioBasedCompactionPolicy; import org.apache.hadoop.hbase.regionserver.compactions.DefaultCompactor; import org.junit.Assert; @@ -30,7 +31,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestDefaultStoreEngine { public static class DummyStoreFlusher extends DefaultStoreFlusher { public DummyStoreFlusher(Configuration conf, Store store) { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java index 4cbbfcc..4d04dc6 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java @@ -34,7 +34,8 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.Waiter.Predicate; import org.apache.hadoop.hbase.client.HTable; @@ -54,7 +55,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestEncryptionKeyRotation { private static final Log LOG = LogFactory.getLog(TestEncryptionKeyRotation.class); private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionRandomKeying.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionRandomKeying.java index 71784be..d0b7ea3 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionRandomKeying.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionRandomKeying.java @@ -29,7 +29,8 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; @@ -45,7 +46,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestEncryptionRandomKeying { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static Configuration conf = TEST_UTIL.getConfiguration(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java index ab176b8..67a8f19 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java @@ -37,7 +37,6 @@ import org.apache.hadoop.hbase.Chore; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.NotServingRegionException; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.Stoppable; @@ -58,6 +57,8 @@ import org.apache.hadoop.hbase.protobuf.RequestConverter; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest; import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos; +import org.apache.hadoop.hbase.testclassification.FlakeyTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.hbase.util.PairOfSameType; @@ -72,7 +73,7 @@ import com.google.common.collect.Iterators; import com.google.common.collect.Sets; import com.google.protobuf.ServiceException; -@Category(LargeTests.class) +@Category({FlakeyTests.class, LargeTests.class}) @SuppressWarnings("deprecation") public class TestEndToEndSplitTransaction { private static final Log LOG = LogFactory.getLog(TestEndToEndSplitTransaction.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestExplicitColumnTracker.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestExplicitColumnTracker.java index 2dbf279..72d7aa9 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestExplicitColumnTracker.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestExplicitColumnTracker.java @@ -29,12 +29,14 @@ import java.util.Arrays; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.regionserver.ScanQueryMatcher.MatchCode; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +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({RegionServerTests.class, SmallTests.class}) public class TestExplicitColumnTracker { private final byte[] col1 = Bytes.toBytes("col1"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java index 4884a81..f01b089 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java @@ -42,7 +42,8 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.HBaseAdmin; @@ -61,7 +62,7 @@ import org.junit.experimental.categories.Category; * Test cases that ensure that file system level errors are bubbled up * appropriately to clients, rather than swallowed. */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestFSErrorsExposed { private static final Log LOG = LogFactory.getLog(TestFSErrorsExposed.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushRegionEntry.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushRegionEntry.java index 33c5c8f..ace24b1 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushRegionEntry.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFlushRegionEntry.java @@ -12,7 +12,8 @@ package org.apache.hadoop.hbase.regionserver; import static org.junit.Assert.*; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.regionserver.MemStoreFlusher.FlushRegionEntry; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.ManualEnvironmentEdge; @@ -22,7 +23,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestFlushRegionEntry { @Before public void setUp() throws Exception { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java index cd97f6b..3f31611 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestGetClosestAtOrBefore.java @@ -33,7 +33,8 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.client.Delete; @@ -48,7 +49,7 @@ import org.junit.experimental.categories.Category; * TestGet is a medley of tests of get all done up as a single test. * This class */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestGetClosestAtOrBefore extends HBaseTestCase { private static final Log LOG = LogFactory.getLog(TestGetClosestAtOrBefore.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java index 7f03d85..b0f645e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java @@ -83,7 +83,6 @@ import org.apache.hadoop.hbase.HDFSBlocksDistribution; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.MultithreadedTestUtil; import org.apache.hadoop.hbase.MultithreadedTestUtil.RepeatingTestThread; @@ -134,6 +133,8 @@ import org.apache.hadoop.hbase.regionserver.wal.MetricsWALSource; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.test.MetricsAssertHelper; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper; import org.apache.hadoop.hbase.util.FSUtils; @@ -161,7 +162,7 @@ import com.google.protobuf.ByteString; * A lot of the meta information for an HRegion now lives inside other HRegions * or in the HBaseMaster, so only basic testing is possible. */ -@Category(MediumTests.class) +@Category({VerySlowRegionServerTests.class, MediumTests.class}) @SuppressWarnings("deprecation") public class TestHRegion { // Do not spin up clusters in here. If you need to spin up a cluster, do it diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionBusyWait.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionBusyWait.java new file mode 100644 index 0000000..b6e4f63 --- /dev/null +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionBusyWait.java @@ -0,0 +1,97 @@ +/** + * + * 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.regionserver; + +import static org.junit.Assert.fail; + +import java.io.IOException; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.apache.hadoop.hbase.RegionTooBusyException; +import org.apache.hadoop.hbase.client.Get; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests; +import org.apache.hadoop.hbase.util.Bytes; +import org.junit.Before; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +/** + * TestHRegion with hbase.busy.wait.duration set to 1000 (1 second). + * We can't use parameterized test since TestHRegion is old fashion. + */ +@Category({VerySlowRegionServerTests.class, MediumTests.class}) +public class TestHRegionBusyWait extends TestHRegion { + // TODO: This subclass runs all the tests in TestHRegion as well as the test below which means + // all TestHRegion tests are run twice. + @Before + public void setup() throws IOException { + super.setup(); + CONF.set("hbase.busy.wait.duration", "1000"); + } + + /** + * Test RegionTooBusyException thrown when region is busy + */ + @Test (timeout=6000) + public void testRegionTooBusy() throws IOException { + String method = "testRegionTooBusy"; + byte[] tableName = Bytes.toBytes(method); + byte[] family = Bytes.toBytes("family"); + region = initHRegion(tableName, method, CONF, family); + final AtomicBoolean stopped = new AtomicBoolean(true); + Thread t = new Thread(new Runnable() { + @Override + public void run() { + try { + region.lock.writeLock().lock(); + stopped.set(false); + while (!stopped.get()) { + Thread.sleep(100); + } + } catch (InterruptedException ie) { + } finally { + region.lock.writeLock().unlock(); + } + } + }); + t.start(); + Get get = new Get(row); + try { + while (stopped.get()) { + Thread.sleep(100); + } + region.get(get); + fail("Should throw RegionTooBusyException"); + } catch (InterruptedException ie) { + fail("test interrupted"); + } catch (RegionTooBusyException e) { + // Good, expected + } finally { + stopped.set(true); + try { + t.join(); + } catch (Throwable e) { + } + + HRegion.closeHRegion(region); + region = null; + } + } +} \ No newline at end of file diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionFileSystem.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionFileSystem.java index 90ee7aa..5f792fa 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionFileSystem.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionFileSystem.java @@ -39,14 +39,15 @@ import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.util.Progressable; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestHRegionFileSystem { private static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static final Log LOG = LogFactory.getLog(TestHRegionFileSystem.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java index a9aa456..e0746fb 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionInfo.java @@ -32,7 +32,8 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.master.RegionState; @@ -46,7 +47,7 @@ import org.junit.experimental.categories.Category; import com.google.protobuf.ByteString; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestHRegionInfo { @Test public void testPb() throws DeserializationException { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionOnCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionOnCluster.java index d0ebf8a..44d3b45 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionOnCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionOnCluster.java @@ -37,8 +37,9 @@ import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.master.HMaster; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hadoop.hbase.MediumTests; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mortbay.log.Log; @@ -48,7 +49,7 @@ import org.mortbay.log.Log; * {@link TestHRegion} if you don't need a cluster, if you can test w/ a * standalone {@link HRegion}. */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestHRegionOnCluster { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java index efa5a22..91c62ed 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java @@ -32,7 +32,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MultithreadedTestUtil.RepeatingTestThread; import org.apache.hadoop.hbase.MultithreadedTestUtil.TestContext; import org.apache.hadoop.hbase.TableExistsException; @@ -55,6 +54,8 @@ import org.apache.hadoop.hbase.protobuf.RequestConverter; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CompactRegionRequest; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Pair; import org.junit.Test; @@ -66,7 +67,7 @@ import com.google.common.collect.Lists; * Tests bulk loading of HFiles and shows the atomicity or lack of atomicity of * the region server's bullkLoad functionality. */ -@Category(LargeTests.class) +@Category({RegionServerTests.class, LargeTests.class}) public class TestHRegionServerBulkLoad { final static Log LOG = LogFactory.getLog(TestHRegionServerBulkLoad.class); private static HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java index 871d18e..fcfe063 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHeapMemoryManager.java @@ -32,7 +32,6 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.io.hfile.BlockCache; import org.apache.hadoop.hbase.client.HConnection; import org.apache.hadoop.hbase.io.hfile.BlockCacheKey; @@ -43,12 +42,14 @@ import org.apache.hadoop.hbase.io.hfile.ResizableBlockCache; import org.apache.hadoop.hbase.io.util.HeapMemorySizeUtil; import org.apache.hadoop.hbase.regionserver.HeapMemoryManager.TunerContext; import org.apache.hadoop.hbase.regionserver.HeapMemoryManager.TunerResult; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestHeapMemoryManager { private long maxHeapSize = ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getMax(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java index e3c5d3a..d56aaa0 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java @@ -38,7 +38,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HTable; @@ -50,16 +49,17 @@ import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.filter.CompareFilter; import org.apache.hadoop.hbase.filter.SingleColumnValueFilter; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Test; import org.junit.experimental.categories.Category; - /** * Test performance improvement of joined scanners optimization: * https://issues.apache.org/jira/browse/HBASE-5416 */ -@Category(LargeTests.class) +@Category({RegionServerTests.class, LargeTests.class}) public class TestJoinedScanners { static final Log LOG = LogFactory.getLog(TestJoinedScanners.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java index 52f261a..9469096 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeepDeletes.java @@ -32,8 +32,8 @@ import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; @@ -50,7 +50,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TestName; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestKeepDeletes { HBaseTestingUtility hbu = HBaseTestingUtility.createLocalHTU(); private final byte[] T0 = Bytes.toBytes("0"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueHeap.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueHeap.java index 850cd94..85f28f3 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueHeap.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueHeap.java @@ -27,12 +27,13 @@ import java.util.List; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HBaseTestCase; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.CollectionBackedScanner; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestKeyValueHeap extends HBaseTestCase { private static final boolean PRINT = false; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueScanFixture.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueScanFixture.java index f31b155..7cc1644 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueScanFixture.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueScanFixture.java @@ -27,11 +27,12 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueTestUtil; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestKeyValueScanFixture extends TestCase { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueSkipListSet.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueSkipListSet.java index 6f09d2a..7542a38 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueSkipListSet.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestKeyValueSkipListSet.java @@ -22,13 +22,14 @@ import java.util.Iterator; import java.util.SortedSet; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import junit.framework.TestCase; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestKeyValueSkipListSet extends TestCase { private final KeyValueSkipListSet kvsls = new KeyValueSkipListSet(KeyValue.COMPARATOR); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java index 262e421..0469f0e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMajorCompaction.java @@ -44,7 +44,8 @@ import org.apache.hadoop.hbase.HBaseTestCase.HRegionIncommon; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Result; @@ -69,7 +70,7 @@ import org.junit.rules.TestName; /** * Test major compactions */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestMajorCompaction { @Rule public TestName name = new TestName(); static final Log LOG = LogFactory.getLog(TestMajorCompaction.class.getName()); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressTracker.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressTracker.java index cb5b556..e32118d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressTracker.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMasterAddressTracker.java @@ -26,6 +26,8 @@ import java.util.concurrent.Semaphore; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.*; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.zookeeper.MasterAddressTracker; import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.hbase.zookeeper.ZooKeeperListener; @@ -35,7 +37,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestMasterAddressTracker { private static final Log LOG = LogFactory.getLog(TestMasterAddressTracker.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreChunkPool.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreChunkPool.java index d73bdb8..39b2af6 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreChunkPool.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreChunkPool.java @@ -26,7 +26,8 @@ import java.util.Random; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.ByteRange; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; @@ -38,7 +39,7 @@ import org.junit.experimental.categories.Category; /** * Test the {@link MemStoreChunkPool} class */ -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestMemStoreChunkPool { private final static Configuration conf = new Configuration(); private static MemStoreChunkPool chunkPool; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreLAB.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreLAB.java index 4b0b5ad..170bdd4 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreLAB.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStoreLAB.java @@ -28,7 +28,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.MultithreadedTestUtil; import org.apache.hadoop.hbase.MultithreadedTestUtil.TestThread; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.ByteRange; import org.junit.Test; @@ -38,7 +39,7 @@ import com.google.common.collect.Maps; import com.google.common.primitives.Ints; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestMemStoreLAB { /** diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegion.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegion.java index 714518d..ddaee3d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegion.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegion.java @@ -19,12 +19,13 @@ package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.hbase.CompatibilityFactory; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.test.MetricsAssertHelper; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestMetricsRegion { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServer.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServer.java index db6923c..e777c1d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServer.java @@ -18,7 +18,8 @@ package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.hbase.CompatibilityFactory; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.test.MetricsAssertHelper; import org.junit.Before; import org.junit.BeforeClass; @@ -30,7 +31,7 @@ import static org.junit.Assert.assertNotNull; /** * Unit test version of rs metrics tests. */ -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestMetricsRegionServer { public static MetricsAssertHelper HELPER = CompatibilityFactory.getInstance(MetricsAssertHelper.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinVersions.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinVersions.java index cbb9018..8c9da0b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinVersions.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinVersions.java @@ -29,7 +29,8 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; @@ -45,7 +46,7 @@ import org.junit.rules.TestName; /** * Test Minimum Versions feature (HBASE-4071). */ -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestMinVersions { HBaseTestingUtility hbu = HBaseTestingUtility.createLocalHTU(); private final byte[] T0 = Bytes.toBytes("0"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMiniBatchOperationInProgress.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMiniBatchOperationInProgress.java index 5ad95a0..15931c6 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMiniBatchOperationInProgress.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMiniBatchOperationInProgress.java @@ -21,7 +21,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.client.Mutation; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; @@ -30,7 +31,7 @@ import org.apache.hadoop.hbase.util.Pair; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestMiniBatchOperationInProgress { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinorCompaction.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinorCompaction.java index 580251c..49d0445 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinorCompaction.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMinorCompaction.java @@ -32,7 +32,8 @@ import org.apache.hadoop.hbase.HBaseTestCase.HRegionIncommon; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Result; @@ -49,7 +50,7 @@ import org.junit.rules.TestName; /** * Test minor compactions */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestMinorCompaction { @Rule public TestName name = new TestName(); static final Log LOG = LogFactory.getLog(TestMinorCompaction.class.getName()); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java index b6242df..51cc9d5 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java @@ -44,7 +44,8 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueTestUtil; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Scan; @@ -61,7 +62,7 @@ import org.junit.runners.Parameterized.Parameters; * Tests optimized scanning of multiple columns. */ @RunWith(Parameterized.class) -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestMultiColumnScanner { private static final Log LOG = LogFactory.getLog(TestMultiColumnScanner.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiVersionConsistencyControl.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiVersionConsistencyControl.java index 472e48c..09b2226 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiVersionConsistencyControl.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiVersionConsistencyControl.java @@ -18,7 +18,8 @@ package org.apache.hadoop.hbase.regionserver; import junit.framework.TestCase; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.experimental.categories.Category; import java.util.Random; @@ -29,7 +30,7 @@ import java.util.concurrent.atomic.AtomicLong; * This is a hammer test that verifies MultiVersionConsistencyControl in a * multiple writer single reader scenario. */ -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestMultiVersionConsistencyControl extends TestCase { static class Writer implements Runnable { final AtomicBoolean finished; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestParallelPut.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestParallelPut.java index e99ee01..ea668b0 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestParallelPut.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestParallelPut.java @@ -34,7 +34,8 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HConstants.OperationStatusCode; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; @@ -54,7 +55,7 @@ import org.junit.rules.TestName; * Testing of multiPut in parallel. * */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestParallelPut { static final Log LOG = LogFactory.getLog(TestParallelPut.class); @Rule public TestName name = new TestName(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java index 574b435..88aa4d1 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPriorityRpc.java @@ -24,13 +24,14 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.CoordinatedStateManagerFactory; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.CoordinatedStateManager; import org.apache.hadoop.hbase.ipc.PriorityFunction; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Get; @@ -49,7 +50,7 @@ import com.google.protobuf.ByteString; /** * Tests that verify certain RPCs get a higher QoS. */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestPriorityRpc { private HRegionServer regionServer = null; private PriorityFunction priority = null; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQosFunction.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQosFunction.java index b9f73d6..fcc5019 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQosFunction.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQosFunction.java @@ -22,7 +22,8 @@ import static org.mockito.Mockito.when; 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.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRequest; import org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader; import org.junit.Test; @@ -35,7 +36,7 @@ import com.google.protobuf.Message; * Basic test that qos function is sort of working; i.e. a change in method naming style * over in pb doesn't break it. */ -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestQosFunction { @Test public void testPriority() { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java index 0465b93..2b1f11f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java @@ -32,7 +32,8 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValue.KVComparator; import org.apache.hadoop.hbase.KeyValue.Type; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.regionserver.ScanQueryMatcher.MatchCode; @@ -40,7 +41,7 @@ import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestQueryMatcher extends HBaseTestCase { private static final boolean PRINT = false; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java index 16c8681..97e69b7 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSKilledWhenInitializing.java @@ -29,7 +29,6 @@ import org.apache.hadoop.hbase.CoordinatedStateManager; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.LocalHBaseCluster; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.ServerName; @@ -37,6 +36,8 @@ import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.ServerManager; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair; import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupResponse; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread; import org.apache.hadoop.hbase.util.Threads; import org.junit.Test; @@ -45,7 +46,7 @@ import org.junit.experimental.categories.Category; /** * Tests region server termination during startup. */ -@Category(LargeTests.class) +@Category({RegionServerTests.class, LargeTests.class}) public class TestRSKilledWhenInitializing { private static boolean masterActive = false; private static AtomicBoolean firstRS = new AtomicBoolean(true); @@ -56,7 +57,7 @@ public class TestRSKilledWhenInitializing { * @throws Exception */ @Test(timeout = 180000) - public void testRSTermnationAfterRegisteringToMasterBeforeCreatingEphemeralNod() throws Exception { + public void testRSTerminationAfterRegisteringToMasterBeforeCreatingEphemeralNod() throws Exception { final int NUM_MASTERS = 1; final int NUM_RS = 2; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java index 40161a9..22a3546 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java @@ -26,12 +26,13 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.protobuf.ResponseConverter; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetOnlineRegionRequest; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoRequest; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.MasterAddressTracker; @@ -48,7 +49,7 @@ import com.google.protobuf.ServiceException; /** * Tests for the region server status page and its template. */ -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestRSStatusServlet { private HRegionServer rs; private RSRpcServices rpcServices; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java index a095711..c89c0df 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionFavoredNodes.java @@ -33,8 +33,9 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hdfs.DistributedFileSystem; import org.apache.hadoop.hdfs.server.datanode.DataNode; @@ -48,7 +49,7 @@ import org.junit.experimental.categories.Category; /** * Tests the ability to specify favored nodes for a region. */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestRegionFavoredNodes { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java index 113d61c..9e65751 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransaction.java @@ -39,13 +39,14 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.Server; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.HLogFactory; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.zookeeper.KeeperException; import org.junit.After; @@ -60,7 +61,7 @@ import com.google.common.collect.ImmutableList; * Test the {@link RegionMergeTransaction} class against two HRegions (as * opposed to running cluster). */ -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestRegionMergeTransaction { private final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private final Path testdir = TEST_UTIL.getDataTestDir(this.getClass() diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java index d800a64..a0cc36d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java @@ -36,7 +36,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.ServerName; @@ -54,6 +53,8 @@ import org.apache.hadoop.hbase.master.AssignmentManager; import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.RegionState.State; import org.apache.hadoop.hbase.master.RegionStates; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.FSUtils; @@ -72,7 +73,7 @@ import com.google.common.base.Joiner; * cluster where {@link TestRegionMergeTransaction} is tests against bare * {@link HRegion}. */ -@Category(LargeTests.class) +@Category({RegionServerTests.class, LargeTests.class}) public class TestRegionMergeTransactionOnCluster { private static final Log LOG = LogFactory .getLog(TestRegionMergeTransactionOnCluster.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java index 7ffaaad..9388d5f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicas.java @@ -32,7 +32,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TestMetaTableAccessor; import org.apache.hadoop.hbase.client.Consistency; @@ -59,7 +60,7 @@ import com.google.protobuf.ServiceException; * Tests for region replicas. Sad that we cannot isolate these without bringing up a whole * cluster. See {@link TestRegionServerNoMaster}. */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestRegionReplicas { private static final Log LOG = LogFactory.getLog(TestRegionReplicas.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java index 7ae0b5b..36baa05 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java @@ -21,6 +21,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.client.*; import org.apache.hadoop.hbase.test.MetricsAssertHelper; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Threads; import org.apache.log4j.Level; @@ -36,7 +38,7 @@ import java.util.ArrayList; import java.util.List; -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestRegionServerMetrics { private static MetricsAssertHelper metricsHelper; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java index ed5dfbf..ae15bd9 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerNoMaster.java @@ -25,7 +25,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.NotServingRegionException; import org.apache.hadoop.hbase.ServerName; @@ -37,6 +36,8 @@ import org.apache.hadoop.hbase.protobuf.RequestConverter; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CloseRegionRequest; import org.apache.hadoop.hbase.regionserver.handler.OpenRegionHandler; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; import org.apache.hadoop.hbase.util.Threads; @@ -51,11 +52,10 @@ import org.mortbay.log.Log; import com.google.protobuf.ServiceException; - /** * Tests on the region server, without the master. */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestRegionServerNoMaster { private static final int NB_SERVERS = 1; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionSplitPolicy.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionSplitPolicy.java index c1aca37..924a196 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionSplitPolicy.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionSplitPolicy.java @@ -33,14 +33,15 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestRegionSplitPolicy { private Configuration conf; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestResettingCounters.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestResettingCounters.java index b0bd5d2..27bdda0 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestResettingCounters.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestResettingCounters.java @@ -30,11 +30,13 @@ import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.client.Increment; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Durability; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +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({RegionServerTests.class, SmallTests.class}) public class TestResettingCounters { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java index c71f4f9..197c380 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestReversibleScanners.java @@ -40,7 +40,8 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; @@ -64,7 +65,7 @@ import com.google.common.collect.Lists; /** * Test cases against ReversibleKeyValueScanner */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestReversibleScanners { private static final Log LOG = LogFactory.getLog(TestReversibleScanners.class); HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRowTooBig.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRowTooBig.java index 573a5c9..bd41853 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRowTooBig.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRowTooBig.java @@ -22,6 +22,8 @@ package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -34,7 +36,7 @@ import java.io.IOException; * Test case to check HRS throws {@link RowTooBigException} * when row size exceeds configured limits. */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestRowTooBig { private final static HBaseTestingUtility HTU = HBaseTestingUtility.createLocalHTU(); private static final HTableDescriptor TEST_HTD = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.java index 5866352..309efbf 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.java @@ -29,7 +29,8 @@ import java.util.List; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.TableExistsException; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableNotFoundException; @@ -52,7 +53,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) /* * This test verifies that the scenarios illustrated by HBASE-10850 work * w.r.t. essential column family optimization diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanDeleteTracker.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanDeleteTracker.java index 29f74df..f2fb443 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanDeleteTracker.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanDeleteTracker.java @@ -21,13 +21,13 @@ package org.apache.hadoop.hbase.regionserver; import org.apache.hadoop.hbase.HBaseTestCase; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.regionserver.DeleteTracker.DeleteResult; import org.apache.hadoop.hbase.util.Bytes; import org.junit.experimental.categories.Category; - -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestScanDeleteTracker extends HBaseTestCase { private ScanDeleteTracker sdt; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWildcardColumnTracker.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWildcardColumnTracker.java index ca1e71c..c0dcee6 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWildcardColumnTracker.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWildcardColumnTracker.java @@ -25,10 +25,12 @@ import java.util.List; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.regionserver.ScanQueryMatcher.MatchCode; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestScanWildcardColumnTracker extends HBaseTestCase { final static int VERSIONS = 2; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java index 54e8517..855d8e3 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanWithBloomError.java @@ -42,7 +42,8 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueTestUtil; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.io.compress.Compression; @@ -61,7 +62,7 @@ import org.junit.runners.Parameterized.Parameters; * This is needed for the multi-column Bloom filter optimization. */ @RunWith(Parameterized.class) -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestScanWithBloomError { private static final Log LOG = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java index 1d6aac2..08b8dcc 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScanner.java @@ -43,8 +43,8 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.UnknownScannerException; import org.apache.hadoop.hbase.client.Delete; @@ -62,11 +62,10 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TestName; - /** * Test of a long-lived scanner validating as we go. */ -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestScanner { @Rule public TestName name = new TestName(); private final Log LOG = LogFactory.getLog(this.getClass()); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java index 1bf6b76..d1fda15 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java @@ -30,7 +30,8 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.HBaseAdmin; @@ -48,7 +49,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestScannerWithBulkload { private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java index 450dd82..ec81ac1 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSeekOptimizations.java @@ -40,7 +40,8 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Scan; @@ -59,7 +60,7 @@ import org.junit.runners.Parameterized.Parameters; * actually saving I/O operations. */ @RunWith(Parameterized.class) -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestSeekOptimizations { private static final Log LOG = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java index 4f71155..158f05e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java @@ -34,7 +34,8 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; 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.testclassification.RegionServerTests; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; @@ -70,7 +71,7 @@ import com.google.protobuf.RpcController; import com.google.protobuf.Service; import com.google.protobuf.ServiceException; -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestServerCustomProtocol { private static final Log LOG = LogFactory.getLog(TestServerCustomProtocol.class); static final String WHOAREYOU = "Who are you?"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerNonceManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerNonceManager.java index 87047c3..9b3c6c1 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerNonceManager.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerNonceManager.java @@ -27,7 +27,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Chore; import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.Stoppable; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.ManualEnvironmentEdge; @@ -38,7 +39,7 @@ import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestServerNonceManager { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java index 5caa544..1ae58f1 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitLogWorker.java @@ -36,7 +36,8 @@ import org.apache.hadoop.hbase.CoordinatedStateManagerFactory; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.SplitLogCounters; @@ -60,7 +61,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestSplitLogWorker { private static final Log LOG = LogFactory.getLog(TestSplitLogWorker.class); private static final int WAIT_TIME = 15000; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java index 9333039..4479ce6 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransaction.java @@ -36,9 +36,7 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.Server; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.io.hfile.CacheConfig; import org.apache.hadoop.hbase.client.Scan; @@ -49,6 +47,8 @@ import org.apache.hadoop.hbase.coprocessor.ObserverContext; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.HLogFactory; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.PairOfSameType; import org.apache.zookeeper.KeeperException; @@ -64,7 +64,7 @@ import com.google.common.collect.ImmutableList; * Test the {@link SplitTransaction} class against an HRegion (as opposed to * running cluster). */ -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestSplitTransaction { private final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private final Path testdir = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java index 54067fd..7ae4041 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java @@ -45,7 +45,6 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MasterNotRunningException; import org.apache.hadoop.hbase.MetaTableAccessor; import org.apache.hadoop.hbase.MiniHBaseCluster; @@ -79,6 +78,8 @@ import org.apache.hadoop.hbase.master.RegionState.State; import org.apache.hadoop.hbase.master.RegionStates; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.regionserver.compactions.CompactionContext; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.FSUtils; @@ -104,7 +105,7 @@ import com.google.protobuf.ServiceException; * only the below tests are against a running cluster where {@link TestSplitTransaction} * is tests against a bare {@link HRegion}. */ -@Category(LargeTests.class) +@Category({RegionServerTests.class, LargeTests.class}) public class TestSplitTransactionOnCluster { private static final Log LOG = LogFactory.getLog(TestSplitTransactionOnCluster.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java index 99834ed..ccd006a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStore.java @@ -57,7 +57,8 @@ import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValue.KVComparator; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.io.compress.Compression; @@ -93,7 +94,7 @@ import com.google.common.collect.Lists; /** * Test class for the Store */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestStore { public static final Log LOG = LogFactory.getLog(TestStore.class); @Rule public TestName name = new TestName(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java index 115926e..04e3516 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java @@ -40,7 +40,8 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.io.HFileLink; @@ -67,7 +68,7 @@ import com.google.common.collect.Lists; /** * Test HStoreFile */ -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestStoreFile extends HBaseTestCase { static final Log LOG = LogFactory.getLog(TestStoreFile.class); private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileInfo.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileInfo.java index 66e902f..4bb19d5 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileInfo.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileInfo.java @@ -18,52 +18,17 @@ */ package org.apache.hadoop.hbase.regionserver; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.TreeSet; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.fs.FileSystem; -import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestCase; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.io.HFileLink; -import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; -import org.apache.hadoop.hbase.io.hfile.BlockCache; -import org.apache.hadoop.hbase.io.hfile.CacheConfig; -import org.apache.hadoop.hbase.io.hfile.CacheStats; -import org.apache.hadoop.hbase.io.hfile.HFileDataBlockEncoder; -import org.apache.hadoop.hbase.io.hfile.HFileDataBlockEncoderImpl; -import org.apache.hadoop.hbase.io.hfile.HFileScanner; -import org.apache.hadoop.hbase.io.hfile.NoOpDataBlockEncoder; -import org.apache.hadoop.hbase.util.BloomFilterFactory; -import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hadoop.hbase.util.ChecksumType; -import org.apache.hadoop.hbase.util.FSUtils; import org.junit.experimental.categories.Category; -import org.mockito.Mockito; - -import com.google.common.base.Joiner; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; /** * Test HStoreFile */ -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestStoreFileInfo extends HBaseTestCase { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java index be50ed1..e66a069 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java @@ -38,7 +38,8 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.Stoppable; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Durability; @@ -54,7 +55,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestStoreFileRefresherChore { private HBaseTestingUtility TEST_UTIL; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileScannerWithTagCompression.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileScannerWithTagCompression.java index 2878577..1bcb7c9 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileScannerWithTagCompression.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileScannerWithTagCompression.java @@ -31,7 +31,8 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; import org.apache.hadoop.hbase.io.hfile.CacheConfig; @@ -42,7 +43,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestStoreFileScannerWithTagCompression { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java index f42ff0f..320ed56 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java @@ -34,7 +34,8 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueTestUtil; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdge; @@ -42,7 +43,7 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper; import org.junit.experimental.categories.Category; // Can't be small as it plays with EnvironmentEdgeManager -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestStoreScanner extends TestCase { private static final String CF_STR = "cf"; final byte [] CF = Bytes.toBytes(CF_STR); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeCompactor.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeCompactor.java index 43b8254..ed8b819 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeCompactor.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeCompactor.java @@ -26,10 +26,7 @@ import static org.apache.hadoop.hbase.regionserver.StripeStoreFileManager.OPEN_K import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; -import java.util.Iterator; import java.util.List; -import java.util.ListIterator; import java.util.TreeMap; import org.apache.hadoop.conf.Configuration; @@ -41,11 +38,11 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValue.KVComparator; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.io.compress.Compression; import org.apache.hadoop.hbase.io.hfile.HFile; -import org.apache.hadoop.hbase.regionserver.StoreFile; import org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest; import org.apache.hadoop.hbase.regionserver.compactions.StripeCompactor; import org.apache.hadoop.hbase.util.Bytes; @@ -55,7 +52,7 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestStripeCompactor { private static final byte[] NAME_OF_THINGS = Bytes.toBytes("foo"); private static final TableName TABLE_NAME = TableName.valueOf(NAME_OF_THINGS, NAME_OF_THINGS); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreEngine.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreEngine.java index 2be4bf6..d8cdc90 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreEngine.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreEngine.java @@ -27,7 +27,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.KeyValue.KVComparator; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.regionserver.compactions.CompactionContext; import org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest; import org.apache.hadoop.hbase.regionserver.compactions.StripeCompactionPolicy; @@ -35,7 +36,7 @@ import org.apache.hadoop.hbase.regionserver.compactions.StripeCompactor; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestStripeStoreEngine { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreFileManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreFileManager.java index 664653f..48f93e0 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreFileManager.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStripeStoreFileManager.java @@ -41,7 +41,8 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValue.KVComparator; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; import org.junit.Before; @@ -49,8 +50,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; - -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestStripeStoreFileManager { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static final Path BASEDIR = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java index c628d10..a613319 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java @@ -34,7 +34,8 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.client.Admin; @@ -67,7 +68,7 @@ import org.junit.rules.TestName; /** * Class that test tags */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestTags { static boolean useFilter = false; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java index b686ae7..b2a4ee6 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestWideScanner.java @@ -32,7 +32,8 @@ import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HBaseTestCase; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Put; @@ -40,7 +41,7 @@ import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.util.Bytes; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestWideScanner extends HBaseTestCase { private final Log LOG = LogFactory.getLog(this.getClass()); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/PerfTestCompactionPolicies.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/PerfTestCompactionPolicies.java index 8dc6550..3fcd3fe 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/PerfTestCompactionPolicies.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/PerfTestCompactionPolicies.java @@ -22,7 +22,8 @@ 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.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.regionserver.HStore; import org.apache.hadoop.hbase.regionserver.StoreConfigInformation; import org.apache.hadoop.hbase.regionserver.StoreFile; @@ -41,7 +42,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) @RunWith(Parameterized.class) public class PerfTestCompactionPolicies extends MockStoreFileGenerator { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestOffPeakHours.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestOffPeakHours.java index d2f955c..0b0d608 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestOffPeakHours.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestOffPeakHours.java @@ -22,13 +22,14 @@ import static org.junit.Assert.assertTrue; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestOffPeakHours { private static HBaseTestingUtility testUtil; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.java index 540b6d9..d90c1d3 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestStripeCompactionPolicy.java @@ -48,7 +48,8 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.io.compress.Compression; import org.apache.hadoop.hbase.io.hfile.HFile; import org.apache.hadoop.hbase.regionserver.BloomType; @@ -75,7 +76,7 @@ import org.mockito.ArgumentMatcher; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestStripeCompactionPolicy { private static final byte[] KEY_A = Bytes.toBytes("aaa"); private static final byte[] KEY_B = Bytes.toBytes("bbb"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestCompressor.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestCompressor.java index 84eeb88..03baf48 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestCompressor.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestCompressor.java @@ -27,7 +27,8 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.io.util.Dictionary; import org.apache.hadoop.hbase.io.util.LRUDictionary; import org.apache.hadoop.hbase.util.Bytes; @@ -38,7 +39,7 @@ import org.junit.experimental.categories.Category; /** * Test our compressor class. */ -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestCompressor { @BeforeClass public static void setUpBeforeClass() throws Exception { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestCustomWALCellCodec.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestCustomWALCellCodec.java index 6b71bef..624f2c2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestCustomWALCellCodec.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestCustomWALCellCodec.java @@ -21,15 +21,15 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; /** * Test that we can create, load, setup our own custom codec */ -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestCustomWALCellCodec { public static class CustomWALCellCodec extends WALCellCodec { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java index a09bfa0..9cc8f2f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestDurability.java @@ -29,7 +29,8 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.client.Increment; @@ -46,7 +47,7 @@ import org.junit.experimental.categories.Category; /** * Tests for HLog write durability */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestDurability { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static FileSystem FS; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java index a2ea5f0..3017323 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java @@ -57,7 +57,9 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.KeyValueUtil; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Get; @@ -88,7 +90,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; /** JUnit test case for HLog */ -@Category(LargeTests.class) +@Category({RegionServerTests.class, LargeTests.class}) @SuppressWarnings("deprecation") public class TestHLog { private static final Log LOG = LogFactory.getLog(TestHLog.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogFiltering.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogFiltering.java index 6e9f7d5..1e37377 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogFiltering.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogFiltering.java @@ -27,7 +27,8 @@ import java.util.SortedMap; import java.util.TreeMap; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Put; @@ -47,7 +48,7 @@ import org.junit.experimental.categories.Category; import com.google.common.collect.Lists; import com.google.protobuf.ServiceException; -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestHLogFiltering { private static final int NUM_MASTERS = 1; private static final int NUM_RS = 4; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogMethods.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogMethods.java index 0718f48..b1b5550 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogMethods.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogMethods.java @@ -32,6 +32,8 @@ import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.R import org.apache.hadoop.hbase.regionserver.wal.HLogSplitter.EntryBuffers; import org.apache.hadoop.hbase.regionserver.wal.HLogSplitter.PipelineController; import org.apache.hadoop.hbase.regionserver.wal.HLogSplitter.RegionEntryBuffer; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -39,7 +41,7 @@ import org.junit.experimental.categories.Category; /** * Simple testing of a few HLog methods. */ -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestHLogMethods { private static final byte[] TEST_REGION = Bytes.toBytes("test_region");; private static final TableName TEST_TABLE = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogReaderOnSecureHLog.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogReaderOnSecureHLog.java index 1c70fb5..a7657e0 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogReaderOnSecureHLog.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogReaderOnSecureHLog.java @@ -38,7 +38,8 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.io.crypto.KeyProviderForTesting; import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.RecoveryMode; @@ -54,7 +55,7 @@ import org.junit.experimental.categories.Category; /* * Test that verifies WAL written by SecureProtobufLogWriter is not readable by ProtobufLogReader */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestHLogReaderOnSecureHLog { static final Log LOG = LogFactory.getLog(TestHLogReaderOnSecureHLog.class); static { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java index 1fc6b22..c55a504 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java @@ -41,6 +41,12 @@ import java.util.concurrent.atomic.AtomicLong; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.impl.Log4JLogger; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.TableName; +import org.apache.log4j.Level; +import org.apache.hadoop.hdfs.server.datanode.DataNode; +import org.apache.hadoop.hdfs.server.namenode.FSNamesystem; +import org.apache.hadoop.hdfs.server.namenode.LeaseManager; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FSDataOutputStream; @@ -54,8 +60,7 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.LargeTests; -import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.SplitLogTask.RecoveryMode; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.wal.HLog.Entry; @@ -68,12 +73,8 @@ import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.hdfs.DFSTestUtil; import org.apache.hadoop.hdfs.DistributedFileSystem; -import org.apache.hadoop.hdfs.server.datanode.DataNode; -import org.apache.hadoop.hdfs.server.namenode.FSNamesystem; import org.apache.hadoop.hdfs.server.namenode.LeaseExpiredException; -import org.apache.hadoop.hdfs.server.namenode.LeaseManager; import org.apache.hadoop.ipc.RemoteException; -import org.apache.log4j.Level; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -91,7 +92,7 @@ import com.google.common.collect.ImmutableList; /** * Testing {@link HLog} splitting code. */ -@Category(LargeTests.class) +@Category({RegionServerTests.class, LargeTests.class}) public class TestHLogSplit { { ((Log4JLogger)DataNode.LOG).getLogger().setLevel(Level.ALL); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplitCompressed.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplitCompressed.java index 101678a..67d9361 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplitCompressed.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplitCompressed.java @@ -20,11 +20,12 @@ package org.apache.hadoop.hbase.regionserver.wal; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({RegionServerTests.class, LargeTests.class}) public class TestHLogSplitCompressed extends TestHLogSplit { @BeforeClass diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestKeyValueCompression.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestKeyValueCompression.java index ba93179..0450904 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestKeyValueCompression.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestKeyValueCompression.java @@ -24,7 +24,8 @@ import java.util.List; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +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; @@ -36,7 +37,7 @@ import static org.junit.Assert.*; import com.google.common.collect.Lists; -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestKeyValueCompression { private static final byte[] VALUE = Bytes.toBytes("fake value"); private static final int BUF_SIZE = 256*1024; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java index 7e1fbb0..9b7ce0e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java @@ -20,8 +20,9 @@ package org.apache.hadoop.hbase.regionserver.wal; import java.io.FileNotFoundException; import java.io.IOException; import java.util.concurrent.atomic.AtomicLong; - import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.junit.Assert; import static org.junit.Assert.assertTrue; @@ -36,7 +37,6 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; @@ -56,7 +56,7 @@ import org.junit.experimental.categories.Category; * Tests for conditions that should trigger RegionServer aborts when * rolling the current HLog fails. */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestLogRollAbort { private static final Log LOG = LogFactory.getLog(TestLogRolling.class); private static MiniDFSCluster dfsCluster; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollPeriod.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollPeriod.java index 06b5f48..cb59d17 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollPeriod.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollPeriod.java @@ -29,7 +29,8 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Table; @@ -43,7 +44,7 @@ import org.junit.experimental.categories.Category; /** * Tests that verifies that the log is forced to be rolled every "hbase.regionserver.logroll.period" */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestLogRollPeriod { private static final Log LOG = LogFactory.getLog(TestLogRolling.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java index 1a4b08a..fbd60d2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java @@ -44,7 +44,6 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; @@ -59,6 +58,8 @@ import org.apache.hadoop.hbase.fs.HFileSystem; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.regionserver.Store; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.JVMClusterUtil; @@ -76,7 +77,7 @@ import org.junit.experimental.categories.Category; /** * Test log deletion as logs are rolled. */ -@Category(LargeTests.class) +@Category({VerySlowRegionServerTests.class, LargeTests.class}) public class TestLogRolling { private static final Log LOG = LogFactory.getLog(TestLogRolling.class); private HRegionServer server; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollingNoCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollingNoCluster.java index c271741..413aa8d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollingNoCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollingNoCluster.java @@ -31,7 +31,8 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -39,7 +40,7 @@ import org.junit.experimental.categories.Category; /** * Test many concurrent appenders to an {@link #HLog} while rolling the log. */ -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestLogRollingNoCluster { private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private final static byte [] EMPTY_1K_ARRAY = new byte[1024]; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestReadOldRootAndMetaEdits.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestReadOldRootAndMetaEdits.java index 8e88f7b..66a231d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestReadOldRootAndMetaEdits.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestReadOldRootAndMetaEdits.java @@ -37,7 +37,8 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; @@ -48,7 +49,7 @@ import org.junit.experimental.categories.Category; /** * Tests to read old ROOT, Meta edits. */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestReadOldRootAndMetaEdits { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestSecureHLog.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestSecureHLog.java index 607149c..4dccccb 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestSecureHLog.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestSecureHLog.java @@ -39,7 +39,8 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.io.crypto.KeyProviderForTesting; import org.apache.hadoop.hbase.util.Bytes; @@ -49,7 +50,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestSecureHLog { static final Log LOG = LogFactory.getLog(TestSecureHLog.class); static { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestSecureWALReplay.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestSecureWALReplay.java index 9dc6e2b..4cea120 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestSecureWALReplay.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestSecureWALReplay.java @@ -19,13 +19,14 @@ package org.apache.hadoop.hbase.regionserver.wal; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.io.crypto.KeyProviderForTesting; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestSecureWALReplay extends TestWALReplay { @BeforeClass diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALActionsListener.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALActionsListener.java index 0a31d9f..35498c1 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALActionsListener.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALActionsListener.java @@ -28,6 +28,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.*; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; import org.junit.Before; @@ -40,7 +42,7 @@ import static org.junit.Assert.*; /** * Test that the actions are called while playing with an HLog */ -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestWALActionsListener { protected static final Log LOG = LogFactory.getLog(TestWALActionsListener.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALCellCodecWithCompression.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALCellCodecWithCompression.java index 22cc164..501fdda 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALCellCodecWithCompression.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALCellCodecWithCompression.java @@ -30,15 +30,16 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.Tag; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.codec.Codec.Decoder; import org.apache.hadoop.hbase.codec.Codec.Encoder; import org.apache.hadoop.hbase.io.util.LRUDictionary; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +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({RegionServerTests.class, SmallTests.class}) public class TestWALCellCodecWithCompression { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java index 7e129e2..1f6bd1c 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java @@ -46,7 +46,6 @@ import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.MasterNotRunningException; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; @@ -73,6 +72,8 @@ import org.apache.hadoop.hbase.regionserver.RegionScanner; import org.apache.hadoop.hbase.regionserver.RegionServerServices; import org.apache.hadoop.hbase.regionserver.Store; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdge; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; @@ -90,7 +91,7 @@ import org.mockito.Mockito; /** * Test replay of edits out of a WAL split. */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestWALReplay { public static final Log LOG = LogFactory.getLog(TestWALReplay.class); static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplayCompressed.java hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplayCompressed.java index 7e57359..4987fd4 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplayCompressed.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplayCompressed.java @@ -19,14 +19,15 @@ package org.apache.hadoop.hbase.regionserver.wal; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; /** * Enables compression and runs the TestWALReplay tests. */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestWALReplayCompressed extends TestWALReplay { @BeforeClass diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java index efff6dd..1718fd1 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java @@ -35,7 +35,6 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Delete; @@ -52,6 +51,8 @@ import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; import org.apache.hadoop.hbase.coprocessor.ObserverContext; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; @@ -60,7 +61,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({ReplicationTests.class, LargeTests.class}) public class TestMasterReplication { private static final Log LOG = LogFactory.getLog(TestReplicationBase.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java index 5abfeea..8e4d700 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java @@ -38,6 +38,8 @@ import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.client.replication.ReplicationAdmin; import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; @@ -45,7 +47,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({ReplicationTests.class, LargeTests.class}) public class TestMultiSlaveReplication { private static final Log LOG = LogFactory.getLog(TestReplicationBase.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestPerTableCFReplication.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestPerTableCFReplication.java index bc3c38f..f2809aa 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestPerTableCFReplication.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestPerTableCFReplication.java @@ -42,6 +42,8 @@ import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.client.replication.ReplicationAdmin; import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; +import org.apache.hadoop.hbase.testclassification.FlakeyTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; @@ -50,7 +52,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({FlakeyTests.class, LargeTests.class}) public class TestPerTableCFReplication { private static final Log LOG = LogFactory.getLog(TestPerTableCFReplication.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationChangingPeerRegionservers.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationChangingPeerRegionservers.java index 5a6c8fe..fcb3cda 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationChangingPeerRegionservers.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationChangingPeerRegionservers.java @@ -26,7 +26,6 @@ import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HTable; @@ -34,9 +33,10 @@ import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil; -import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -44,7 +44,7 @@ import org.junit.experimental.categories.Category; /** * Test handling of changes to the number of a peer's regionservers. */ -@Category(LargeTests.class) +@Category({ReplicationTests.class, LargeTests.class}) public class TestReplicationChangingPeerRegionservers extends TestReplicationBase { private static final Log LOG = LogFactory.getLog(TestReplicationChangingPeerRegionservers.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.java index b089fbe..3378c3f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationDisableInactivePeer.java @@ -20,10 +20,11 @@ package org.apache.hadoop.hbase.replication; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -31,7 +32,7 @@ import org.junit.experimental.categories.Category; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.fail; -@Category(LargeTests.class) +@Category({ReplicationTests.class, LargeTests.class}) public class TestReplicationDisableInactivePeer extends TestReplicationBase { private static final Log LOG = LogFactory.getLog(TestReplicationDisableInactivePeer.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java index c545dda..6ef0dd0 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java @@ -27,13 +27,14 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import org.apache.hadoop.hbase.Cell; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Waiter; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.regionserver.wal.FailedLogCloseException; import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.HLog.Entry; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; import org.apache.hadoop.hbase.zookeeper.ZKUtil; @@ -47,7 +48,7 @@ import org.junit.experimental.categories.Category; /** * Tests ReplicationSource and ReplicationEndpoint interactions */ -@Category(MediumTests.class) +@Category({ReplicationTests.class, MediumTests.class}) public class TestReplicationEndpoint extends TestReplicationBase { static int numRegionServers; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillMasterRS.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillMasterRS.java index ca0fd31..51a39a6 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillMasterRS.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillMasterRS.java @@ -17,7 +17,8 @@ */ package org.apache.hadoop.hbase.replication; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -25,7 +26,7 @@ import org.junit.experimental.categories.Category; * Runs the TestReplicationKillRS test and selects the RS to kill in the master cluster * Do not add other tests in this class. */ -@Category(LargeTests.class) +@Category({ReplicationTests.class, LargeTests.class}) public class TestReplicationKillMasterRS extends TestReplicationKillRS { @Test(timeout=300000) diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillMasterRSCompressed.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillMasterRSCompressed.java index ec5a3ba..0975a66 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillMasterRSCompressed.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillMasterRSCompressed.java @@ -19,7 +19,8 @@ package org.apache.hadoop.hbase.replication; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; @@ -27,7 +28,7 @@ import org.junit.experimental.categories.Category; * Run the same test as TestReplicationKillMasterRS but with HLog compression enabled * Do not add other tests in this class. */ -@Category(LargeTests.class) +@Category({ReplicationTests.class, LargeTests.class}) public class TestReplicationKillMasterRSCompressed extends TestReplicationKillMasterRS { /** diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java index 7834a0e..5739aee 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillRS.java @@ -18,20 +18,20 @@ */ package org.apache.hadoop.hbase.replication; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.UnknownScannerException; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.junit.experimental.categories.Category; import static org.junit.Assert.fail; -@Category(LargeTests.class) +@Category({ReplicationTests.class, LargeTests.class}) public class TestReplicationKillRS extends TestReplicationBase { private static final Log LOG = LogFactory.getLog(TestReplicationKillRS.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillSlaveRS.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillSlaveRS.java index ae95c4f..07e18b2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillSlaveRS.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationKillSlaveRS.java @@ -17,16 +17,16 @@ */ package org.apache.hadoop.hbase.replication; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.junit.Test; -import org.junit.Ignore; import org.junit.experimental.categories.Category; /** * Runs the TestReplicationKillRS test and selects the RS to kill in the slave cluster * Do not add other tests in this class. */ -@Category(LargeTests.class) +@Category({ReplicationTests.class, LargeTests.class}) public class TestReplicationKillSlaveRS extends TestReplicationKillRS { @Test(timeout=300000) diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java index 764f01b..cd363e7 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java @@ -34,7 +34,6 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Get; @@ -50,6 +49,8 @@ import org.apache.hadoop.hbase.protobuf.generated.WALProtos; import org.apache.hadoop.hbase.regionserver.wal.HLogKey; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.replication.regionserver.Replication; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.JVMClusterUtil; @@ -58,7 +59,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({ReplicationTests.class, LargeTests.class}) public class TestReplicationSmallTests extends TestReplicationBase { private static final Log LOG = LogFactory.getLog(TestReplicationSmallTests.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSource.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSource.java index 4c5ece5..9bdee7c 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSource.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSource.java @@ -31,17 +31,18 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.HLogFactory; import org.apache.hadoop.hbase.regionserver.wal.HLogKey; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({ReplicationTests.class, MediumTests.class}) public class TestReplicationSource { private static final Log LOG = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java index f0412e1..0971d8c 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.replication; import java.io.IOException; @@ -27,10 +26,11 @@ import org.apache.hadoop.hbase.ClusterId; import org.apache.hadoop.hbase.CoordinatedStateManager; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.client.HConnection; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.apache.hadoop.hbase.zookeeper.ZKClusterId; import org.apache.hadoop.hbase.zookeeper.ZKUtil; @@ -46,7 +46,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({ReplicationTests.class, MediumTests.class}) public class TestReplicationStateZKImpl extends TestReplicationStateBasic { private static final Log LOG = LogFactory.getLog(TestReplicationStateZKImpl.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java index aded636..701c974 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java @@ -32,13 +32,15 @@ import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.client.replication.ReplicationAdmin; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.replication.regionserver.ReplicationSyncUp; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({ReplicationTests.class, LargeTests.class}) public class TestReplicationSyncUpTool extends TestReplicationBase { private static final Log LOG = LogFactory.getLog(TestReplicationSyncUpTool.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java index 1c3de71..a2b7f5f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.replication; import java.util.ArrayList; @@ -28,11 +27,12 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.ClusterId; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.CoordinatedStateManager; import org.apache.hadoop.hbase.client.HConnection; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.apache.hadoop.hbase.zookeeper.ZKClusterId; import org.apache.hadoop.hbase.zookeeper.ZKUtil; @@ -54,7 +54,7 @@ import org.junit.experimental.categories.Category; * interfaces (i.e. ReplicationPeers, etc.). Each test case in this class should ensure that the * MiniZKCluster is cleaned and returned to it's initial state (i.e. nothing but the rsZNode). */ -@Category(MediumTests.class) +@Category({ReplicationTests.class, MediumTests.class}) public class TestReplicationTrackerZKImpl { private static final Log LOG = LogFactory.getLog(TestReplicationTrackerZKImpl.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWALEntryFilters.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWALEntryFilters.java index 41a4c14..f179deb 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWALEntryFilters.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWALEntryFilters.java @@ -28,7 +28,8 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.HLogKey; @@ -44,7 +45,7 @@ import com.google.common.collect.Lists; import static org.junit.Assert.*; import static org.mockito.Mockito.*; -@Category(SmallTests.class) +@Category({ReplicationTests.class, SmallTests.class}) public class TestReplicationWALEntryFilters { static byte[] a = new byte[] {'a'}; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWithTags.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWithTags.java index 9a49e9c..39067a1 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWithTags.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWithTags.java @@ -36,7 +36,6 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.client.Admin; @@ -54,6 +53,8 @@ import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; import org.apache.hadoop.hbase.coprocessor.ObserverContext; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster; import org.junit.AfterClass; @@ -61,7 +62,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({ReplicationTests.class, LargeTests.class}) public class TestReplicationWithTags { private static final Log LOG = LogFactory.getLog(TestReplicationWithTags.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java index fa8f305..e032730 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.replication.regionserver; import static org.junit.Assert.*; @@ -35,7 +34,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.Waiter; import org.apache.hadoop.hbase.client.ClusterConnection; @@ -51,6 +49,8 @@ import org.apache.hadoop.hbase.regionserver.wal.HLogKey; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.replication.ReplicationException; import org.apache.hadoop.hbase.replication.ReplicationPeerConfig; +import org.apache.hadoop.hbase.testclassification.FlakeyTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.ServerRegionReplicaUtil; import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.log4j.Level; @@ -65,7 +65,7 @@ import com.google.common.collect.Lists; * Tests RegionReplicaReplicationEndpoint class by setting up region replicas and verifying * async wal replication replays the edits to the secondary region in various scenarios. */ -@Category(MediumTests.class) +@Category({FlakeyTests.class, MediumTests.class}) public class TestRegionReplicaReplicationEndpoint { private static final Log LOG = LogFactory.getLog(TestRegionReplicaReplicationEndpoint.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.java index 21e1f58..340f09b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpointNoMaster.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.replication.regionserver; import static org.apache.hadoop.hbase.regionserver.TestRegionServerNoMaster.closeRegion; @@ -35,7 +34,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.RegionLocations; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.ClusterConnection; @@ -57,6 +55,8 @@ import org.apache.hadoop.hbase.regionserver.wal.WALEdit; import org.apache.hadoop.hbase.replication.ReplicationEndpoint; import org.apache.hadoop.hbase.replication.ReplicationEndpoint.ReplicateContext; import org.apache.hadoop.hbase.replication.regionserver.RegionReplicaReplicationEndpoint.RegionReplicaReplayCallable; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.apache.hadoop.hbase.util.ServerRegionReplicaUtil; import org.junit.After; import org.junit.AfterClass; @@ -72,7 +72,7 @@ import com.google.common.collect.Lists; * Tests RegionReplicaReplicationEndpoint. Unlike TestRegionReplicaReplicationEndpoint this * class contains lower level tests using callables. */ -@Category(MediumTests.class) +@Category({ReplicationTests.class, MediumTests.class}) public class TestRegionReplicaReplicationEndpointNoMaster { private static final Log LOG = LogFactory.getLog( diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationHLogReaderManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationHLogReaderManager.java index dfc89bc..2b0f34b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationHLogReaderManager.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationHLogReaderManager.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.replication.regionserver; import org.apache.hadoop.conf.Configuration; @@ -26,13 +25,14 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.HLogFactory; import org.apache.hadoop.hbase.regionserver.wal.HLogKey; import org.apache.hadoop.hbase.regionserver.wal.WALActionsListener; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hdfs.MiniDFSCluster; import org.junit.After; @@ -47,14 +47,13 @@ import org.junit.runners.Parameterized.Parameters; import static org.junit.Assert.*; -import java.io.EOFException; import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.concurrent.atomic.AtomicLong; -@Category(LargeTests.class) +@Category({ReplicationTests.class, LargeTests.class}) @RunWith(Parameterized.class) public class TestReplicationHLogReaderManager { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java index 211877c..f6ad422 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSink.java @@ -26,6 +26,8 @@ import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.apache.hadoop.hbase.util.ByteStringer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -35,7 +37,6 @@ import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Stoppable; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Result; @@ -51,7 +52,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({ReplicationTests.class, MediumTests.class}) public class TestReplicationSink { private static final Log LOG = LogFactory.getLog(TestReplicationSink.class); private static final int BATCH_SIZE = 10; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSinkManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSinkManager.java index 9175192..a2ea258 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSinkManager.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSinkManager.java @@ -25,7 +25,8 @@ import java.util.List; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.client.HConnection; import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.AdminService; import org.apache.hadoop.hbase.replication.HBaseReplicationEndpoint; @@ -37,7 +38,7 @@ import org.junit.experimental.categories.Category; import com.google.common.collect.Lists; -@Category(SmallTests.class) +@Category({ReplicationTests.class, SmallTests.class}) public class TestReplicationSinkManager { private static final String PEER_CLUSTER_ID = "PEER_CLUSTER_ID"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java index 99ad601..084f808 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java @@ -46,7 +46,6 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.CoordinatedStateManager; @@ -63,6 +62,8 @@ import org.apache.hadoop.hbase.replication.ReplicationQueues; import org.apache.hadoop.hbase.replication.ReplicationSourceDummy; import org.apache.hadoop.hbase.replication.ReplicationStateZKBase; import org.apache.hadoop.hbase.replication.regionserver.ReplicationSourceManager.NodeFailoverWorker; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.MetaTableLocator; import org.apache.hadoop.hbase.zookeeper.ZKClusterId; @@ -77,7 +78,7 @@ import org.junit.experimental.categories.Category; import com.google.common.collect.Sets; -@Category(MediumTests.class) +@Category({ReplicationTests.class, MediumTests.class}) public class TestReplicationSourceManager { private static final Log LOG = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationThrottler.java hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationThrottler.java index 2d6499a..692e9be 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationThrottler.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationThrottler.java @@ -18,18 +18,18 @@ package org.apache.hadoop.hbase.replication.regionserver; -import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.ReplicationTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({ReplicationTests.class, SmallTests.class}) public class TestReplicationThrottler { private static final Log LOG = LogFactory.getLog(TestReplicationThrottler.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestDeleteRow.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestDeleteRow.java index 89e1b20..516ce9e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestDeleteRow.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestDeleteRow.java @@ -20,16 +20,14 @@ package org.apache.hadoop.hbase.rest; import static org.junit.Assert.assertEquals; import java.io.IOException; - import javax.xml.bind.JAXBException; - -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.rest.client.Response; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RestTests; import org.junit.Test; import org.junit.experimental.categories.Category; - -@Category(MediumTests.class) +@Category({RestTests.class, MediumTests.class}) public class TestDeleteRow extends RowResourceBase { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestGZIPResponseWrapper.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestGZIPResponseWrapper.java index 763765f..18beb24 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestGZIPResponseWrapper.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestGZIPResponseWrapper.java @@ -30,13 +30,14 @@ import java.io.IOException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RestTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.rest.filter.GZIPResponseStream; import org.apache.hadoop.hbase.rest.filter.GZIPResponseWrapper; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RestTests.class, SmallTests.class}) public class TestGZIPResponseWrapper { private final HttpServletResponse response = mock(HttpServletResponse.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestGetAndPutResource.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestGetAndPutResource.java index c14f3e2..a5326af 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestGetAndPutResource.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestGetAndPutResource.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.rest; import static org.junit.Assert.assertEquals; @@ -32,20 +31,19 @@ import javax.xml.bind.JAXBException; import org.apache.commons.httpclient.Header; import org.apache.hadoop.hbase.CompatibilityFactory; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.rest.client.Response; import org.apache.hadoop.hbase.rest.model.CellModel; import org.apache.hadoop.hbase.rest.model.CellSetModel; import org.apache.hadoop.hbase.rest.model.RowModel; -import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.security.UserProvider; import org.apache.hadoop.hbase.test.MetricsAssertHelper; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RestTests; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hadoop.security.UserGroupInformation; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RestTests.class, MediumTests.class}) public class TestGetAndPutResource extends RowResourceBase { private static final MetricsAssertHelper METRICS_ASSERT = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java index d3d6171..66483d7 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java @@ -16,7 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.rest; import static org.junit.Assert.assertEquals; @@ -32,7 +31,6 @@ import org.apache.commons.httpclient.Header; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Get; @@ -42,13 +40,15 @@ import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.rest.client.Client; import org.apache.hadoop.hbase.rest.client.Cluster; import org.apache.hadoop.hbase.rest.client.Response; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RestTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RestTests.class, MediumTests.class}) public class TestGzipFilter { private static final TableName TABLE = TableName.valueOf("TestGzipFilter"); private static final String CFA = "a"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java index 64dc02f..c7da65a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java @@ -16,13 +16,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.rest; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.rest.client.Client; import org.apache.hadoop.hbase.rest.client.Cluster; import org.apache.hadoop.hbase.rest.client.Response; @@ -30,6 +28,8 @@ import org.apache.hadoop.hbase.rest.model.CellModel; import org.apache.hadoop.hbase.rest.model.CellSetModel; import org.apache.hadoop.hbase.rest.model.RowModel; import org.apache.hadoop.hbase.rest.provider.JacksonProvider; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RestTests; import org.apache.hadoop.hbase.util.Bytes; import org.codehaus.jackson.map.ObjectMapper; import org.junit.AfterClass; @@ -46,8 +46,7 @@ import java.io.IOException; import static org.junit.Assert.assertEquals; - -@Category(MediumTests.class) +@Category({RestTests.class, MediumTests.class}) public class TestMultiRowResource { private static final TableName TABLE = TableName.valueOf("TestRowResource"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestResourceFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestResourceFilter.java index 70d425c..11d465f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestResourceFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestResourceFilter.java @@ -20,16 +20,17 @@ package org.apache.hadoop.hbase.rest; import static org.junit.Assert.assertEquals; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.rest.client.Client; import org.apache.hadoop.hbase.rest.client.Cluster; import org.apache.hadoop.hbase.rest.client.Response; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RestTests; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RestTests.class, MediumTests.class}) public class TestResourceFilter { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java index e3ed916..2387b98 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java @@ -45,6 +45,8 @@ import org.apache.hadoop.hbase.rest.model.CellModel; import org.apache.hadoop.hbase.rest.model.CellSetModel; import org.apache.hadoop.hbase.rest.model.RowModel; import org.apache.hadoop.hbase.rest.model.ScannerModel; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RestTests; import org.apache.hadoop.hbase.util.Bytes; import static org.junit.Assert.*; @@ -54,7 +56,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RestTests.class, MediumTests.class}) public class TestScannerResource { private static final TableName TABLE = TableName.valueOf("TestScannerResource"); private static final String NONEXISTENT_TABLE = "ThisTableDoesNotExist"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java index e60208b..7f0b1f5 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java @@ -62,6 +62,8 @@ import org.apache.hadoop.hbase.rest.model.CellModel; import org.apache.hadoop.hbase.rest.model.CellSetModel; import org.apache.hadoop.hbase.rest.model.RowModel; import org.apache.hadoop.hbase.rest.model.ScannerModel; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RestTests; import org.apache.hadoop.hbase.util.Bytes; import static org.junit.Assert.*; @@ -71,7 +73,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RestTests.class, MediumTests.class}) public class TestScannersWithFilters { private static final Log LOG = LogFactory.getLog(TestScannersWithFilters.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithLabels.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithLabels.java index e8ec7e3..ca48ea8 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithLabels.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithLabels.java @@ -14,7 +14,8 @@ * 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.rest; + */ +package org.apache.hadoop.hbase.rest; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -36,7 +37,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Durability; @@ -59,13 +59,15 @@ import org.apache.hadoop.hbase.security.visibility.VisibilityClient; import org.apache.hadoop.hbase.security.visibility.VisibilityConstants; import org.apache.hadoop.hbase.security.visibility.VisibilityController; import org.apache.hadoop.hbase.security.visibility.VisibilityUtils; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RestTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RestTests.class, MediumTests.class}) public class TestScannersWithLabels { private static final TableName TABLE = TableName.valueOf("TestScannersWithLabels"); private static final String CFA = "a"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java index 36cd193..17bb733 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java @@ -16,7 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.rest; import java.io.ByteArrayInputStream; @@ -28,16 +27,16 @@ import javax.xml.bind.JAXBException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.rest.client.Client; import org.apache.hadoop.hbase.rest.client.Cluster; import org.apache.hadoop.hbase.rest.client.Response; import org.apache.hadoop.hbase.rest.model.ColumnSchemaModel; import org.apache.hadoop.hbase.rest.model.TableSchemaModel; import org.apache.hadoop.hbase.rest.model.TestTableSchemaModel; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RestTests; import org.apache.hadoop.hbase.util.Bytes; import static org.junit.Assert.*; @@ -47,7 +46,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RestTests.class, MediumTests.class}) public class TestSchemaResource { private static String TABLE1 = "TestSchemaResource1"; private static String TABLE2 = "TestSchemaResource2"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java index c9aa191..f540e37 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java @@ -16,7 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.rest; import java.io.ByteArrayInputStream; @@ -26,12 +25,13 @@ import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.rest.client.Client; import org.apache.hadoop.hbase.rest.client.Cluster; import org.apache.hadoop.hbase.rest.client.Response; import org.apache.hadoop.hbase.rest.model.StorageClusterStatusModel; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RestTests; import org.apache.hadoop.hbase.util.Bytes; import static org.junit.Assert.*; @@ -41,7 +41,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RestTests.class, MediumTests.class}) public class TestStatusResource { private static final byte[] META_REGION_NAME = Bytes.toBytes(TableName.META_TABLE_NAME+",,1"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java index 719f7c2..77e89cd 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java @@ -42,6 +42,8 @@ import org.apache.hadoop.hbase.rest.model.TableModel; import org.apache.hadoop.hbase.rest.model.TableInfoModel; import org.apache.hadoop.hbase.rest.model.TableListModel; import org.apache.hadoop.hbase.rest.model.TableRegionModel; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RestTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.util.StringUtils; @@ -52,7 +54,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RestTests.class, MediumTests.class}) public class TestTableResource { private static final Log LOG = LogFactory.getLog(TestTableResource.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java index 749b8ea..789e9e1 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java @@ -46,10 +46,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.filter.Filter; import org.apache.hadoop.hbase.filter.ParseFilter; import org.apache.hadoop.hbase.filter.PrefixFilter; @@ -60,6 +58,8 @@ import org.apache.hadoop.hbase.rest.model.CellModel; import org.apache.hadoop.hbase.rest.model.CellSetModel; import org.apache.hadoop.hbase.rest.model.RowModel; import org.apache.hadoop.hbase.rest.provider.JacksonProvider; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RestTests; import org.apache.hadoop.hbase.util.Bytes; import org.codehaus.jackson.JsonFactory; import org.codehaus.jackson.JsonParser; @@ -72,7 +72,7 @@ import org.junit.experimental.categories.Category; import org.xml.sax.InputSource; import org.xml.sax.XMLReader; -@Category(MediumTests.class) +@Category({RestTests.class, MediumTests.class}) public class TestTableScan { private static final TableName TABLE = TableName.valueOf("TestScanResource"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java index ef68084..34973c2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java @@ -16,7 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.rest; import java.io.ByteArrayInputStream; @@ -28,12 +27,13 @@ import javax.xml.bind.JAXBException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.rest.client.Client; import org.apache.hadoop.hbase.rest.client.Cluster; import org.apache.hadoop.hbase.rest.client.Response; import org.apache.hadoop.hbase.rest.model.StorageClusterVersionModel; import org.apache.hadoop.hbase.rest.model.VersionModel; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RestTests; import org.apache.hadoop.hbase.util.Bytes; import static org.junit.Assert.*; @@ -45,7 +45,7 @@ import org.junit.Test; import com.sun.jersey.spi.container.servlet.ServletContainer; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RestTests.class, MediumTests.class}) public class TestVersionResource { private static final Log LOG = LogFactory.getLog(TestVersionResource.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdminRetries.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdminRetries.java index a5e5b93..7c888e0 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdminRetries.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdminRetries.java @@ -32,7 +32,8 @@ import java.util.regex.Pattern; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RestTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.Before; import org.junit.Test; @@ -41,7 +42,7 @@ import org.junit.experimental.categories.Category; /** * Tests {@link RemoteAdmin} retries. */ -@Category(SmallTests.class) +@Category({RestTests.class, SmallTests.class}) public class TestRemoteAdminRetries { private static final int SLEEP_TIME = 50; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteHTableRetries.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteHTableRetries.java index 547dfab..5b18a6a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteHTableRetries.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteHTableRetries.java @@ -32,7 +32,8 @@ import java.util.regex.Pattern; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RestTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; @@ -46,7 +47,7 @@ import org.junit.experimental.categories.Category; /** * Test RemoteHTable retries. */ -@Category(SmallTests.class) +@Category({RestTests.class, SmallTests.class}) public class TestRemoteHTableRetries { private static final int SLEEP_TIME = 50; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java index cade2dc..9516995 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java @@ -16,7 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.rest.client; import static org.junit.Assert.assertEquals; @@ -37,7 +36,6 @@ import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Delete; @@ -49,6 +47,8 @@ import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.rest.HBaseRESTTestingUtility; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RestTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; import org.junit.AfterClass; @@ -57,7 +57,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({RestTests.class, MediumTests.class}) public class TestRemoteTable { private static final TableName TABLE = TableName.valueOf("TestRemoteTable"); private static final byte[] ROW_1 = Bytes.toBytes("testrow1"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellModel.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellModel.java index 170dfab..cdc6ee5 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellModel.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellModel.java @@ -19,22 +19,13 @@ package org.apache.hadoop.hbase.rest.model; -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; - -import com.sun.jersey.api.json.JSONJAXBContext; -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.util.Base64; +import org.apache.hadoop.hbase.testclassification.RestTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; -import junit.framework.TestCase; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RestTests.class, SmallTests.class}) public class TestCellModel extends TestModelBase { private static final long TIMESTAMP = 1245219839331L; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellSetModel.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellSetModel.java index 716da14..2bef955 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellSetModel.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestCellSetModel.java @@ -19,22 +19,15 @@ package org.apache.hadoop.hbase.rest.model; -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; import java.util.Iterator; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; - -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.util.Base64; +import org.apache.hadoop.hbase.testclassification.RestTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; -import junit.framework.TestCase; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RestTests.class, SmallTests.class}) public class TestCellSetModel extends TestModelBase { private static final byte[] ROW1 = Bytes.toBytes("testrow1"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.java index 15e1652..af5545e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestColumnSchemaModel.java @@ -19,19 +19,11 @@ package org.apache.hadoop.hbase.rest.model; -import java.io.StringReader; -import java.io.StringWriter; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; - -import junit.framework.TestCase; -import org.apache.hadoop.hbase.SmallTests; -import org.junit.Ignore; -import org.junit.Test; +import org.apache.hadoop.hbase.testclassification.RestTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RestTests.class, SmallTests.class}) public class TestColumnSchemaModel extends TestModelBase { protected static final String COLUMN_NAME = "testcolumn"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java index 500d924..46df357 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java @@ -21,7 +21,8 @@ package org.apache.hadoop.hbase.rest.model; import junit.framework.TestCase; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RestTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.rest.ProtobufMessageHandler; import org.apache.hadoop.hbase.rest.provider.JAXBContextResolver; import org.apache.hadoop.hbase.util.Base64; @@ -37,7 +38,7 @@ import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; -@Category(SmallTests.class) +@Category({RestTests.class, SmallTests.class}) public abstract class TestModelBase extends TestCase { protected String AS_XML; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestRowModel.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestRowModel.java index e0068c8..b5dcf2f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestRowModel.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestRowModel.java @@ -19,20 +19,17 @@ package org.apache.hadoop.hbase.rest.model; -import java.io.StringReader; -import java.io.StringWriter; import java.util.Iterator; import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RestTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; -import junit.framework.TestCase; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RestTests.class, SmallTests.class}) public class TestRowModel extends TestModelBase { private static final byte[] ROW1 = Bytes.toBytes("testrow1"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java index 3102bfd..ef0696d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestScannerModel.java @@ -19,11 +19,12 @@ package org.apache.hadoop.hbase.rest.model; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RestTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RestTests.class, SmallTests.class}) public class TestScannerModel extends TestModelBase { private static final String PRIVATE = "private"; private static final String PUBLIC = "public"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java index 0f852ca..36850a5 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterStatusModel.java @@ -21,14 +21,14 @@ package org.apache.hadoop.hbase.rest.model; import java.util.Iterator; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RestTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.util.Base64; import org.apache.hadoop.hbase.util.Bytes; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RestTests.class, SmallTests.class}) public class TestStorageClusterStatusModel extends TestModelBase { public TestStorageClusterStatusModel() throws Exception { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterVersionModel.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterVersionModel.java index bd4fa1f..602312d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterVersionModel.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestStorageClusterVersionModel.java @@ -19,17 +19,11 @@ package org.apache.hadoop.hbase.rest.model; -import java.io.StringReader; -import java.io.StringWriter; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; - -import junit.framework.TestCase; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RestTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RestTests.class, SmallTests.class}) public class TestStorageClusterVersionModel extends TestModelBase { private static final String VERSION = "0.0.1-testing"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableInfoModel.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableInfoModel.java index dadb9ad..a061b31 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableInfoModel.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableInfoModel.java @@ -19,22 +19,15 @@ package org.apache.hadoop.hbase.rest.model; -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; import java.util.Iterator; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; - -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.util.Base64; +import org.apache.hadoop.hbase.testclassification.RestTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; -import junit.framework.TestCase; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RestTests.class, SmallTests.class}) public class TestTableInfoModel extends TestModelBase { private static final String TABLE = "testtable"; private static final byte[] START_KEY = Bytes.toBytes("abracadbra"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableListModel.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableListModel.java index 4cb9194..f20486d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableListModel.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableListModel.java @@ -19,21 +19,14 @@ package org.apache.hadoop.hbase.rest.model; -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; import java.util.Iterator; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import org.apache.hadoop.hbase.testclassification.RestTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.util.Base64; - -import junit.framework.TestCase; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RestTests.class, SmallTests.class}) public class TestTableListModel extends TestModelBase { private static final String TABLE1 = "table1"; private static final String TABLE2 = "table2"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableRegionModel.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableRegionModel.java index 5c4b1a9..d592381 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableRegionModel.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableRegionModel.java @@ -19,19 +19,14 @@ package org.apache.hadoop.hbase.rest.model; -import java.io.StringReader; -import java.io.StringWriter; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; - import org.apache.hadoop.hbase.*; +import org.apache.hadoop.hbase.testclassification.RestTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.util.Bytes; -import junit.framework.TestCase; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RestTests.class, SmallTests.class}) public class TestTableRegionModel extends TestModelBase { private static final String TABLE = "testtable"; private static final byte[] START_KEY = Bytes.toBytes("abracadbra"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableSchemaModel.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableSchemaModel.java index b725f7b..4b2eb05 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableSchemaModel.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestTableSchemaModel.java @@ -19,23 +19,16 @@ package org.apache.hadoop.hbase.rest.model; -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; import java.util.Iterator; import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.util.Base64; +import org.apache.hadoop.hbase.testclassification.RestTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; -import org.apache.hadoop.hbase.rest.model.TableSchemaModel; - -import junit.framework.TestCase; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RestTests.class, SmallTests.class}) public class TestTableSchemaModel extends TestModelBase { public static final String TABLE_NAME = "testTable"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestVersionModel.java hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestVersionModel.java index 553bb35..e8da529 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestVersionModel.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/rest/model/TestVersionModel.java @@ -16,23 +16,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.rest.model; -import java.io.IOException; -import java.io.StringReader; -import java.io.StringWriter; - -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; - -import org.apache.hadoop.hbase.SmallTests; -import org.apache.hadoop.hbase.util.Base64; +import org.apache.hadoop.hbase.testclassification.RestTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; -import junit.framework.TestCase; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({RestTests.class, SmallTests.class}) public class TestVersionModel extends TestModelBase { private static final String REST_VERSION = "0.0.1"; private static final String OS_VERSION = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestHBaseSaslRpcClient.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestHBaseSaslRpcClient.java index a93aecc..21450a2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestHBaseSaslRpcClient.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestHBaseSaslRpcClient.java @@ -43,7 +43,8 @@ import javax.security.sasl.RealmCallback; import javax.security.sasl.RealmChoiceCallback; import javax.security.sasl.SaslClient; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.security.HBaseSaslRpcClient.SaslClientCallbackHandler; import org.apache.hadoop.io.DataInputBuffer; import org.apache.hadoop.io.DataOutputBuffer; @@ -58,7 +59,7 @@ import org.mockito.Mockito; import com.google.common.base.Strings; -@Category(SmallTests.class) +@Category({SecurityTests.class, SmallTests.class}) public class TestHBaseSaslRpcClient { static { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestSecureRPC.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestSecureRPC.java index ab16bcb..381079e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestSecureRPC.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestSecureRPC.java @@ -35,7 +35,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeys; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.ipc.FifoRpcScheduler; import org.apache.hadoop.hbase.ipc.RpcClient; import org.apache.hadoop.hbase.ipc.RpcServer; @@ -53,7 +54,7 @@ import com.google.common.collect.Lists; import com.google.protobuf.BlockingRpcChannel; import com.google.protobuf.BlockingService; -@Category(SmallTests.class) +@Category({SecurityTests.class, SmallTests.class}) public class TestSecureRPC { public static RpcServerInterface rpcServer; /** diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUser.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUser.java index be74710..389d406 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUser.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUser.java @@ -32,13 +32,14 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.CommonConfigurationKeys; import org.apache.hadoop.hbase.HBaseConfiguration; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; import com.google.common.collect.ImmutableSet; -@Category(SmallTests.class) +@Category({SecurityTests.class, SmallTests.class}) public class TestUser { private static Log LOG = LogFactory.getLog(TestUser.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUsersOperationsWithSecureHadoop.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUsersOperationsWithSecureHadoop.java index 4dec02c..a66c124 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUsersOperationsWithSecureHadoop.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestUsersOperationsWithSecureHadoop.java @@ -31,12 +31,13 @@ import static org.junit.Assume.assumeTrue; import java.io.IOException; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.security.UserGroupInformation; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({SecurityTests.class, SmallTests.class}) public class TestUsersOperationsWithSecureHadoop { /** * test login with security enabled configuration diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java index df358cd..2eec09d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java @@ -29,7 +29,8 @@ import java.util.UUID; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; @@ -47,7 +48,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TestName; -@Category(LargeTests.class) +@Category({SecurityTests.class, LargeTests.class}) public class TestAccessControlFilter extends SecureTestUtil { @Rule public TestName name = new TestName(); private static HBaseTestingUtility TEST_UTIL; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java index f86a82c..e93ee7f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.security.access; import static org.junit.Assert.assertEquals; @@ -43,7 +42,6 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; @@ -96,6 +94,8 @@ import org.apache.hadoop.hbase.regionserver.RegionServerCoprocessorHost; import org.apache.hadoop.hbase.regionserver.ScanType; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.security.access.Permission.Action; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil; import org.apache.hadoop.hbase.util.TestTableName; @@ -119,7 +119,7 @@ import com.google.protobuf.ServiceException; * Performs authorization checks for common operations, according to different * levels of authorized users. */ -@Category(LargeTests.class) +@Category({SecurityTests.class, LargeTests.class}) public class TestAccessController extends SecureTestUtil { private static final Log LOG = LogFactory.getLog(TestAccessController.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java index dcc3d16..62d35bf 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java @@ -25,11 +25,12 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.security.access.Permission.Action; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.TestTableName; import org.junit.AfterClass; @@ -38,7 +39,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({SecurityTests.class, LargeTests.class}) public class TestAccessController2 extends SecureTestUtil { private static final byte[] TEST_FAMILY = Bytes.toBytes("f"); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLWithMultipleVersions.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLWithMultipleVersions.java index 40e2a02..0459b9f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLWithMultipleVersions.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLWithMultipleVersions.java @@ -31,7 +31,6 @@ import org.apache.hadoop.hbase.Coprocessor; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Delete; @@ -43,6 +42,8 @@ import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.master.MasterCoprocessorHost; import org.apache.hadoop.hbase.regionserver.RegionServerCoprocessorHost; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.TestTableName; @@ -56,7 +57,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({SecurityTests.class, MediumTests.class}) public class TestCellACLWithMultipleVersions extends SecureTestUtil { private static final Log LOG = LogFactory.getLog(TestCellACLWithMultipleVersions.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLs.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLs.java index f58847e..b272993 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLs.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLs.java @@ -29,7 +29,6 @@ import org.apache.hadoop.hbase.Coprocessor; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Delete; @@ -45,6 +44,8 @@ import org.apache.hadoop.hbase.master.MasterCoprocessorHost; import org.apache.hadoop.hbase.regionserver.RegionServerCoprocessorHost; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.security.access.Permission.Action; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.TestTableName; import org.apache.log4j.Level; @@ -59,7 +60,7 @@ import org.junit.experimental.categories.Category; import com.google.common.collect.Lists; -@Category(MediumTests.class) +@Category({SecurityTests.class, MediumTests.class}) public class TestCellACLs extends SecureTestUtil { private static final Log LOG = LogFactory.getLog(TestCellACLs.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java index 0990dd9..6b38bc9 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java @@ -25,7 +25,6 @@ import java.util.List; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HTable; @@ -37,6 +36,8 @@ import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.AccessControlService; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.security.access.Permission.Action; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; @@ -47,7 +48,7 @@ import org.junit.experimental.categories.Category; import com.google.common.collect.ListMultimap; import com.google.protobuf.BlockingRpcChannel; -@Category(MediumTests.class) +@Category({SecurityTests.class, MediumTests.class}) public class TestNamespaceCommands extends SecureTestUtil { private static HBaseTestingUtility UTIL = new HBaseTestingUtility(); private static String TestNamespace = "ns1"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestScanEarlyTermination.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestScanEarlyTermination.java index d78e43e..0b1fb64 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestScanEarlyTermination.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestScanEarlyTermination.java @@ -28,7 +28,6 @@ import org.apache.hadoop.hbase.Coprocessor; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.HTable; @@ -40,6 +39,8 @@ import org.apache.hadoop.hbase.master.MasterCoprocessorHost; import org.apache.hadoop.hbase.regionserver.RegionServerCoprocessorHost; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.security.access.Permission.Action; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.TestTableName; import org.apache.log4j.Level; @@ -52,7 +53,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({SecurityTests.class, MediumTests.class}) public class TestScanEarlyTermination extends SecureTestUtil { private static final Log LOG = LogFactory.getLog(TestScanEarlyTermination.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java index c65ebef..7bdf55a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.security.access; import static org.junit.Assert.assertEquals; @@ -43,10 +42,11 @@ import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.exceptions.DeserializationException; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.apache.hadoop.io.Text; @@ -62,7 +62,7 @@ import com.google.common.collect.ListMultimap; /** * Test the reading and writing of access permissions on {@code _acl_} table. */ -@Category(LargeTests.class) +@Category({SecurityTests.class, LargeTests.class}) public class TestTablePermissions { private static final Log LOG = LogFactory.getLog(TestTablePermissions.class); private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestZKPermissionsWatcher.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestZKPermissionsWatcher.java index 85803ef..9c2bc3c 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestZKPermissionsWatcher.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestZKPermissionsWatcher.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.security.access; import static org.junit.Assert.assertFalse; @@ -31,9 +30,10 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.Waiter.Predicate; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -43,7 +43,7 @@ import org.junit.experimental.categories.Category; /** * Test the reading and writing of access permissions to and from zookeeper. */ -@Category(LargeTests.class) +@Category({SecurityTests.class, LargeTests.class}) public class TestZKPermissionsWatcher { private static final Log LOG = LogFactory.getLog(TestZKPermissionsWatcher.class); private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestAuthenticationKey.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestAuthenticationKey.java index 50d5095..9734159 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestAuthenticationKey.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestAuthenticationKey.java @@ -24,12 +24,13 @@ import java.io.UnsupportedEncodingException; import javax.crypto.SecretKey; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; -@Category(SmallTests.class) +@Category({SecurityTests.class, SmallTests.class}) public class TestAuthenticationKey { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java index 1773027..ce143ab 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestTokenAuthentication.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.security.token; import static org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_SECURITY_AUTHORIZATION; @@ -38,7 +37,6 @@ import org.apache.hadoop.hbase.CoordinatedStateManager; import org.apache.hadoop.hbase.Coprocessor; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Server; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; @@ -58,6 +56,8 @@ import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.RegionServerServices; import org.apache.hadoop.hbase.security.SecurityInfo; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.util.Sleeper; @@ -87,7 +87,7 @@ import com.google.protobuf.ServiceException; /** * Tests for authentication token creation and usage */ -@Category(MediumTests.class) +@Category({SecurityTests.class, MediumTests.class}) public class TestTokenAuthentication { static { // Setting whatever system properties after recommendation from diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java index b22a713..9552ad3 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/token/TestZKSecretWatcher.java @@ -32,7 +32,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.junit.AfterClass; @@ -44,7 +45,7 @@ import org.junit.experimental.categories.Category; * Test the synchronization of token authentication master keys through * ZKSecretWatcher */ -@Category(LargeTests.class) +@Category({SecurityTests.class, LargeTests.class}) public class TestZKSecretWatcher { private static Log LOG = LogFactory.getLog(TestZKSecretWatcher.class); private static HBaseTestingUtility TEST_UTIL; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestEnforcingScanLabelGenerator.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestEnforcingScanLabelGenerator.java index cec7517..c1e2d1e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestEnforcingScanLabelGenerator.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestEnforcingScanLabelGenerator.java @@ -27,7 +27,6 @@ import java.security.PrivilegedExceptionAction; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HTable; @@ -35,6 +34,8 @@ import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -43,7 +44,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TestName; -@Category(MediumTests.class) +@Category({SecurityTests.class, MediumTests.class}) public class TestEnforcingScanLabelGenerator { public static final String CONFIDENTIAL = "confidential"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestExpressionExpander.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestExpressionExpander.java index ea3e892e..e0c0b98 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestExpressionExpander.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestExpressionExpander.java @@ -20,7 +20,8 @@ package org.apache.hadoop.hbase.security.visibility; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.security.visibility.expression.ExpressionNode; import org.apache.hadoop.hbase.security.visibility.expression.LeafExpressionNode; import org.apache.hadoop.hbase.security.visibility.expression.NonLeafExpressionNode; @@ -28,7 +29,7 @@ import org.apache.hadoop.hbase.security.visibility.expression.Operator; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({SecurityTests.class, SmallTests.class}) public class TestExpressionExpander { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestExpressionParser.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestExpressionParser.java index ed2a1d5..7c7f54b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestExpressionParser.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestExpressionParser.java @@ -21,7 +21,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.security.visibility.expression.ExpressionNode; import org.apache.hadoop.hbase.security.visibility.expression.LeafExpressionNode; import org.apache.hadoop.hbase.security.visibility.expression.NonLeafExpressionNode; @@ -29,7 +30,7 @@ import org.apache.hadoop.hbase.security.visibility.expression.Operator; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({SecurityTests.class, SmallTests.class}) public class TestExpressionParser { private ExpressionParser parser = new ExpressionParser(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOpWithDifferentUsersNoACL.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOpWithDifferentUsersNoACL.java index e22cf23..2c4955c 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOpWithDifferentUsersNoACL.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsOpWithDifferentUsersNoACL.java @@ -28,10 +28,11 @@ import java.util.List; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.GetAuthsResponse; import org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsResponse; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -42,7 +43,7 @@ import org.junit.rules.TestName; import com.google.protobuf.ByteString; -@Category(MediumTests.class) +@Category({SecurityTests.class, MediumTests.class}) public class TestVisibilityLabelsOpWithDifferentUsersNoACL { private static final String PRIVATE = "private"; private static final String CONFIDENTIAL = "confidential"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithACL.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithACL.java index 17693d2..03510dc 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithACL.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithACL.java @@ -30,7 +30,6 @@ import java.util.List; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HTable; @@ -46,6 +45,8 @@ import org.apache.hadoop.hbase.security.access.AccessControlLists; import org.apache.hadoop.hbase.security.access.AccessController; import org.apache.hadoop.hbase.security.access.Permission; import org.apache.hadoop.hbase.security.access.SecureTestUtil; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -56,7 +57,7 @@ import org.junit.rules.TestName; import com.google.protobuf.ByteString; -@Category(MediumTests.class) +@Category({SecurityTests.class, MediumTests.class}) public class TestVisibilityLabelsWithACL { private static final String PRIVATE = "private"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithCustomVisLabService.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithCustomVisLabService.java index 0d78da0..5cc72d2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithCustomVisLabService.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithCustomVisLabService.java @@ -25,16 +25,17 @@ import java.util.List; import java.util.NavigableMap; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({SecurityTests.class, MediumTests.class}) public class TestVisibilityLabelsWithCustomVisLabService extends TestVisibilityLabels { @BeforeClass diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java index 9a04003..c8f2222 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java @@ -30,7 +30,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; @@ -41,6 +40,8 @@ import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionActionResul import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameBytesPair; import org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsResponse; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; import org.apache.hadoop.hbase.util.Threads; @@ -49,7 +50,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({SecurityTests.class, MediumTests.class}) public class TestVisibilityLabelsWithDefaultVisLabelService extends TestVisibilityLabels { final Log LOG = LogFactory.getLog(getClass()); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDeletes.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDeletes.java index 1a617dc..c6bdfc2 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDeletes.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDeletes.java @@ -34,7 +34,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Delete; @@ -47,6 +46,8 @@ import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsResponse; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.After; import org.junit.AfterClass; @@ -59,7 +60,7 @@ import org.junit.rules.TestName; /** * Tests visibility labels with deletes */ -@Category(MediumTests.class) +@Category({SecurityTests.class, MediumTests.class}) public class TestVisibilityLabelsWithDeletes { private static final String TOPSECRET = "TOPSECRET"; private static final String PUBLIC = "PUBLIC"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDistributedLogReplay.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDistributedLogReplay.java index 11a830c..8c00db4 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDistributedLogReplay.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDistributedLogReplay.java @@ -20,15 +20,16 @@ package org.apache.hadoop.hbase.security.visibility; import static org.apache.hadoop.hbase.security.visibility.VisibilityConstants.LABELS_TABLE_NAME; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; /** * Test class that tests the visibility labels with distributed log replay feature ON. */ -@Category(MediumTests.class) +@Category({SecurityTests.class, MediumTests.class}) public class TestVisibilityLabelsWithDistributedLogReplay extends TestVisibilityLabelsWithDefaultVisLabelService { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithSLGStack.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithSLGStack.java index 2815d62..371d25a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithSLGStack.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithSLGStack.java @@ -27,7 +27,6 @@ import java.security.PrivilegedExceptionAction; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; @@ -36,6 +35,8 @@ import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsResponse; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -44,7 +45,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TestName; -@Category(MediumTests.class) +@Category({SecurityTests.class, MediumTests.class}) public class TestVisibilityLabelsWithSLGStack { public static final String CONFIDENTIAL = "confidential"; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityWithCheckAuths.java hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityWithCheckAuths.java index ff0d29f..4918084 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityWithCheckAuths.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityWithCheckAuths.java @@ -28,7 +28,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Append; @@ -37,6 +36,8 @@ import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.protobuf.generated.VisibilityLabelsProtos.VisibilityLabelsResponse; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.Assert; @@ -46,7 +47,7 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TestName; -@Category(MediumTests.class) +@Category({SecurityTests.class, MediumTests.class}) /** * Test visibility by setting 'hbase.security.visibility.mutations.checkauths' to true */ diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java index d0d1785..192009b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java @@ -37,7 +37,7 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.HTable; @@ -47,6 +47,8 @@ import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescriptio import org.apache.hadoop.hbase.protobuf.generated.SnapshotProtos.SnapshotFileInfo; import org.apache.hadoop.hbase.protobuf.generated.SnapshotProtos.SnapshotRegionManifest; import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils.SnapshotMock; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.Pair; @@ -60,7 +62,7 @@ import org.junit.experimental.categories.Category; /** * Test Export Snapshot Tool */ -@Category(MediumTests.class) +@Category({VerySlowRegionServerTests.class, MediumTests.class}) public class TestExportSnapshot { private final Log LOG = LogFactory.getLog(getClass()); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java index be12cc5..bbcf7b9 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestFlushSnapshotFromClient.java @@ -25,10 +25,8 @@ import java.io.IOException; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.concurrent.CountDownLatch; import org.apache.commons.logging.Log; @@ -40,11 +38,9 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.ScannerCallable; import org.apache.hadoop.hbase.ipc.RpcClient; @@ -53,10 +49,10 @@ import org.apache.hadoop.hbase.master.HMaster; import org.apache.hadoop.hbase.master.snapshot.SnapshotManager; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription; import org.apache.hadoop.hbase.regionserver.ConstantSizeRegionSplitPolicy; -import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; -import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread; import org.apache.log4j.Level; import org.junit.After; import org.junit.AfterClass; @@ -73,7 +69,7 @@ import org.junit.experimental.categories.Category; * TODO This is essentially a clone of TestSnapshotFromClient. This is worth refactoring this * because there will be a few more flavors of snapshots that need to run these tests. */ -@Category(LargeTests.class) +@Category({RegionServerTests.class, LargeTests.class}) public class TestFlushSnapshotFromClient { private static final Log LOG = LogFactory.getLog(TestFlushSnapshotFromClient.class); private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.java hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.java index 08ac6de..e6bc205 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.java @@ -23,15 +23,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.master.MasterFileSystem; import org.apache.hadoop.hbase.master.snapshot.SnapshotManager; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription; import org.apache.hadoop.hbase.regionserver.snapshot.RegionServerSnapshotManager; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; import org.junit.After; @@ -47,7 +47,7 @@ import org.junit.experimental.categories.Category; * TODO This is essentially a clone of TestRestoreSnapshotFromClient. This is worth refactoring * this because there will be a few more flavors of snapshots that need to run these tests. */ -@Category(LargeTests.class) +@Category({RegionServerTests.class, LargeTests.class}) public class TestRestoreFlushSnapshotFromClient { final Log LOG = LogFactory.getLog(getClass()); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java index 7963665..7309580 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java @@ -30,7 +30,8 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.errorhandling.ForeignExceptionDispatcher; import org.apache.hadoop.hbase.io.HFileLink; import org.apache.hadoop.hbase.monitoring.MonitoredTask; @@ -48,7 +49,7 @@ import org.mockito.Mockito; /** * Test the restore/clone operation from a file-system point of view. */ -@Category(SmallTests.class) +@Category({RegionServerTests.class, SmallTests.class}) public class TestRestoreSnapshotHelper { final Log LOG = LogFactory.getLog(getClass()); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSecureExportSnapshot.java hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSecureExportSnapshot.java index b9f76e6..78ec873 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSecureExportSnapshot.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSecureExportSnapshot.java @@ -19,19 +19,20 @@ */ package org.apache.hadoop.hbase.snapshot; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.mapreduce.HadoopSecurityEnabledUserProviderForTesting; import org.apache.hadoop.hbase.security.UserProvider; import org.apache.hadoop.hbase.security.access.AccessControlLists; import org.apache.hadoop.hbase.security.access.SecureTestUtil; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; /** * Reruns TestExportSnapshot using ExportSnapshot in secure mode. */ -@Category(LargeTests.class) +@Category({VerySlowRegionServerTests.class, LargeTests.class}) public class TestSecureExportSnapshot extends TestExportSnapshot { @BeforeClass public static void setUpBeforeClass() throws Exception { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotDescriptionUtils.java hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotDescriptionUtils.java index 4e01ec6..f55bb2d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotDescriptionUtils.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestSnapshotDescriptionUtils.java @@ -17,7 +17,6 @@ */ package org.apache.hadoop.hbase.snapshot; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.fail; @@ -30,8 +29,9 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper; import org.junit.After; import org.junit.BeforeClass; @@ -41,7 +41,7 @@ import org.junit.experimental.categories.Category; /** * Test that the {@link SnapshotDescription} helper is helping correctly. */ -@Category(MediumTests.class) +@Category({RegionServerTests.class, MediumTests.class}) public class TestSnapshotDescriptionUtils { private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); private static FileSystem fs; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java index 0925fe3..f47b236 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/trace/TestHTraceHooks.java @@ -24,10 +24,11 @@ import static org.junit.Assert.assertTrue; import java.util.Collection; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.Waiter; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.htrace.Sampler; import org.htrace.Span; import org.htrace.Trace; @@ -41,7 +42,7 @@ import org.junit.experimental.categories.Category; import com.google.common.collect.Multimap; -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestHTraceHooks { private static final byte[] FAMILY_BYTES = "family".getBytes(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/ProcessBasedLocalHBaseCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/ProcessBasedLocalHBaseCluster.java index 8249501..be7ec79 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/ProcessBasedLocalHBaseCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/ProcessBasedLocalHBaseCluster.java @@ -44,10 +44,11 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.hdfs.MiniDFSCluster; import org.junit.experimental.categories.Category; @@ -57,7 +58,7 @@ import org.junit.experimental.categories.Category; * {@link MiniHBaseCluster}, starts daemons as separate processes, allowing to * do real kill testing. */ -@Category(LargeTests.class) +@Category({MiscTests.class, LargeTests.class}) public class ProcessBasedLocalHBaseCluster { private final String hbaseHome, workDir; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestBoundedPriorityBlockingQueue.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestBoundedPriorityBlockingQueue.java index 93fd2db..34c4ec0 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestBoundedPriorityBlockingQueue.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestBoundedPriorityBlockingQueue.java @@ -30,14 +30,15 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestBoundedPriorityBlockingQueue { private final static int CAPACITY = 16; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestByteBloomFilter.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestByteBloomFilter.java index 0531a58..21d7490 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestByteBloomFilter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestByteBloomFilter.java @@ -24,10 +24,11 @@ import java.io.DataOutputStream; import java.nio.ByteBuffer; import junit.framework.TestCase; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestByteBloomFilter extends TestCase { public void testBasicBloom() throws Exception { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestByteBufferUtils.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestByteBufferUtils.java index 150e162..8a48d32 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestByteBufferUtils.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestByteBufferUtils.java @@ -34,13 +34,14 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.io.WritableUtils; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestByteBufferUtils { private byte[] array; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCompressionTest.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCompressionTest.java index ef7db40..c5bd284 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCompressionTest.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCompressionTest.java @@ -22,7 +22,8 @@ package org.apache.hadoop.hbase.util; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; -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.compress.Compression; import org.apache.hadoop.io.DataOutputBuffer; import org.apache.hadoop.io.compress.CompressionCodec; @@ -38,7 +39,7 @@ import java.io.IOException; import static org.junit.Assert.*; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestCompressionTest { static final Log LOG = LogFactory.getLog(TestCompressionTest.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java index 4a092c8..034d6bc 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java @@ -40,7 +40,6 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.KeyValueUtil; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.IsolationLevel; @@ -61,6 +60,8 @@ import org.apache.hadoop.hbase.regionserver.Store; import org.apache.hadoop.hbase.regionserver.ScanInfo; import org.apache.hadoop.hbase.regionserver.StoreScanner; import org.apache.hadoop.hbase.regionserver.wal.WALEdit; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -70,7 +71,7 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) @RunWith(Parameterized.class) public class TestCoprocessorScanPolicy { final Log LOG = LogFactory.getLog(getClass()); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java index b7243ab..3cb1f18 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestDefaultEnvironmentEdge.java @@ -18,7 +18,8 @@ */ package org.apache.hadoop.hbase.util; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -29,7 +30,7 @@ import static junit.framework.Assert.fail; * Tests to make sure that the default environment edge conforms to appropriate * behaviour. */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestDefaultEnvironmentEdge { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java index d82db0d..ea19ea7 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSHDFSUtils.java @@ -28,7 +28,8 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hdfs.DistributedFileSystem; import org.junit.Before; import org.junit.Test; @@ -38,7 +39,7 @@ import org.mockito.Mockito; /** * Test our recoverLease loop against mocked up filesystem. */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestFSHDFSUtils { private static final Log LOG = LogFactory.getLog(TestFSHDFSUtils.class); private static final HBaseTestingUtility HTU = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSTableDescriptors.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSTableDescriptors.java index aa16177..daf5593 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSTableDescriptors.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSTableDescriptors.java @@ -39,18 +39,18 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableDescriptors; import org.apache.hadoop.hbase.TableExistsException; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.junit.Test; import org.junit.experimental.categories.Category; - /** * Tests for {@link FSTableDescriptors}. */ // Do not support to be executed in he same JVM as other tests -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestFSTableDescriptors { private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); private static final Log LOG = LogFactory.getLog(TestFSTableDescriptors.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java index 417c4a8..bf0ef13 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSUtils.java @@ -39,8 +39,9 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HDFSBlocksDistribution; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.exceptions.DeserializationException; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hdfs.MiniDFSCluster; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -48,7 +49,7 @@ import org.junit.experimental.categories.Category; /** * Test {@link FSUtils}. */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestFSUtils { /** * Test path compare and prefix checking. diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSVisitor.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSVisitor.java index 01ceb3c..1f7cab7 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSVisitor.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestFSVisitor.java @@ -19,10 +19,6 @@ package org.apache.hadoop.hbase.util; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.UUID; @@ -36,15 +32,16 @@ import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.regionserver.wal.HLogUtil; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.junit.*; import org.junit.experimental.categories.Category; /** * Test {@link FSUtils}. */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestFSVisitor { final Log LOG = LogFactory.getLog(getClass()); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java index c33178c..c046b22 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java @@ -61,7 +61,6 @@ import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionLocation; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; @@ -93,6 +92,8 @@ import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HRegionFileSystem; import org.apache.hadoop.hbase.regionserver.HRegionServer; import org.apache.hadoop.hbase.regionserver.TestEndToEndSplitTransaction; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.HBaseFsck.ErrorReporter; import org.apache.hadoop.hbase.util.HBaseFsck.ErrorReporter.ERROR_CODE; import org.apache.hadoop.hbase.util.HBaseFsck.HbckInfo; @@ -114,7 +115,7 @@ import com.google.common.collect.Multimap; /** * This tests HBaseFsck's ability to detect reasons for inconsistent tables. */ -@Category(LargeTests.class) +@Category({MiscTests.class, LargeTests.class}) public class TestHBaseFsck { final static Log LOG = LogFactory.getLog(TestHBaseFsck.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckComparator.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckComparator.java index 86f811d..acd62b1 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckComparator.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckComparator.java @@ -23,7 +23,8 @@ import static org.junit.Assert.assertTrue; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HRegionInfo; -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.HBaseFsck.HbckInfo; import org.apache.hadoop.hbase.util.HBaseFsck.MetaEntry; import org.junit.Test; @@ -32,7 +33,7 @@ import org.junit.experimental.categories.Category; /** * Test the comparator used by Hbck. */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestHBaseFsckComparator { TableName table = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckEncryption.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckEncryption.java index 6dfe90c..9b208bc 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckEncryption.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsckEncryption.java @@ -34,7 +34,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; @@ -49,6 +48,8 @@ import org.apache.hadoop.hbase.regionserver.Store; import org.apache.hadoop.hbase.regionserver.StoreFile; import org.apache.hadoop.hbase.security.EncryptionUtil; import org.apache.hadoop.hbase.security.User; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.hbck.HFileCorruptionChecker; import org.apache.hadoop.hbase.util.hbck.HbckTestingUtil; @@ -57,7 +58,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({MiscTests.class, LargeTests.class}) public class TestHBaseFsckEncryption { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHFileArchiveUtil.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHFileArchiveUtil.java index ab7d2a3..ab14c41 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHFileArchiveUtil.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHFileArchiveUtil.java @@ -23,7 +23,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -32,7 +33,7 @@ import java.io.IOException; /** * Test that the utility works as expected */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestHFileArchiveUtil { private Path rootDir = new Path("./"); @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIdLock.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIdLock.java index 9951cd0..fbfbb47 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIdLock.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIdLock.java @@ -33,11 +33,12 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) // Medium as it creates 100 threads; seems better to run it isolated public class TestIdLock { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java index 67718d6..4650ced 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestIncrementingEnvironmentEdge.java @@ -20,7 +20,8 @@ package org.apache.hadoop.hbase.util; import static junit.framework.Assert.assertEquals; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -28,7 +29,7 @@ import org.junit.experimental.categories.Category; * Tests that the incrementing environment edge increments time instead of using * the default. */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestIncrementingEnvironmentEdge { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java index e27c7c2..418f977 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTable.java @@ -37,13 +37,15 @@ import org.apache.hadoop.hbase.client.HConnectionManager; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.junit.Test; import org.junit.experimental.categories.Category; /** * Tests merging a normal table's regions */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestMergeTable { private static final Log LOG = LogFactory.getLog(TestMergeTable.class); private final HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java index 563d51d..11516de 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java @@ -16,7 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.util; import java.io.IOException; @@ -34,7 +33,6 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; @@ -43,12 +41,14 @@ import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.InternalScanner; import org.apache.hadoop.hbase.regionserver.wal.HLog; import org.apache.hadoop.hbase.regionserver.wal.HLogFactory; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.util.ToolRunner; import org.junit.experimental.categories.Category; /** Test stand alone merge tool that can merge arbitrary regions */ -@Category(LargeTests.class) +@Category({MiscTests.class, LargeTests.class}) public class TestMergeTool extends HBaseTestCase { static final Log LOG = LogFactory.getLog(TestMergeTool.class); HBaseTestingUtility TEST_UTIL; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadEncoded.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadEncoded.java index 979b498..0cf4609 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadEncoded.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadEncoded.java @@ -20,8 +20,9 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.junit.experimental.categories.Category; import org.junit.runners.Parameterized.Parameters; @@ -31,7 +32,7 @@ import org.junit.runners.Parameterized.Parameters; * amount of data, but goes through all available data block encoding * algorithms. */ -@Category(LargeTests.class) +@Category({MiscTests.class, LargeTests.class}) public class TestMiniClusterLoadEncoded extends TestMiniClusterLoadParallel { /** We do not alternate the multi-put flag in this test. */ diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadParallel.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadParallel.java index eab23d5..7b1cd2d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadParallel.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadParallel.java @@ -18,8 +18,9 @@ package org.apache.hadoop.hbase.util; import static org.junit.Assert.assertEquals; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -29,7 +30,7 @@ import org.junit.runners.Parameterized; * A write/read/verify load test on a mini HBase cluster. Tests reading * and writing at the same time. */ -@Category(LargeTests.class) +@Category({MiscTests.class, LargeTests.class}) @RunWith(Parameterized.class) public class TestMiniClusterLoadParallel extends TestMiniClusterLoadSequential { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadSequential.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadSequential.java index d6d0ab7..d10ce1e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadSequential.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestMiniClusterLoadSequential.java @@ -31,12 +31,13 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.io.compress.Compression; import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.test.LoadTestDataGenerator; import org.junit.After; import org.junit.Before; @@ -50,7 +51,7 @@ import org.junit.runners.Parameterized.Parameters; * A write/read/verify load test on a mini HBase cluster. Tests reading * and then writing. */ -@Category(LargeTests.class) +@Category({MiscTests.class, LargeTests.class}) @RunWith(Parameterized.class) public class TestMiniClusterLoadSequential { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestPoolMap.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestPoolMap.java index bb958cf..b229e91 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestPoolMap.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestPoolMap.java @@ -24,10 +24,10 @@ import java.util.Random; import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicBoolean; -import junit.framework.Test; import junit.framework.TestCase; -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.PoolMap.PoolType; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -36,7 +36,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({TestPoolMap.TestRoundRobinPoolType.class, TestPoolMap.TestThreadLocalPoolType.class, TestPoolMap.TestReusablePoolType.class}) -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestPoolMap { public abstract static class TestPoolType extends TestCase { protected PoolMap poolMap; @@ -74,7 +74,7 @@ public class TestPoolMap { } } - @Category(SmallTests.class) + @Category({MiscTests.class, SmallTests.class}) public static class TestRoundRobinPoolType extends TestPoolType { @Override protected PoolType getPoolType() { @@ -136,7 +136,7 @@ public class TestPoolMap { } - @Category(SmallTests.class) + @Category({MiscTests.class, SmallTests.class}) public static class TestThreadLocalPoolType extends TestPoolType { @Override protected PoolType getPoolType() { @@ -181,7 +181,7 @@ public class TestPoolMap { } - @Category(SmallTests.class) + @Category({MiscTests.class, SmallTests.class}) public static class TestReusablePoolType extends TestPoolType { @Override protected PoolType getPoolType() { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestProcessBasedCluster.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestProcessBasedCluster.java index 38f93ae..a63620a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestProcessBasedCluster.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestProcessBasedCluster.java @@ -30,15 +30,16 @@ import org.apache.hadoop.hbase.HTestConst; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.junit.Test; import org.junit.experimental.categories.Category; /** * A basic unit test that spins up a local HBase cluster. */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestProcessBasedCluster { private static final Log LOG = LogFactory.getLog(TestProcessBasedCluster.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSizeCalculator.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSizeCalculator.java index 6a3041e..a8e0a55 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSizeCalculator.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSizeCalculator.java @@ -23,8 +23,9 @@ import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.RegionLoad; import org.apache.hadoop.hbase.ServerLoad; import org.apache.hadoop.hbase.ServerName; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; import org.junit.Test; @@ -42,7 +43,7 @@ import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestRegionSizeCalculator { private Configuration configuration = new Configuration(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitCalculator.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitCalculator.java index 46aa2e4..c35491d 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitCalculator.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitCalculator.java @@ -30,7 +30,8 @@ import java.util.UUID; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.Test; import com.google.common.collect.ComparisonChain; @@ -38,7 +39,7 @@ import com.google.common.collect.Multimap; import org.junit.experimental.categories.Category; -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestRegionSplitCalculator { private static final Log LOG = LogFactory.getLog(TestRegionSplitCalculator.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java index 878e109..92c4e08 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRegionSplitter.java @@ -34,9 +34,10 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.RegionSplitter.HexStringSplit; import org.apache.hadoop.hbase.util.RegionSplitter.SplitAlgorithm; import org.apache.hadoop.hbase.util.RegionSplitter.UniformSplit; @@ -49,7 +50,7 @@ import org.junit.experimental.categories.Category; * Tests for {@link RegionSplitter}, which can create a pre-split table or do a * rolling split of an existing table. */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestRegionSplitter { private final static Log LOG = LogFactory.getLog(TestRegionSplitter.class); private final static HBaseTestingUtility UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRootPath.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRootPath.java index ffe3b2a..1ecfa2b 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRootPath.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestRootPath.java @@ -27,13 +27,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.fs.Path; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.junit.experimental.categories.Category; /** * Test requirement that root directory must be a URI */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestRootPath extends TestCase { private static final Log LOG = LogFactory.getLog(TestRootPath.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestSortedCopyOnWriteSet.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestSortedCopyOnWriteSet.java index 63bacfe5..839d1cc 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestSortedCopyOnWriteSet.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestSortedCopyOnWriteSet.java @@ -21,15 +21,15 @@ package org.apache.hadoop.hbase.util; import static org.junit.Assert.*; -import java.util.Arrays; import java.util.Iterator; import com.google.common.collect.Lists; -import org.apache.hadoop.hbase.SmallTests; +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 TestSortedCopyOnWriteSet { @Test diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestTableName.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestTableName.java index 04f4aa9..629e1ef 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestTableName.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestTableName.java @@ -19,9 +19,9 @@ package org.apache.hadoop.hbase.util; import static org.junit.Assert.fail; -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.TableName; -import org.apache.hadoop.hbase.util.Bytes; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TestWatcher; @@ -30,7 +30,7 @@ import org.junit.runner.Description; /** * Returns a {@code byte[]} containing the name of the currently running test method. */ -@Category(SmallTests.class) +@Category({MiscTests.class, SmallTests.class}) public class TestTableName extends TestWatcher { private TableName tableName; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java index fb52bb2..ce01281 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java @@ -36,7 +36,6 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.NamespaceDescriptor; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.MetaTableAccessor; @@ -51,6 +50,8 @@ import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.regionserver.HRegionFileSystem; +import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.zookeeper.KeeperException; @@ -71,7 +72,7 @@ import org.junit.experimental.categories.Category; * since minicluster startup and tear downs seem to leak file handles and * eventually cause out of file handle exceptions. */ -@Category(LargeTests.class) +@Category({MiscTests.class, LargeTests.class}) public class OfflineMetaRebuildTestCore { protected final static Log LOG = LogFactory .getLog(OfflineMetaRebuildTestCore.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java index 409b618..287158f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java @@ -25,8 +25,9 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.client.HConnectionManager; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.HBaseFsck; import org.apache.hadoop.hbase.util.HBaseFsck.ErrorReporter.ERROR_CODE; import org.junit.Test; @@ -34,7 +35,7 @@ import org.junit.experimental.categories.Category; /** * This builds a table, removes info from meta, and then rebuilds meta. */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestOfflineMetaRebuildBase extends OfflineMetaRebuildTestCore { @SuppressWarnings("deprecation") diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java index 6ebfcd7..caeb211 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java @@ -25,7 +25,8 @@ import static org.junit.Assert.assertFalse; import java.util.Arrays; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.HBaseFsck; import org.apache.hadoop.hbase.util.HBaseFsck.ErrorReporter.ERROR_CODE; import org.junit.Test; @@ -35,7 +36,7 @@ import org.junit.experimental.categories.Category; * This builds a table, removes info from meta, and then fails when attempting * to rebuild meta. */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestOfflineMetaRebuildHole extends OfflineMetaRebuildTestCore { @Test(timeout = 120000) diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java index b7114d1..c8570dc 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java @@ -25,7 +25,8 @@ import static org.junit.Assert.assertFalse; import java.util.Arrays; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.HBaseFsck; import org.apache.hadoop.hbase.util.HBaseFsck.ErrorReporter.ERROR_CODE; import org.apache.hadoop.hbase.util.HBaseFsck.HbckInfo; @@ -38,7 +39,7 @@ import com.google.common.collect.Multimap; * This builds a table, builds an overlap, and then fails when attempting to * rebuild meta. */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestOfflineMetaRebuildOverlap extends OfflineMetaRebuildTestCore { @Test(timeout = 120000) diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java index 8934790..793cc1f 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java @@ -28,6 +28,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.*; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.zookeeper.server.quorum.QuorumPeerConfig; import org.apache.zookeeper.server.quorum.QuorumPeer.QuorumServer; import org.junit.Before; @@ -40,7 +42,7 @@ import static org.junit.Assert.*; /** * Test for HQuorumPeer. */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestHQuorumPeer { private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static int PORT_NO = 21818; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestRecoverableZooKeeper.java hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestRecoverableZooKeeper.java index 7ed8215..e83ac74 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestRecoverableZooKeeper.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestRecoverableZooKeeper.java @@ -27,7 +27,8 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; @@ -40,7 +41,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestRecoverableZooKeeper { private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKConfig.java hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKConfig.java index d04f8f0..eae7c2a 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKConfig.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKConfig.java @@ -24,11 +24,12 @@ import junit.framework.Assert; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.SmallTests; +import org.apache.hadoop.hbase.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 TestZKConfig { @Test public void testZKConfigLoading() throws Exception { diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java index 99a214d..c830b04 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java @@ -26,6 +26,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -34,7 +36,7 @@ import org.junit.experimental.categories.Category; /** */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestZKLeaderManager { private static Log LOG = LogFactory.getLog(TestZKLeaderManager.class); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java index dd00372..db4c2fa 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKMulti.java @@ -31,7 +31,8 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.ZKUtil.ZKUtilOp; import org.apache.zookeeper.KeeperException; @@ -43,7 +44,7 @@ import org.junit.experimental.categories.Category; /** * Test ZooKeeper multi-update functionality */ -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestZKMulti { private static final Log LOG = LogFactory.getLog(TestZKMulti.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKTableStateManager.java hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKTableStateManager.java index f5210cc..bb3d3d3 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKTableStateManager.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZKTableStateManager.java @@ -26,9 +26,10 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.Abortable; import org.apache.hadoop.hbase.CoordinatedStateException; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.TableStateManager; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.zookeeper.KeeperException; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -39,7 +40,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.Table; -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestZKTableStateManager { private static final Log LOG = LogFactory.getLog(TestZKTableStateManager.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperACL.java hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperACL.java index 6c770bd..93a6291 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperACL.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperACL.java @@ -29,8 +29,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; -import org.apache.hadoop.hbase.zookeeper.ZKUtil; -import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.zookeeper.ZooDefs; import org.apache.zookeeper.data.ACL; import org.apache.zookeeper.data.Stat; @@ -41,7 +41,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestZooKeeperACL { private final static Log LOG = LogFactory.getLog(TestZooKeeperACL.class); private final static HBaseTestingUtility TEST_UTIL = diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperMainServer.java hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperMainServer.java index 88fedd0..1928b18 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperMainServer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperMainServer.java @@ -25,10 +25,12 @@ import java.security.Permission; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.*; +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 TestZooKeeperMainServer { // ZKMS calls System.exit. Catch the call and prevent exit using trick described up in // http://stackoverflow.com/questions/309396/java-how-to-test-methods-that-call-system-exit diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperNodeTracker.java hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperNodeTracker.java index 50f7c70..801e4b9 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperNodeTracker.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/TestZooKeeperNodeTracker.java @@ -33,6 +33,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.*; import org.apache.hadoop.hbase.master.TestActiveMasterManager.NodeDeletionListener; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Threads; import org.apache.zookeeper.CreateMode; @@ -45,7 +47,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestZooKeeperNodeTracker { private static final Log LOG = LogFactory.getLog(TestZooKeeperNodeTracker.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/lock/TestZKInterProcessReadWriteLock.java hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/lock/TestZKInterProcessReadWriteLock.java index 562b8aa..c304842 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/lock/TestZKInterProcessReadWriteLock.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/zookeeper/lock/TestZKInterProcessReadWriteLock.java @@ -42,8 +42,9 @@ import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.InterProcessLock; import org.apache.hadoop.hbase.InterProcessLock.MetadataHandler; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.MultithreadedTestUtil; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; @@ -55,7 +56,7 @@ import org.junit.experimental.categories.Category; import com.google.common.collect.Lists; -@Category(MediumTests.class) +@Category({MiscTests.class, MediumTests.class}) public class TestZKInterProcessReadWriteLock { private static final Log LOG = diff --git hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShell.java hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShell.java index 43fe3f8..20d031f 100644 --- hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShell.java +++ hbase-shell/src/test/java/org/apache/hadoop/hbase/client/TestShell.java @@ -16,7 +16,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.client; import java.io.IOException; @@ -27,10 +26,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; import org.apache.hadoop.hbase.security.access.SecureTestUtil; import org.apache.hadoop.hbase.security.visibility.VisibilityTestUtil; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.jruby.embed.PathType; import org.jruby.embed.ScriptingContainer; import org.junit.AfterClass; @@ -38,7 +38,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(LargeTests.class) +@Category({ClientTests.class, LargeTests.class}) public class TestShell { final Log LOG = LogFactory.getLog(getClass()); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); diff --git hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java index ab81442..189f17e 100644 --- hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java +++ hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java @@ -18,9 +18,6 @@ */ package org.apache.hadoop.hbase.thrift; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.util.ArrayList; import java.util.Collection; import java.util.concurrent.LinkedBlockingQueue; @@ -30,8 +27,9 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.CompatibilitySingletonFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.SmallTests; import org.apache.hadoop.hbase.test.MetricsAssertHelper; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.thrift.CallQueue.Call; import org.junit.experimental.categories.Category; import org.junit.runner.RunWith; @@ -43,7 +41,7 @@ import org.junit.Test; * Unit testing for CallQueue, a part of the * org.apache.hadoop.hbase.thrift package. */ -@Category(SmallTests.class) +@Category({ClientTests.class, SmallTests.class}) @RunWith(Parameterized.class) public class TestCallQueue { diff --git hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java index 555b12f..d5a020e 100644 --- hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java +++ hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServer.java @@ -36,11 +36,12 @@ import org.apache.hadoop.hbase.CompatibilityFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; -import org.apache.hadoop.hbase.LargeTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.filter.ParseFilter; import org.apache.hadoop.hbase.security.UserProvider; import org.apache.hadoop.hbase.test.MetricsAssertHelper; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.thrift.ThriftServerRunner.HBaseHandler; import org.apache.hadoop.hbase.thrift.generated.BatchMutation; import org.apache.hadoop.hbase.thrift.generated.ColumnDescriptor; @@ -64,7 +65,7 @@ import org.junit.experimental.categories.Category; * Unit testing for ThriftServerRunner.HBaseHandler, a part of the * org.apache.hadoop.hbase.thrift package. */ -@Category(LargeTests.class) +@Category({ClientTests.class, LargeTests.class}) public class TestThriftServer { private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); private static final Log LOG = LogFactory.getLog(TestThriftServer.class); diff --git hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java index 226548b..fc3d927 100644 --- hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java +++ hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java @@ -29,7 +29,8 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; -import org.apache.hadoop.hbase.LargeTests; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.thrift.ThriftServerRunner.ImplType; import org.apache.hadoop.hbase.thrift.generated.Hbase; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; @@ -56,7 +57,7 @@ import com.google.common.base.Joiner; * Start the HBase Thrift server on a random port through the command-line * interface and talk to it from client side. */ -@Category(LargeTests.class) +@Category({ClientTests.class, LargeTests.class}) @RunWith(Parameterized.class) public class TestThriftServerCmdLine { diff --git hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestHTablePool.java hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestHTablePool.java index 9df9c56..891ea57 100644 --- hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestHTablePool.java +++ hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestHTablePool.java @@ -25,6 +25,8 @@ import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.HTableInterface; import org.apache.hadoop.hbase.client.Table; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.PoolMap.PoolType; import org.junit.*; @@ -37,7 +39,7 @@ import org.junit.runners.Suite; */ @RunWith(Suite.class) @Suite.SuiteClasses({TestHTablePool.TestHTableReusablePool.class, TestHTablePool.TestHTableThreadLocalPool.class}) -@Category(MediumTests.class) +@Category({ClientTests.class, MediumTests.class}) public class TestHTablePool { private static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private final static byte[] TABLENAME = Bytes.toBytes("TestHTablePool"); @@ -207,14 +209,10 @@ public class TestHTablePool { } finally { pool.close(); } - } - - - } - @Category(MediumTests.class) + @Category({ClientTests.class, MediumTests.class}) public static class TestHTableReusablePool extends TestHTablePoolType { @Override protected PoolType getPoolType() { @@ -289,7 +287,7 @@ public class TestHTablePool { } } - @Category(MediumTests.class) + @Category({ClientTests.class, MediumTests.class}) public static class TestHTableThreadLocalPool extends TestHTablePoolType { @Override protected PoolType getPoolType() { diff --git hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java index 22236ef..d3de6dd 100644 --- hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java +++ hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java @@ -25,7 +25,6 @@ import org.apache.hadoop.hbase.CompatibilityFactory; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Get; @@ -38,6 +37,8 @@ import org.apache.hadoop.hbase.client.Durability; import org.apache.hadoop.hbase.filter.ParseFilter; import org.apache.hadoop.hbase.security.UserProvider; import org.apache.hadoop.hbase.test.MetricsAssertHelper; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.thrift.ThriftMetrics; import org.apache.hadoop.hbase.thrift2.generated.TAppend; import org.apache.hadoop.hbase.thrift2.generated.TColumn; @@ -85,7 +86,7 @@ import static java.nio.ByteBuffer.wrap; * Unit testing for ThriftServer.HBaseHandler, a part of the org.apache.hadoop.hbase.thrift2 * package. */ -@Category(MediumTests.class) +@Category({ClientTests.class, MediumTests.class}) public class TestThriftHBaseServiceHandler { public static final Log LOG = LogFactory.getLog(TestThriftHBaseServiceHandler.class); diff --git hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandlerWithLabels.java hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandlerWithLabels.java index 765b3b4..80c54df 100644 --- hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandlerWithLabels.java +++ hbase-thrift/src/test/java/org/apache/hadoop/hbase/thrift2/TestThriftHBaseServiceHandlerWithLabels.java @@ -37,7 +37,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; -import org.apache.hadoop.hbase.MediumTests; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.HBaseAdmin; @@ -50,6 +49,8 @@ import org.apache.hadoop.hbase.security.visibility.VisibilityClient; import org.apache.hadoop.hbase.security.visibility.VisibilityConstants; import org.apache.hadoop.hbase.security.visibility.VisibilityController; import org.apache.hadoop.hbase.security.visibility.VisibilityUtils; +import org.apache.hadoop.hbase.testclassification.ClientTests; +import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.thrift2.generated.TAppend; import org.apache.hadoop.hbase.thrift2.generated.TAuthorization; import org.apache.hadoop.hbase.thrift2.generated.TCellVisibility; @@ -70,7 +71,7 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -@Category(MediumTests.class) +@Category({ClientTests.class, MediumTests.class}) public class TestThriftHBaseServiceHandlerWithLabels { public static final Log LOG = LogFactory diff --git pom.xml pom.xml index 3fbd4af..dc0100d 100644 --- pom.xml +++ pom.xml @@ -960,8 +960,8 @@ false 1 2 - org.apache.hadoop.hbase.SmallTests - org.apache.hadoop.hbase.MediumTests + org.apache.hadoop.hbase.testclassification.SmallTests + org.apache.hadoop.hbase.testclassification.MediumTests false true 900 @@ -1507,8 +1507,8 @@ hadoop-2.0 - - !hadoop.profile + + !hadoop.profile @@ -1744,7 +1744,7 @@ 1 false true - org.apache.hadoop.hbase.SmallTests + org.apache.hadoop.hbase.testclassification.SmallTests @@ -1757,7 +1757,7 @@ false true - org.apache.hadoop.hbase.MediumTests + org.apache.hadoop.hbase.testclassification.MediumTests @@ -1770,7 +1770,7 @@ false true - org.apache.hadoop.hbase.LargeTests + org.apache.hadoop.hbase.testclassification.LargeTests @@ -1784,8 +1784,8 @@ 1 false false - org.apache.hadoop.hbase.SmallTests - org.apache.hadoop.hbase.MediumTests + org.apache.hadoop.hbase.testclassification.SmallTests + org.apache.hadoop.hbase.testclassification.MediumTests @@ -1799,11 +1799,259 @@ 5 false false - org.apache.hadoop.hbase.SmallTests - org.apache.hadoop.hbase.MediumTests,org.apache.hadoop.hbase.LargeTests + org.apache.hadoop.hbase.testclassification.SmallTests + org.apache.hadoop.hbase.testclassification.MediumTests,org.apache.hadoop.hbase.testclassification.LargeTests + runMiscTests + + false + + + 1 + 1 + false + true + org.apache.hadoop.hbase.testclassification.MiscTests + + + + + + runCoprocessorTests + + false + + + 1 + 1 + false + true + + org.apache.hadoop.hbase.testclassification.CoprocessorTests + + + + + + runClientTests + + false + + + 1 + 1 + false + true + org.apache.hadoop.hbase.testclassification.ClientTests + + + + + + runMasterTests + + false + + + 1 + 1 + false + true + org.apache.hadoop.hbase.testclassification.MasterTests + + + + + + runMapredTests + + false + + + 1 + 1 + false + true + org.apache.hadoop.hbase.testclassification.MapredTests + + + + + + runMapreduceTests + + false + + + 1 + 1 + false + true + org.apache.hadoop.hbase.testclassification.MapReduceTests + + + + + + runRegionServerTests + + false + + + 1 + 1 + false + true + + org.apache.hadoop.hbase.testclassification.RegionServerTests + + + + + + runVerySlowMapReduceTests + + false + + + 2 + 1 + false + true + + org.apache.hadoop.hbase.testclassification.VerySlowMapReduceTests + + + + + + + runVerySlowRegionServerTests + + false + + + 2 + 1 + false + true + + org.apache.hadoop.hbase.testclassification.VerySlowRegionServerTests + + + + + + + runFilterTests + + false + + + 1 + 1 + false + true + org.apache.hadoop.hbase.testclassification.FilterTests + + + + + + runIOTests + + false + + + 1 + 1 + false + true + org.apache.hadoop.hbase.testclassification.IOTests + + + + + + runRestTests + + false + + + 1 + 1 + false + true + org.apache.hadoop.hbase.testclassification.RestTests + + + + + + runRPCTests + + false + + + 1 + 1 + false + true + org.apache.hadoop.hbase.testclassification.RPCTests + + + + + + runReplicationTests + + false + + + 1 + 1 + false + true + + org.apache.hadoop.hbase.testclassification.ReplicationTests + + + + + + runSecurityTests + + false + + + 1 + 1 + false + true + org.apache.hadoop.hbase.testclassification.SecurityTests + + + + + + runFlakeyTests + + false + + + 1 + 1 + false + true + org.apache.hadoop.hbase.testclassification.FlakeyTests + + + + + + localTests