test groups are not null, skip # comments

This commit is contained in:
peter
2010-07-05 11:53:32 +01:00
parent cfcc2b88f9
commit 8a128faaab
2 changed files with 12 additions and 2 deletions
@@ -106,7 +106,7 @@ public class TestCaseLoader {
}
}
}
System.out.println("Using test group: [" + (myTestGroupName == null ? "" : myTestGroupName) + "]");
System.out.println("Using test group: [" + myTestGroupName + "]");
}
/*
@@ -15,6 +15,8 @@
*/
package com.intellij;
import com.intellij.openapi.util.text.StringUtil;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
@@ -137,6 +139,14 @@ public class TestClassesFilter {
currentGroupName = line.substring(1, line.length() - 1);
}
else {
final int commentStart = line.indexOf("#");
if (commentStart >= 0) {
line = line.substring(0, commentStart);
}
if (StringUtil.isEmpty(line)) {
continue;
}
if (!groupNameToPatternsMap.containsKey(currentGroupName)) {
groupNameToPatternsMap.put(currentGroupName, new ArrayList<String>());
}
@@ -189,7 +199,7 @@ public class TestClassesFilter {
}
private static boolean isAllExcludeDefinedGroup(String groupName) {
return groupName == null || ALL_EXCLUDE_DEFINED.equalsIgnoreCase(groupName.trim());
return StringUtil.isEmpty(groupName) || ALL_EXCLUDE_DEFINED.equalsIgnoreCase(groupName.trim());
}
private List<Pattern> collectPatternsFor(String groupName) {