http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/CoprocessorTests.java new file mode 100644 index 0000000..ff65995 --- /dev/null +++ b/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 { +}
http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FilterTests.java new file mode 100644 index 0000000..b4e9c35 --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/FlakeyTests.java new file mode 100644 index 0000000..ddd92b1 --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IOTests.java new file mode 100644 index 0000000..cf8bffa --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/IntegrationTests.java new file mode 100644 index 0000000..ce6af67 --- /dev/null +++ b/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: <ul> + * <li> Possibly takes hours to complete</li> + * <li> Can be run on a mini cluster or an actual cluster</li> + * <li> Can make changes to the given cluster (starting stopping daemons, etc)</li> + * <li> Should not be run in parallel of other integration tests</li> + * </ul> + * + * Integration / System tests should have a class name starting with "IntegrationTest", and + * should be annotated with @Category(IntegrationTests.class). Integration tests can be run + * using the IntegrationTestsDriver class or from mvn verify. + * + * @see SmallTests + * @see MediumTests + * @see LargeTests + */ +public interface IntegrationTests { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/LargeTests.java new file mode 100644 index 0000000..b8f6ba3 --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MapReduceTests.java new file mode 100644 index 0000000..5f8c9b7 --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MasterTests.java new file mode 100644 index 0000000..19a95f2 --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MediumTests.java new file mode 100644 index 0000000..0b79b3d --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/MiscTests.java new file mode 100644 index 0000000..ef4d3f9 --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RPCTests.java new file mode 100644 index 0000000..eab3375 --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RegionServerTests.java new file mode 100644 index 0000000..3b03194 --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/ReplicationTests.java new file mode 100644 index 0000000..4f86404 --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/RestTests.java new file mode 100644 index 0000000..16fe1f7 --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SecurityTests.java new file mode 100644 index 0000000..907ae7a --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/SmallTests.java new file mode 100644 index 0000000..1552617 --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowMapReduceTests.java new file mode 100644 index 0000000..96a5e9a --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/testclassification/VerySlowRegionServerTests.java new file mode 100644 index 0000000..3caa218 --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestFixedLengthWrapper.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestFixedLengthWrapper.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestFixedLengthWrapper.java index d9227c3..b259429 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestFixedLengthWrapper.java +++ b/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[][] { http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedBlob.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedBlob.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedBlob.java index d24f4d4..c796fea 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedBlob.java +++ b/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[][] { http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedBlobVar.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedBlobVar.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedBlobVar.java index 4e88552..d9c40e5 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedBlobVar.java +++ b/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[][] { http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedString.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedString.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedString.java index 8306f00..6e9e9d0 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestOrderedString.java +++ b/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 = http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestRawString.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestRawString.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestRawString.java index b022229..90f7e21 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestRawString.java +++ b/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[] { http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestStruct.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestStruct.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestStruct.java index 2b79eeb..8dc239b 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestStruct.java +++ b/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; http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestStructNullExtension.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestStructNullExtension.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestStructNullExtension.java index 8e45793..e87438d 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestStructNullExtension.java +++ b/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 { /** http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestTerminatedWrapper.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestTerminatedWrapper.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestTerminatedWrapper.java index 6bb331a..e36a141 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestTerminatedWrapper.java +++ b/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[] { http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestUnion2.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestUnion2.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestUnion2.java index ff1699c..932be95 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/types/TestUnion2.java +++ b/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 { /** http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java index cf3da34..bd4854e 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBase64.java +++ b/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 http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestByteRangeWithKVSerialization.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestByteRangeWithKVSerialization.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestByteRangeWithKVSerialization.java index 34e229a..34326d6 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestByteRangeWithKVSerialization.java +++ b/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 { http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java index d465f72..d421198 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestBytes.java +++ b/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; http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestConcatenatedLists.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestConcatenatedLists.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestConcatenatedLists.java index ce1a616..aa28509 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestConcatenatedLists.java +++ b/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() { http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorClassLoader.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorClassLoader.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorClassLoader.java index 942c7e3..daba459 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorClassLoader.java +++ b/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(); http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCounter.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCounter.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCounter.java index a0f0552..1c25ee3 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCounter.java +++ b/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; http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDrainBarrier.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDrainBarrier.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDrainBarrier.java index 52cc38e..09927f2 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDrainBarrier.java +++ b/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 http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDynamicClassLoader.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDynamicClassLoader.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDynamicClassLoader.java index 11a545b..9269f2f 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDynamicClassLoader.java +++ b/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); http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java index bd9efb5..ee087ef 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestEnvironmentEdgeManager.java +++ b/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 http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestKeyLocker.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestKeyLocker.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestKeyLocker.java index fa351de..bb05900 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestKeyLocker.java +++ b/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(){ http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestLoadTestKVGenerator.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestLoadTestKVGenerator.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestLoadTestKVGenerator.java index 9eb627c..120f2b6 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestLoadTestKVGenerator.java +++ b/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; http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestOrder.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestOrder.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestOrder.java index 75136c6..8029e44 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestOrder.java +++ b/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") }; http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestOrderedBytes.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestOrderedBytes.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestOrderedBytes.java index c65ba10..7e7c3aa 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestOrderedBytes.java +++ b/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 http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestShowProperties.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestShowProperties.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestShowProperties.java index c9bbbb6..e6d154d 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestShowProperties.java +++ b/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); http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimpleMutableByteRange.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimpleMutableByteRange.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimpleMutableByteRange.java index 43949f8..88d4829 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimpleMutableByteRange.java +++ b/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 http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimplePositionedMutableByteRange.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimplePositionedMutableByteRange.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimplePositionedMutableByteRange.java index b097b36..ecc8c60 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimplePositionedMutableByteRange.java +++ b/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() { http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java index 24837af..e8a0d05 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java +++ b/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); http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestBulkDeleteProtocol.java ---------------------------------------------------------------------- diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestBulkDeleteProtocol.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestBulkDeleteProtocol.java index 16327ba..391360f 100644 --- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestBulkDeleteProtocol.java +++ b/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"); http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRowCountEndpoint.java ---------------------------------------------------------------------- diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRowCountEndpoint.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRowCountEndpoint.java index cc16483..98dca59 100644 --- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRowCountEndpoint.java +++ b/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"); http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java ---------------------------------------------------------------------- diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java index af51504..7691586 100644 --- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java +++ b/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(); http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-examples/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMapReduceExamples.java ---------------------------------------------------------------------- diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMapReduceExamples.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMapReduceExamples.java index f554e6b..1f10cb9 100644 --- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMapReduceExamples.java +++ b/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(); http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-examples/src/test/java/org/apache/hadoop/hbase/types/TestPBCell.java ---------------------------------------------------------------------- diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/types/TestPBCell.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/types/TestPBCell.java index 952a319..a548b8a 100644 --- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/types/TestPBCell.java +++ b/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(); http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/master/TestMetricsMasterSourceImpl.java ---------------------------------------------------------------------- diff --git a/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/master/TestMetricsMasterSourceImpl.java b/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/master/TestMetricsMasterSourceImpl.java index 4cdd606..0a784eb 100644 --- a/hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/master/TestMetricsMasterSourceImpl.java +++ b/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; http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java index 7ac0d32..0479945 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java +++ b/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; http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestStripeCompactions.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestStripeCompactions.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestStripeCompactions.java index 1ac2834..ebf159e 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestStripeCompactions.java +++ b/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; http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithACL.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithACL.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithACL.java index 296fb80..82eef1a 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithACL.java +++ b/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; http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java index f4246a2..9212095 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java +++ b/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; http://git-wip-us.apache.org/repos/asf/hbase/blob/3c9bd7d2/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithTags.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithTags.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithTags.java index e428cb2..f1b2c68 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithTags.java +++ b/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;
