HBASE-12106 Move test annotations to test artifact (Enis Soztutar)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/695261c4 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/695261c4 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/695261c4 Branch: refs/heads/branch-1 Commit: 695261c4a9704f043fb006caa24a8eada1656ae1 Parents: de15b1f Author: Andrew Purtell <[email protected]> Authored: Mon Oct 6 23:16:58 2014 -0700 Committer: Andrew Purtell <[email protected]> Committed: Mon Oct 6 23:16:58 2014 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/IntegrationTests.java | 39 -------------------- .../org/apache/hadoop/hbase/LargeTests.java | 38 ------------------- .../org/apache/hadoop/hbase/MediumTests.java | 37 ------------------- .../org/apache/hadoop/hbase/SmallTests.java | 34 ----------------- .../apache/hadoop/hbase/IntegrationTests.java | 39 ++++++++++++++++++++ .../org/apache/hadoop/hbase/LargeTests.java | 38 +++++++++++++++++++ .../org/apache/hadoop/hbase/MediumTests.java | 37 +++++++++++++++++++ .../org/apache/hadoop/hbase/SmallTests.java | 34 +++++++++++++++++ hbase-client/pom.xml | 6 +++ hbase-common/pom.xml | 6 +++ hbase-examples/pom.xml | 6 +++ hbase-it/pom.xml | 6 +++ hbase-prefix-tree/pom.xml | 6 +++ hbase-server/pom.xml | 6 +++ hbase-shell/pom.xml | 6 +++ hbase-thrift/pom.xml | 6 +++ pom.xml | 7 ++++ 17 files changed, 203 insertions(+), 148 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/695261c4/hbase-annotations/src/main/java/org/apache/hadoop/hbase/IntegrationTests.java ---------------------------------------------------------------------- diff --git a/hbase-annotations/src/main/java/org/apache/hadoop/hbase/IntegrationTests.java b/hbase-annotations/src/main/java/org/apache/hadoop/hbase/IntegrationTests.java deleted file mode 100644 index d429e24..0000000 --- a/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: <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/695261c4/hbase-annotations/src/main/java/org/apache/hadoop/hbase/LargeTests.java ---------------------------------------------------------------------- diff --git a/hbase-annotations/src/main/java/org/apache/hadoop/hbase/LargeTests.java b/hbase-annotations/src/main/java/org/apache/hadoop/hbase/LargeTests.java deleted file mode 100644 index 958ffd7..0000000 --- a/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 { -} http://git-wip-us.apache.org/repos/asf/hbase/blob/695261c4/hbase-annotations/src/main/java/org/apache/hadoop/hbase/MediumTests.java ---------------------------------------------------------------------- diff --git a/hbase-annotations/src/main/java/org/apache/hadoop/hbase/MediumTests.java b/hbase-annotations/src/main/java/org/apache/hadoop/hbase/MediumTests.java deleted file mode 100644 index a51a2c9..0000000 --- a/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 { -} http://git-wip-us.apache.org/repos/asf/hbase/blob/695261c4/hbase-annotations/src/main/java/org/apache/hadoop/hbase/SmallTests.java ---------------------------------------------------------------------- diff --git a/hbase-annotations/src/main/java/org/apache/hadoop/hbase/SmallTests.java b/hbase-annotations/src/main/java/org/apache/hadoop/hbase/SmallTests.java deleted file mode 100644 index 6953667..0000000 --- a/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 { -} http://git-wip-us.apache.org/repos/asf/hbase/blob/695261c4/hbase-annotations/src/test/java/org/apache/hadoop/hbase/IntegrationTests.java ---------------------------------------------------------------------- diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/IntegrationTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/IntegrationTests.java new file mode 100644 index 0000000..d429e24 --- /dev/null +++ b/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: <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/695261c4/hbase-annotations/src/test/java/org/apache/hadoop/hbase/LargeTests.java ---------------------------------------------------------------------- diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/LargeTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/LargeTests.java new file mode 100644 index 0000000..958ffd7 --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/695261c4/hbase-annotations/src/test/java/org/apache/hadoop/hbase/MediumTests.java ---------------------------------------------------------------------- diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/MediumTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/MediumTests.java new file mode 100644 index 0000000..a51a2c9 --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/695261c4/hbase-annotations/src/test/java/org/apache/hadoop/hbase/SmallTests.java ---------------------------------------------------------------------- diff --git a/hbase-annotations/src/test/java/org/apache/hadoop/hbase/SmallTests.java b/hbase-annotations/src/test/java/org/apache/hadoop/hbase/SmallTests.java new file mode 100644 index 0000000..6953667 --- /dev/null +++ b/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 { +} http://git-wip-us.apache.org/repos/asf/hbase/blob/695261c4/hbase-client/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 24248e4..28b8143 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -82,6 +82,12 @@ </dependency> <dependency> <groupId>org.apache.hbase</groupId> + <artifactId>hbase-annotations</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> <artifactId>hbase-common</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/hbase/blob/695261c4/hbase-common/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml index 3b908de..ad78b50 100644 --- a/hbase-common/pom.xml +++ b/hbase-common/pom.xml @@ -181,6 +181,12 @@ <groupId>org.apache.hbase</groupId> <artifactId>hbase-annotations</artifactId> </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-annotations</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> <!-- General dependencies --> <dependency> <groupId>com.google.guava</groupId> http://git-wip-us.apache.org/repos/asf/hbase/blob/695261c4/hbase-examples/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml index 849683e..1f9a2a1 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -64,6 +64,12 @@ </build> <dependencies> <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-annotations</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-common</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/hbase/blob/695261c4/hbase-it/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index d5fbc58..80d9b9c 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -139,6 +139,12 @@ <!-- Intra-project dependencies --> <dependency> <groupId>org.apache.hbase</groupId> + <artifactId>hbase-annotations</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> <artifactId>hbase-common</artifactId> <type>jar</type> </dependency> http://git-wip-us.apache.org/repos/asf/hbase/blob/695261c4/hbase-prefix-tree/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-prefix-tree/pom.xml b/hbase-prefix-tree/pom.xml index 655fa01..e38abf0 100644 --- a/hbase-prefix-tree/pom.xml +++ b/hbase-prefix-tree/pom.xml @@ -80,6 +80,12 @@ <version>${project.version}</version> <classifier>tests</classifier> </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-annotations</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> <dependency> <groupId>org.apache.hbase</groupId> <artifactId>hbase-common</artifactId> http://git-wip-us.apache.org/repos/asf/hbase/blob/695261c4/hbase-server/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 3b25466..6d3697e 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -306,6 +306,12 @@ <scope>test</scope> </dependency> <dependency> + <groupId>org.apache.hbase</groupId> + <artifactId>hbase-annotations</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/hbase/blob/695261c4/hbase-shell/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index cb63bc2..49ef6c2 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -160,6 +160,12 @@ </dependency> <dependency> <groupId>org.apache.hbase</groupId> + <artifactId>hbase-annotations</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> <artifactId>hbase-protocol</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/hbase/blob/695261c4/hbase-thrift/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 456172b..1643f07 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -144,6 +144,12 @@ </dependency> <dependency> <groupId>org.apache.hbase</groupId> + <artifactId>hbase-annotations</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> <artifactId>hbase-protocol</artifactId> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/hbase/blob/695261c4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5ee37d3..3c93ac7 100644 --- a/pom.xml +++ b/pom.xml @@ -1032,6 +1032,13 @@ </dependency> <dependency> <groupId>org.apache.hbase</groupId> + <artifactId>hbase-annotations</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> <artifactId>hbase-common</artifactId> <version>${project.version}</version> </dependency>
