[FIXED JENKINS-38304] Support TestExtension get activate in multiple …

…test cases
jenkinsci · Sep 17, 2016 · dc1d32a · dc1d32a
1 parent 2407c77
commit dc1d32a
Show file tree

Hide file tree

Showing 3 changed files with 115 additions and 3 deletions.
diff --git a/src/main/java/org/jvnet/hudson/test/TestExtension.java b/src/main/java/org/jvnet/hudson/test/TestExtension.java
@@ -65,8 +65,12 @@
      *     // this kicks in both for test1 and test2
      *     &#64;TestExtension
      *     class Bar extends ConsoleAnnotator { ... }
+     *
+     *     // You can also specify multiple test cases with parameters
+     *     &#64;TestExtension({"test1", "test2"})
+     *     class Baz extends ConsoleAnnotator { ... }
      * }
      * </pre>
      */
-    String value() default "";
+    String[] value() default {};
 }
diff --git a/src/main/java/org/jvnet/hudson/test/TestExtensionLoader.java b/src/main/java/org/jvnet/hudson/test/TestExtensionLoader.java
@@ -29,6 +29,9 @@
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.List;
+
 import org.junit.runner.Description;
 
 /**
@@ -61,9 +64,9 @@ protected boolean isActive(AnnotatedElement e) {
 
         TestExtension a = e.getAnnotation(TestExtension.class);
         if (a==null)        return false;   // stale index
-        String testName = a.value();
+        List<String> testNameList = Arrays.asList(a.value());
         Description description = env.description();
-        if (testName.length()>0 && !testName.equals(description.getMethodName()))
+        if (!testNameList.isEmpty() && !testNameList.contains(description.getMethodName()))
             return false;   // doesn't apply to this test
         String className = description.getClassName();
         if (e instanceof Class) {

diff --git a/src/test/java/org/jvnet/hudson/test/TestExtensionTest.java b/src/test/java/org/jvnet/hudson/test/TestExtensionTest.java
@@ -0,0 +1,105 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2016 IKEDA Yasuyuki
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.jvnet.hudson.test;
+
+import static org.junit.Assert.assertThat;
+
+import java.util.List;
+
+import org.hamcrest.Matchers;
+import org.junit.Rule;
+import org.junit.Test;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Lists;
+
+import hudson.model.listeners.ItemListener;
+
+/**
+ * Tests for {@link TestExtension}
+ */
+public class TestExtensionTest {
+    @Rule
+    public JenkinsRule j = new JenkinsRule();
+
+    @TestExtension
+    public static class AllTests extends ItemListener {
+    }
+
+    @TestExtension("test1")
+    public static class SingleTests extends ItemListener {
+    }
+
+    @TestExtension({"test1", "test2"})
+    public static class MultipleTests extends ItemListener {
+    }
+
+    private List<Class<? extends ItemListener>> getExtensionClasses() {
+        return Lists.transform(
+            j.jenkins.getExtensionList(ItemListener.class),
+            new Function<ItemListener, Class<? extends ItemListener>>() {
+                @Override
+                public Class<? extends ItemListener> apply(ItemListener arg0) {
+                    return arg0.getClass();
+                }
+            }
+        );
+    }
+
+    @Test
+    public void test1() throws Exception {
+        assertThat(
+            getExtensionClasses(),
+            Matchers.<Class<? extends ItemListener>>hasItems(AllTests.class, SingleTests.class, MultipleTests.class)
+        );
+    }
+
+    @Test
+    public void test2() throws Exception {
+        assertThat(
+            getExtensionClasses(),
+            Matchers.<Class<? extends ItemListener>>hasItems(AllTests.class, MultipleTests.class)
+        );
+        assertThat(
+            getExtensionClasses(),
+            Matchers.not(Matchers.<Class<? extends ItemListener>>hasItem(SingleTests.class))
+        );
+    }
+
+    @Test
+    public void test3() throws Exception {
+        assertThat(
+            getExtensionClasses(),
+            Matchers.<Class<? extends ItemListener>>hasItems(AllTests.class)
+        );
+        assertThat(
+            getExtensionClasses(),
+            Matchers.not(Matchers.<Class<? extends ItemListener>>hasItem(SingleTests.class))
+        );
+        assertThat(
+            getExtensionClasses(),
+            Matchers.not(Matchers.<Class<? extends ItemListener>>hasItem(MultipleTests.class))
+        );
+    }
+}