From 8c327790dec0eaef554dd5e3f86994ca74e3186c Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Tue, 16 Sep 2014 13:55:31 +0400
Subject: [PATCH] test groups: merge groups from different
 testGroups.properties files

---
 .../com/intellij/GroupBasedTestClassFilter.java    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/platform/testFramework/src/com/intellij/GroupBasedTestClassFilter.java b/platform/testFramework/src/com/intellij/GroupBasedTestClassFilter.java
index f7a84c0470d9..13904a26ea13 100644
--- a/platform/testFramework/src/com/intellij/GroupBasedTestClassFilter.java
+++ b/platform/testFramework/src/com/intellij/GroupBasedTestClassFilter.java
@@ -15,12 +15,16 @@
  */
 package com.intellij;
 
+import com.intellij.util.containers.MultiMap;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.regex.Pattern;
 
 /**
@@ -51,7 +55,7 @@ public class GroupBasedTestClassFilter extends TestClassesFilter {
    */
   public static final String ALL_EXCLUDE_DEFINED = "ALL_EXCLUDE_DEFINED";
 
-  private final Map<String, List<Pattern>> myPatterns = new HashMap<String, List<Pattern>>();
+  private final MultiMap<String, Pattern> myPatterns = MultiMap.create();
   private final List<Pattern> myAllPatterns = new ArrayList<Pattern>();
   private final List<Pattern> myTestGroupPatterns;
   private boolean myContainsAllExcludeDefinedGroup;
@@ -70,7 +74,7 @@ public class GroupBasedTestClassFilter extends TestClassesFilter {
 
   private void addPatterns(String groupName, List<String> filterList) {
     List<Pattern> patterns = compilePatterns(filterList);
-    myPatterns.put(groupName, patterns);
+    myPatterns.putValues(groupName, patterns);
     myAllPatterns.addAll(patterns);
   }
 
@@ -177,9 +181,7 @@ public class GroupBasedTestClassFilter extends TestClassesFilter {
   private List<Pattern> collectPatternsFor(List<String> groupNames) {
     List<Pattern> patterns = new ArrayList<Pattern>();
     for (String groupName : groupNames) {
-      if (myPatterns.containsKey(groupName)) {
-        patterns.addAll(myPatterns.get(groupName));
-      }
+      patterns.addAll(myPatterns.get(groupName));
     }
     return patterns;
   }