HBASE-20031 Unable to run integration test using mvn due to missing HBaseClassTestRule

This commit is contained in:
tedyu 2018-02-21 12:04:17 -08:00
parent e10db9d29a
commit 66ba8aa58c
3 changed files with 16 additions and 1 deletions

View File

@ -19,6 +19,7 @@ package org.apache.hadoop.hbase;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import org.apache.hadoop.hbase.testclassification.IntegrationTests;
import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.hbase.testclassification.SmallTests;
@ -63,6 +64,9 @@ public final class HBaseClassTestRule implements TestRule {
// All tests have a 10minute timeout. // All tests have a 10minute timeout.
return TimeUnit.MINUTES.toSeconds(13); return TimeUnit.MINUTES.toSeconds(13);
} }
if (c == IntegrationTests.class) {
return TimeUnit.MINUTES.toSeconds(Long.MAX_VALUE);
}
} }
throw new IllegalArgumentException( throw new IllegalArgumentException(
clazz.getName() + " does not have SmallTests/MediumTests/LargeTests in @Category"); clazz.getName() + " does not have SmallTests/MediumTests/LargeTests in @Category");

View File

@ -22,8 +22,12 @@ import static org.junit.Assert.fail;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Modifier; import java.lang.reflect.Modifier;
import java.util.concurrent.TimeUnit;
import org.apache.hadoop.hbase.testclassification.IntegrationTests;
import org.apache.yetus.audience.InterfaceAudience; import org.apache.yetus.audience.InterfaceAudience;
import org.junit.ClassRule; import org.junit.ClassRule;
import org.junit.experimental.categories.Category;
import org.junit.runner.Description; import org.junit.runner.Description;
import org.junit.runner.notification.RunListener; import org.junit.runner.notification.RunListener;
import org.junit.runner.notification.RunListener.ThreadSafe; import org.junit.runner.notification.RunListener.ThreadSafe;
@ -37,6 +41,12 @@ public class HBaseClassTestRuleChecker extends RunListener {
@Override @Override
public void testStarted(Description description) throws Exception { public void testStarted(Description description) throws Exception {
Category[] categories = description.getTestClass().getAnnotationsByType(Category.class);
for (Class<?> c : categories[0].value()) {
if (c == IntegrationTests.class) {
return;
}
}
for (Field field : description.getTestClass().getFields()) { for (Field field : description.getTestClass().getFields()) {
if (Modifier.isStatic(field.getModifiers()) && field.getType() == HBaseClassTestRule.class && if (Modifier.isStatic(field.getModifiers()) && field.getType() == HBaseClassTestRule.class &&
field.isAnnotationPresent(ClassRule.class)) { field.isAnnotationPresent(ClassRule.class)) {

View File

@ -1015,7 +1015,7 @@ The first three categories, `small`, `medium`, and `large`, are for test cases w
type `$ mvn test`. type `$ mvn test`.
In other words, these three categorizations are for HBase unit tests. In other words, these three categorizations are for HBase unit tests.
The `integration` category is not for unit tests, but for integration tests. The `integration` category is not for unit tests, but for integration tests.
These are run when you invoke `$ mvn verify`. These are normally run when you invoke `$ mvn verify`.
Integration tests are described in <<integration.tests,integration.tests>>. Integration tests are described in <<integration.tests,integration.tests>>.
Keep reading to figure which annotation of the set `small`, `medium`, and `large` Keep reading to figure which annotation of the set `small`, `medium`, and `large`
@ -1042,6 +1042,7 @@ Large Tests (((LargeTests)))::
Integration Tests (((IntegrationTests))):: Integration Tests (((IntegrationTests)))::
_Integration_ tests are system level tests. _Integration_ tests are system level tests.
See <<integration.tests,integration.tests>> for more info. See <<integration.tests,integration.tests>> for more info.
If you invoke `$ mvn test` on integration tests, there is no timeout for the test.
[[hbase.unittests.cmds]] [[hbase.unittests.cmds]]
=== Running tests === Running tests