Merge pull request #1229 from hcoles/feature/expand_return_types

mutate iterable to emptyList
hcoles · Jun 9, 2023 · 7bdadd8 · 7bdadd8
2 parents 6b5c769 + 8fc958b
commit 7bdadd8
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/...rg/pitest/mutationtest/build/intercept/equivalent/EquivalentReturnMutationFilterTest.java b/...rg/pitest/mutationtest/build/intercept/equivalent/EquivalentReturnMutationFilterTest.java
@@ -221,6 +221,11 @@ public void filtersEquivalentOptionalMutantsInTryWithResourcesBlocksForOtherComp
   public void filtersEquivalentStreamMutants() {
     verifier.assertFiltersNMutationFromClass(1, AlreadyReturnsEmptyStream.class);
   }
+
+  @Test
+  public void filtersEquivalentIterableMutants() {
+    verifier.assertFiltersNMutationFromClass(1, AlreadyReturnsEmptyIterable.class);
+  }
 }
 
 class Widget{}
@@ -475,4 +480,10 @@ class AlreadyReturnsEmptyStream {
   public Stream<String> a() {
     return Stream.empty();
   }
+}
+
+class AlreadyReturnsEmptyIterable {
+  public Iterable<String> a() {
+    return Collections.emptyList();
+  }
 }
diff --git a/.../org/pitest/mutationtest/engine/gregor/mutators/returns/EmptyObjectReturnValsMutator.java b/.../org/pitest/mutationtest/engine/gregor/mutators/returns/EmptyObjectReturnValsMutator.java
@@ -72,6 +72,7 @@ class AReturnMethodVisitor extends AbstractInsnMutator {
     NON_NULL_MUTATIONS.put("java.util.Map", returnEmptyMap());
     NON_NULL_MUTATIONS.put("java.util.Set", returnEmptySet());
     NON_NULL_MUTATIONS.put("java.util.Collection", returnEmptyList());
+    NON_NULL_MUTATIONS.put("java.lang.Iterable", returnEmptyList());
   }
 
   AReturnMethodVisitor(final MethodMutatorFactory factory,

diff --git a/...c/test/java/org/pitest/mutationtest/engine/gregor/mutators/EmptyObjectReturnValsTest.java b/...c/test/java/org/pitest/mutationtest/engine/gregor/mutators/EmptyObjectReturnValsTest.java
@@ -13,6 +13,7 @@
 import java.util.concurrent.Callable;
 import java.util.stream.Stream;
 
+import static java.util.Arrays.asList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.pitest.mutationtest.engine.gregor.mutators.returns.EmptyObjectReturnValsMutator.EMPTY_RETURNS;
 
@@ -174,6 +175,14 @@ public void mutatesToEmptyStream() {
     assertThat(actual).isEmpty();
   }
 
+  @Test
+  public void mutatesIterableToEmptyList() {
+    Iterable actual = v.forCallableClass(AnIterable.class)
+            .firstMutantReturnValue();
+
+    assertThat(actual).isEmpty();
+  }
+
   private static class ObjectReturn implements Callable<Object> {
     @Override
     public Object call() throws Exception {
@@ -289,4 +298,11 @@ public Stream<String> call() throws Exception {
     }
   }
 
+  private static class AnIterable implements Callable<Iterable<String>> {
+    @Override
+    public Iterable<String> call() throws Exception {
+      return asList("hello");
+    }
+  }
+
 }