Bug 162366 org.eclipse.jdt.debug.tests.testSimpleStepFilter/testInactiveStepFilter depend on VM behavior
diff --git a/org.eclipse.jdt.debug.tests/plugin.xml b/org.eclipse.jdt.debug.tests/plugin.xml
index bb30a0d..a2aa97c 100644
--- a/org.eclipse.jdt.debug.tests/plugin.xml
+++ b/org.eclipse.jdt.debug.tests/plugin.xml
@@ -3,7 +3,7 @@
<plugin
id="org.eclipse.jdt.debug.tests"
name="%pluginName"
- version="3.1.0"
+ version="3.2.2"
provider-name="%providerName"
class="org.eclipse.jdt.debug.testplugin.JavaTestPlugin">
diff --git a/org.eclipse.jdt.debug.tests/testprograms/StepFilterOne.java b/org.eclipse.jdt.debug.tests/testprograms/StepFilterOne.java
index d5149b4..1999cc6 100644
--- a/org.eclipse.jdt.debug.tests/testprograms/StepFilterOne.java
+++ b/org.eclipse.jdt.debug.tests/testprograms/StepFilterOne.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -20,6 +20,8 @@
StepFilterTwo sf2 = new StepFilterTwo();
sf2.test();
sf2.go();
+ sf2.test();
+ sf2.go();
}
}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/StepFilterThree.java b/org.eclipse.jdt.debug.tests/testprograms/StepFilterThree.java
index 6681fac..4ae2ae9 100644
--- a/org.eclipse.jdt.debug.tests/testprograms/StepFilterThree.java
+++ b/org.eclipse.jdt.debug.tests/testprograms/StepFilterThree.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -16,7 +16,7 @@
}
void go() {
- System.out.println("StepFilterThree.go()");
+ for (int i = 0; i < 10; i++);
}
}
diff --git a/org.eclipse.jdt.debug.tests/testprograms/StepFilterTwo.java b/org.eclipse.jdt.debug.tests/testprograms/StepFilterTwo.java
index f18ca17..b1a22b7 100644
--- a/org.eclipse.jdt.debug.tests/testprograms/StepFilterTwo.java
+++ b/org.eclipse.jdt.debug.tests/testprograms/StepFilterTwo.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -22,7 +22,7 @@
}
void test() {
- System.out.println("StepFilterTwo.test()");
+ for (int i = 0; i < 10; i++);
}
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StepFilterTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StepFilterTests.java
index bbfbd66..aa75c81 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StepFilterTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/StepFilterTests.java
@@ -1,10 +1,10 @@
/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
+ * Copyright (c) 2000, 2006 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
@@ -20,7 +20,7 @@
/**
* Step filtering tests
- * This test forces the UI plugins to load.
+ * This test forces the UI plug-ins to load.
*/
public class StepFilterTests extends AbstractDebugTest {
@@ -36,19 +36,19 @@
public void testSimpleStepFilter() throws Exception {
getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo," + fOriginalInactiveFilters);
String typeName = "StepFilterOne";
- ILineBreakpoint bp = createLineBreakpoint(21, typeName);
+ ILineBreakpoint bp = createLineBreakpoint(23, typeName);
bp.setEnabled(true);
IJavaThread thread = null;
try {
- thread= launchToLineBreakpoint(typeName, bp, false);
+ thread= launchToLineBreakpoint(typeName, bp, true);
IJavaStackFrame stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
thread = stepIntoWithFilters(stackFrame);
stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
String recTypeName = stackFrame.getReceivingTypeName();
- assertTrue("Receiving type name should have been 'StepFilterOne' but was " + recTypeName, recTypeName.equals("StepFilterOne"));
+ assertEquals("Wrong receiving type", "StepFilterOne", recTypeName);
int lineNumber = stackFrame.getLineNumber();
- assertTrue("Line number should have been 22, but was " + lineNumber, lineNumber == 22);
+ assertEquals("Wrong line number", 24, lineNumber);
} finally {
terminateAndRemove(thread);
removeAllBreakpoints();
@@ -59,7 +59,7 @@
public void testInactiveStepFilter() throws Exception {
getPrefStore().setValue(IJDIPreferencesConstants.PREF_INACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo");
String typeName = "StepFilterOne";
- ILineBreakpoint bp = createLineBreakpoint(21, typeName);
+ ILineBreakpoint bp = createLineBreakpoint(23, typeName);
bp.setEnabled(true);
IJavaThread thread = null;
@@ -69,9 +69,9 @@
thread = stepIntoWithFilters(stackFrame);
stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
String recTypeName = stackFrame.getReceivingTypeName();
- assertTrue("Receiving type name should have been 'StepFilterTwo' but was " + recTypeName, recTypeName.equals("StepFilterTwo"));
+ assertEquals("Wrong receiving type", "StepFilterTwo", recTypeName);
int lineNumber = stackFrame.getLineNumber();
- assertTrue("Line number should have been 25, but was " + lineNumber, lineNumber == 25);
+ assertEquals("Wrong line number", 25, lineNumber);
} finally {
terminateAndRemove(thread);
removeAllBreakpoints();
@@ -82,7 +82,7 @@
public void testDeepStepFilter() throws Exception {
getPrefStore().setValue(IJDIPreferencesConstants.PREF_ACTIVE_FILTERS_LIST, fOriginalActiveFilters + ",StepFilterTwo," + fOriginalInactiveFilters);
String typeName = "StepFilterOne";
- ILineBreakpoint bp = createLineBreakpoint(22, typeName);
+ ILineBreakpoint bp = createLineBreakpoint(24, typeName);
bp.setEnabled(true);
IJavaThread thread = null;
@@ -92,9 +92,9 @@
thread = stepIntoWithFilters(stackFrame);
stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
String recTypeName = stackFrame.getReceivingTypeName();
- assertTrue("Receiving type name should have been 'StepFilterThree' but was " + recTypeName, recTypeName.equals("StepFilterThree"));
+ assertEquals("Wrong receiving type", "StepFilterThree", recTypeName);
int lineNumber = stackFrame.getLineNumber();
- assertTrue("Line number should have been 19, but was " + lineNumber, lineNumber == 19);
+ assertEquals("Wrong line number", 19, lineNumber);
} finally {
terminateAndRemove(thread);
removeAllBreakpoints();
@@ -115,9 +115,9 @@
thread = stepReturnWithFilters(stackFrame);
stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
String recTypeName = stackFrame.getReceivingTypeName();
- assertTrue("Receiving type name should have been 'StepFilterOne' but was " + recTypeName, recTypeName.equals("StepFilterOne"));
+ assertEquals("Wrong receiving type", "StepFilterOne", recTypeName);
int lineNumber = stackFrame.getLineNumber();
- assertTrue("Line number should have been 23, but was " + lineNumber, lineNumber == 23);
+ assertEquals("Wrong line number", 23, lineNumber);
} finally {
terminateAndRemove(thread);
removeAllBreakpoints();
@@ -138,9 +138,9 @@
thread = stepOverWithFilters(stackFrame);
stackFrame = (IJavaStackFrame) thread.getTopStackFrame();
String recTypeName = stackFrame.getReceivingTypeName();
- assertTrue("Receiving type name should have been 'StepFilterOne' but was " + recTypeName, recTypeName.equals("StepFilterOne"));
+ assertEquals("Wrong receiving type", "StepFilterOne", recTypeName);
int lineNumber = stackFrame.getLineNumber();
- assertTrue("Line number should have been 23, but was " + lineNumber, lineNumber == 23);
+ assertEquals("Wrong line number", 23, lineNumber);
} finally {
terminateAndRemove(thread);
removeAllBreakpoints();
