Merge pull request #1428 from hcoles/feature/parameterized_categories

support categories for junit4 parameterised tests

Author: hcoles

pitest/src/main/java/org/pitest/junit/JUnitCompatibleConfiguration.java

@@ -53,7 +53,7 @@ public int priority() {
   public TestUnitFinder testUnitFinder() {
     return new CompoundTestUnitFinder(Arrays.asList(
         new JUnitCustomRunnerTestUnitFinder(this.config, this.excludedRunners, this.includedTestMethods),
-        new ParameterisedJUnitTestFinder()));
+        new ParameterisedJUnitTestFinder(this.config)));
   }
 
   @Override

pitest/src/main/java/org/pitest/junit/ParameterisedJUnitTestFinder.java

@@ -19,19 +19,30 @@
 import java.util.List;
 import java.util.function.Function;
 
+import org.junit.experimental.categories.Category;
 import org.junit.internal.runners.ErrorReportingRunner;
 import org.junit.runner.Description;
 import org.junit.runner.Runner;
 import org.junit.runners.Parameterized;
 import org.pitest.functional.FCollection;
 import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
 import org.pitest.junit.adapter.AdaptedJUnitTestUnit;
+import org.pitest.testapi.TestGroupConfig;
 import org.pitest.testapi.TestUnit;
 import org.pitest.testapi.TestUnitExecutionListener;
 import org.pitest.testapi.TestUnitFinder;
 
 public class ParameterisedJUnitTestFinder implements TestUnitFinder {
-  @Override
+  private final TestGroupConfig config;
+
+    public ParameterisedJUnitTestFinder(TestGroupConfig config) {
+        this.config = config;
+    }
+
+    @Override
   public List<TestUnit> findTestUnits(final Class<?> clazz, TestUnitExecutionListener unused) {
 
     final Runner runner = AdaptedJUnitTestUnit.createRunner(clazz);
@@ -40,7 +51,7 @@ public List<TestUnit> findTestUnits(final Class<?> clazz, TestUnitExecutionListe
       return Collections.emptyList();
     }
 
-    if (isParameterizedTest(runner)) {
+    if (isParameterizedTest(runner) && isIncluded(clazz)) {
       return handleParameterizedTest(clazz, runner.getDescription());
     }
 
@@ -67,4 +78,36 @@ private boolean isParameterizedTest(final Runner runner) {
     return Parameterized.class.isAssignableFrom(runner.getClass());
   }
 
+  private boolean isIncluded(final Class<?> a) {
+    return isIncludedCategory(a) && !isExcludedCategory(a);
+  }
+
+
+  private boolean isIncludedCategory(final Class<?> a) {
+    final List<String> included = this.config.getIncludedGroups();
+    return included.isEmpty() || !Collections.disjoint(included, getCategories(a));
+  }
+
+  private boolean isExcludedCategory(final Class<?> a) {
+    final List<String> excluded = this.config.getExcludedGroups();
+    return !excluded.isEmpty() && !Collections.disjoint(excluded, getCategories(a));
+  }
+
+  private List<String> getCategories(final Class<?> a) {
+    final Category c = a.getAnnotation(Category.class);
+    return Stream.of(c)
+            .flatMap(toCategoryNames())
+            .collect(Collectors.toList());
+  }
+
+  private Function<Category, Stream<String>> toCategoryNames() {
+    return a -> {
+      if (a == null) {
+        return Stream.empty();
+      }
+      return Stream.of(a.value())
+              .map(Class::getName);
+    };
+  }
+
 }

pitest/src/test/java/org/pitest/junit/ParameterisedJUnitTestFinderTest.java

@@ -14,18 +14,22 @@
  */
 package org.pitest.junit;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.pitest.testapi.TestGroupConfig.emptyConfig;
 
 import java.util.Arrays;
 import java.util.Collection;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 import org.pitest.testapi.NullExecutionListener;
+import org.pitest.testapi.TestGroupConfig;
 import org.pitest.testapi.TestUnit;
 
 public class ParameterisedJUnitTestFinderTest {
@@ -34,7 +38,7 @@ public class ParameterisedJUnitTestFinderTest {
 
   @Before
   public void setup() {
-    this.testee = new ParameterisedJUnitTestFinder();
+    this.testee = new ParameterisedJUnitTestFinder(emptyConfig());
   }
 
   @RunWith(Parameterized.class)
@@ -72,8 +76,75 @@ public void shouldReturnNoTestForNonParameterisedTest() {
     assertTrue(actual.isEmpty());
   }
 
+  @Test
+  public void includesSuppliedCategories() {
+    setConfig(emptyConfig()
+            .withIncludedGroups(ACategory.class.getName()));
+    final Collection<TestUnit> actual = findWithTestee(Tagged.class);
+    assertThat(actual).hasSize(2);
+  }
+
+  @Test
+  public void excludesSuppliedCategories() {
+    setConfig(emptyConfig()
+            .withIncludedGroups(ACategory.class.getName())
+            .withExcludedGroups(AnotherCategory.class.getName()));
+    final Collection<TestUnit> actual = findWithTestee(Tagged.class);
+    assertThat(actual).isEmpty();
+  }
+
+  @Test
+  public void excludesInheritedCategories() {
+    setConfig(emptyConfig()
+            .withIncludedGroups(ACategory.class.getName())
+            .withExcludedGroups(AnotherCategory.class.getName()));
+    final Collection<TestUnit> actual = findWithTestee(IndirectlyTagged.class);
+    assertThat(actual).isEmpty();
+  }
+
+  private void setConfig(TestGroupConfig config) {
+    this.testee = new ParameterisedJUnitTestFinder(config);
+  }
+
+
   private Collection<TestUnit> findWithTestee(final Class<?> clazz) {
     return this.testee.findTestUnits(clazz, new NullExecutionListener());
   }
 
+  interface ACategory {
+
+  }
+
+  interface AnotherCategory {
+
+  }
+
+  @Category({ACategory.class, AnotherCategory.class})
+  @RunWith(Parameterized.class)
+  public static class Tagged {
+    @Parameterized.Parameter
+    public String vt;
+    @Parameterized.Parameter(1)
+    public String vtp;
+
+    @Parameterized.Parameters(name = "P {1}")
+    public static Iterable<Object[]> versions() {
+      return Arrays.asList(new Object[][] {
+              {"foo-1.4", "1.4"},
+              {"foo-2.4", "2.4"}
+      });
+    }
+
+    @Test
+    public void aTest() {
+    }
+  }
+
+  public static class IndirectlyTagged extends Tagged {
+    @Test
+    public void anotherTest() {
+    }
+  }
+
+
 }