MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-159094 Filter exception breakpoints by catch location - tests

Browse Source
This commit is contained in:
Egor.Ushakov
2016-08-01 15:57:33 +03:00
parent 1adcf182f0
commit 8905faae1b
3 changed files with 46 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/Breakpoint.java
+1 -1
View File
@@ -558,7 +558,7 @@ public abstract class Breakpoint<P extends JavaBreakpointProperties> implements
return getProperties().getClassExclusionFilters();
}
protected void setClassExclusionFilters(ClassFilter[] filters) {
public void setClassExclusionFilters(ClassFilter[] filters) {
if (getProperties().setClassExclusionFilters(filters)) {
fireBreakpointChanged();
}
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpoint.java
+13
View File
@@ -40,6 +40,7 @@ import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.ui.classFilter.ClassFilter;
import com.intellij.xdebugger.breakpoints.XBreakpoint;
import com.sun.jdi.AbsentInformationException;
import com.sun.jdi.Location;
@@ -283,4 +284,16 @@ public class ExceptionBreakpoint extends Breakpoint<JavaExceptionBreakpointPrope
void setPackageName(String packageName) {
getProperties().myPackageName = packageName;
}
public void setCatchFiltersEnabled(boolean enabled) {
getProperties().setCatchFiltersEnabled(enabled);
}
public void setCatchClassFilters(ClassFilter[] filters) {
getProperties().setCatchClassFilters(filters);
}
public void setCatchClassExclusionFilters(ClassFilter[] filters) {
getProperties().setCatchClassExclusionFilters(filters);
}
}
java/testFramework/src/com/intellij/debugger/ExecutionWithDebuggerToolsTestCase.java
+32 -12
View File
@@ -28,6 +28,7 @@ import com.intellij.debugger.impl.SynchronizationBasedSemaphore;
import com.intellij.debugger.jdi.StackFrameProxyImpl;
import com.intellij.debugger.ui.breakpoints.Breakpoint;
import com.intellij.debugger.ui.breakpoints.BreakpointManager;
import com.intellij.debugger.ui.breakpoints.ExceptionBreakpoint;
import com.intellij.execution.ExecutionException;
import com.intellij.execution.ExecutionTestCase;
import com.intellij.execution.configurations.RemoteConnection;
@@ -36,6 +37,7 @@ import com.intellij.execution.process.ProcessOutputTypes;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
@@ -51,7 +53,6 @@ import com.sun.jdi.ThreadReference;
import javax.swing.*;
import java.util.ArrayList;
import java.util.List;
import java.util.StringTokenizer;
import java.util.concurrent.TimeUnit;
public abstract class ExecutionWithDebuggerToolsTestCase extends ExecutionTestCase {
@@ -335,6 +336,23 @@ public abstract class ExecutionWithDebuggerToolsTestCase extends ExecutionTestCa
fail(StringUtil.getThrowableText(th));
}
private static Pair<ClassFilter[], ClassFilter[]> readClassFilters(String filtersString) {
ArrayList<ClassFilter> include = new ArrayList<>();
ArrayList<ClassFilter> exclude = new ArrayList<>();
for (String s : filtersString.split(",")) {
ClassFilter filter = new ClassFilter();
filter.setEnabled(true);
if (s.startsWith("-")) {
exclude.add(filter);
s = s.substring(1);
} else {
include.add(filter);
}
filter.setPattern(s);
}
return Pair.create(include.toArray(ClassFilter.EMPTY_ARRAY), exclude.toArray(ClassFilter.EMPTY_ARRAY));
}
public void createBreakpoints(final PsiFile file) {
Runnable runnable = () -> {
BreakpointManager breakpointManager = DebuggerManagerImpl.getInstanceEx(myProject).getBreakpointManager();
@@ -399,19 +417,21 @@ public abstract class ExecutionWithDebuggerToolsTestCase extends ExecutionTestCa
String classFilters = readValue(comment, "Class filters");
if (classFilters != null) {
breakpoint.setClassFiltersEnabled(true);
StringTokenizer tokenizer = new StringTokenizer(classFilters, " ,");
ArrayList<ClassFilter> lst = new ArrayList<ClassFilter>();
while (tokenizer.hasMoreTokens()) {
ClassFilter filter = new ClassFilter();
filter.setEnabled(true);
filter.setPattern(tokenizer.nextToken());
lst.add(filter);
}
breakpoint.setClassFilters(lst.toArray(new ClassFilter[lst.size()]));
Pair<ClassFilter[], ClassFilter[]> filters = readClassFilters(classFilters);
breakpoint.setClassFilters(filters.first);
breakpoint.setClassExclusionFilters(filters.second);
println("Class filters = " + classFilters, ProcessOutputTypes.SYSTEM);
}
String catchClassFilters = readValue(comment, "Catch class filters");
if (catchClassFilters != null && breakpoint instanceof ExceptionBreakpoint) {
ExceptionBreakpoint exceptionBreakpoint = (ExceptionBreakpoint)breakpoint;
exceptionBreakpoint.setCatchFiltersEnabled(true);
Pair<ClassFilter[], ClassFilter[]> filters = readClassFilters(catchClassFilters);
exceptionBreakpoint.setCatchClassFilters(filters.first);
exceptionBreakpoint.setCatchClassExclusionFilters(filters.second);
println("Catch class filters = " + catchClassFilters, ProcessOutputTypes.SYSTEM);
}
}
};
if (!SwingUtilities.isEventDispatchThread()) {