Merge pull request #1171 from hcoles/bug/duplicate_interceptors

Prevent double instantiation of features
hcoles · Mar 22, 2023 · e8f9f8c · e8f9f8c
2 parents 2c342b4 + bde7f73
commit e8f9f8c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/pitest/src/main/java/org/pitest/plugin/FeatureSelector.java b/pitest/src/main/java/org/pitest/plugin/FeatureSelector.java
@@ -6,6 +6,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
@@ -34,15 +35,15 @@ public FeatureSetting getSettingForFeature(String feature) {
   }
 
   private List<T> selectFeatures(List<FeatureSetting> features, Collection<T> filters) {
-    final List<T> factories = new ArrayList<>(filters);
-    final Map<String, Collection<T>> featureMap = FCollection.bucket(factories, byFeatureName());
+    List<T> factories = new ArrayList<>(filters);
+    Map<String, Collection<T>> featureMap = FCollection.bucket(factories, byFeatureName());
 
-    final List<T> active = factories.stream()
+    Set<T> active = factories.stream()
             .filter(isOnByDefault())
-            .collect(Collectors.toCollection(ArrayList::new));
+            .collect(Collectors.toSet());
 
-    for ( final FeatureSetting each : features ) {
-      final Collection<T> providers = featureMap.get(each.feature().toLowerCase());
+    for (FeatureSetting each : features) {
+      Collection<T> providers = featureMap.get(each.feature().toLowerCase());
       if ((providers == null) || providers.isEmpty()) {
         continue;
       }
@@ -59,7 +60,8 @@ private List<T> selectFeatures(List<FeatureSetting> features, Collection<T> filt
       }
     }
 
-    return active;
+    return active.stream()
+            .collect(Collectors.toList());
   }
 
   private Predicate<T> isOnByDefault() {

diff --git a/pitest/src/test/java/org/pitest/plugin/FeatureSelectorTest.java b/pitest/src/test/java/org/pitest/plugin/FeatureSelectorTest.java
@@ -78,6 +78,14 @@ public void featureNamesAreCaseInsensitive() {
     assertThat(this.testee.getSettingForFeature("FOO")).isEqualTo(fooConfig);
   }
 
+  @Test
+  public void doesNotDuplicateFeatures() {
+    final FeatureSetting fooConfig = new FeatureSetting("foo", ToggleStatus.ACTIVATE,  new HashMap<>());
+    this.testee = new FeatureSelector<>(Arrays.asList(fooConfig), features(this.onByDefault));
+
+    assertThat(this.testee.getActiveFeatures()).hasSize(1);
+  }
+
   private List<FeatureSetting> noSettings() {
     return Collections.emptyList();
   }