From 03f0058d32b5a813f30a39e82aa7a06899597580 Mon Sep 17 00:00:00 2001 From: starphinliu Date: Thu, 20 Jun 2019 15:02:16 +0800 Subject: [PATCH] HBASE-22570 test-util.sh failed when executing AbstractHBaseToolTest --- .../hadoop/hbase/HBaseClassTestRuleChecker.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseClassTestRuleChecker.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseClassTestRuleChecker.java index 708f37cde1..aa1d07913a 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseClassTestRuleChecker.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseClassTestRuleChecker.java @@ -23,6 +23,7 @@ import static org.junit.Assert.fail; import java.lang.reflect.Field; import java.lang.reflect.Modifier; +import org.apache.commons.lang3.ArrayUtils; import org.apache.hadoop.hbase.testclassification.IntegrationTests; import org.apache.yetus.audience.InterfaceAudience; import org.junit.ClassRule; @@ -41,11 +42,16 @@ public class HBaseClassTestRuleChecker extends RunListener { @Override 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; + if(!ArrayUtils.isEmpty(categories)) { + for (Class c : categories[0].value()) { + if (c == IntegrationTests.class) { + return; + } } + } else { + return; } + for (Field field : description.getTestClass().getFields()) { if (Modifier.isStatic(field.getModifiers()) && field.getType() == HBaseClassTestRule.class && field.isAnnotationPresent(ClassRule.class)) { -- 2.20.1 (Apple Git-117)