commit f1dabd4fe76a287e135428527ee918535c611aeb Author: Enis Soztutar Date: Fri Sep 26 14:34:18 2014 -0700 HBASE-12106 for branch-1 and master diff --git hbase-annotations/src/main/java/org/apache/hadoop/hbase/IntegrationTests.java hbase-annotations/src/main/java/org/apache/hadoop/hbase/IntegrationTests.java deleted file mode 100644 index d429e24..0000000 --- hbase-annotations/src/main/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-annotations/src/main/java/org/apache/hadoop/hbase/LargeTests.java hbase-annotations/src/main/java/org/apache/hadoop/hbase/LargeTests.java deleted file mode 100644 index 958ffd7..0000000 --- hbase-annotations/src/main/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-annotations/src/main/java/org/apache/hadoop/hbase/MediumTests.java hbase-annotations/src/main/java/org/apache/hadoop/hbase/MediumTests.java deleted file mode 100644 index a51a2c9..0000000 --- hbase-annotations/src/main/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-annotations/src/main/java/org/apache/hadoop/hbase/SmallTests.java hbase-annotations/src/main/java/org/apache/hadoop/hbase/SmallTests.java deleted file mode 100644 index 6953667..0000000 --- hbase-annotations/src/main/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-annotations/src/test/java/org/apache/hadoop/hbase/IntegrationTests.java hbase-annotations/src/test/java/org/apache/hadoop/hbase/IntegrationTests.java new file mode 100644 index 0000000..d429e24 --- /dev/null +++ hbase-annotations/src/test/java/org/apache/hadoop/hbase/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; + +/** + * 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-annotations/src/test/java/org/apache/hadoop/hbase/LargeTests.java hbase-annotations/src/test/java/org/apache/hadoop/hbase/LargeTests.java new file mode 100644 index 0000000..958ffd7 --- /dev/null +++ hbase-annotations/src/test/java/org/apache/hadoop/hbase/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; + +/** + * 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-annotations/src/test/java/org/apache/hadoop/hbase/MediumTests.java hbase-annotations/src/test/java/org/apache/hadoop/hbase/MediumTests.java new file mode 100644 index 0000000..a51a2c9 --- /dev/null +++ hbase-annotations/src/test/java/org/apache/hadoop/hbase/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; + +/** + * 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-annotations/src/test/java/org/apache/hadoop/hbase/SmallTests.java hbase-annotations/src/test/java/org/apache/hadoop/hbase/SmallTests.java new file mode 100644 index 0000000..6953667 --- /dev/null +++ hbase-annotations/src/test/java/org/apache/hadoop/hbase/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; + +/** + * 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-client/pom.xml hbase-client/pom.xml index d68c493..26ad172 100644 --- hbase-client/pom.xml +++ hbase-client/pom.xml @@ -82,6 +82,12 @@ org.apache.hbase + hbase-annotations + test-jar + test + + + org.apache.hbase hbase-common diff --git hbase-common/pom.xml hbase-common/pom.xml index 3b908de..ad78b50 100644 --- hbase-common/pom.xml +++ hbase-common/pom.xml @@ -181,6 +181,12 @@ org.apache.hbase hbase-annotations + + org.apache.hbase + hbase-annotations + test-jar + test + com.google.guava diff --git hbase-examples/pom.xml hbase-examples/pom.xml index 849683e..1f9a2a1 100644 --- hbase-examples/pom.xml +++ hbase-examples/pom.xml @@ -64,6 +64,12 @@ + org.apache.hbase + hbase-annotations + test-jar + test + + org.apache.hbase hbase-common diff --git hbase-it/pom.xml hbase-it/pom.xml index d5fbc58..80d9b9c 100644 --- hbase-it/pom.xml +++ hbase-it/pom.xml @@ -139,6 +139,12 @@ org.apache.hbase + hbase-annotations + test-jar + test + + + org.apache.hbase hbase-common jar diff --git hbase-prefix-tree/pom.xml hbase-prefix-tree/pom.xml index 655fa01..e38abf0 100644 --- hbase-prefix-tree/pom.xml +++ hbase-prefix-tree/pom.xml @@ -80,6 +80,12 @@ ${project.version} tests + + org.apache.hbase + hbase-annotations + test-jar + test + org.apache.hbase hbase-common diff --git hbase-server/pom.xml hbase-server/pom.xml index 7dd8471..00ab9b5 100644 --- hbase-server/pom.xml +++ hbase-server/pom.xml @@ -306,6 +306,12 @@ test + org.apache.hbase + hbase-annotations + test-jar + test + + commons-httpclient commons-httpclient diff --git hbase-shell/pom.xml hbase-shell/pom.xml index cb63bc2..49ef6c2 100644 --- hbase-shell/pom.xml +++ hbase-shell/pom.xml @@ -160,6 +160,12 @@ org.apache.hbase + hbase-annotations + test-jar + test + + + org.apache.hbase hbase-protocol diff --git hbase-thrift/pom.xml hbase-thrift/pom.xml index 456172b..1643f07 100644 --- hbase-thrift/pom.xml +++ hbase-thrift/pom.xml @@ -144,6 +144,12 @@ org.apache.hbase + hbase-annotations + test-jar + test + + + org.apache.hbase hbase-protocol diff --git pom.xml pom.xml index e59b82f..cb6b510 100644 --- pom.xml +++ pom.xml @@ -991,6 +991,13 @@ org.apache.hbase + hbase-annotations + ${project.version} + test-jar + test + + + org.apache.hbase hbase-common ${project.version}