diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/model/DisassemblyDocument.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/model/DisassemblyDocument.java
index e6bc008e426..c0a85d8cf80 100644
--- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/model/DisassemblyDocument.java
+++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/ui/disassembly/model/DisassemblyDocument.java
@@ -538,7 +538,7 @@ public class DisassemblyDocument extends REDDocument {
* @return the document position or null
*/
protected Position getSourcePosition(SourceFileInfo info, int lineNumber) {
- if (info == null) {
+ if (info == null || info.fSource == null) {
return null;
}
try {
diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIBreakpoints.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIBreakpoints.java
index 0303374c2c6..a9214ee0b5c 100644
--- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIBreakpoints.java
+++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIBreakpoints.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Ericsson and others.
+ * Copyright (c) 2007, 2008 Ericsson 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
@@ -87,7 +87,7 @@ public class MIBreakpoints extends AbstractDsfService implements IBreakpoints
// Service breakpoints tracking
// The breakpoints are stored per context and keyed on the back-end breakpoint reference
- private Map> fBreakpoints =
+ private Map> fBreakpoints =
new HashMap>();
// Error messages
@@ -214,7 +214,7 @@ public class MIBreakpoints extends AbstractDsfService implements IBreakpoints
}
/*
- * Asynchronous service initialization
+ * Asynchronous service initialization
*/
private void doInitialize(final RequestMonitor rm) {
@@ -256,7 +256,7 @@ public class MIBreakpoints extends AbstractDsfService implements IBreakpoints
/*
* When a watchpoint goes out of scope, it is automatically removed from
* the back-end. To keep our internal state synchronized, we have to
- * remove it from our breakpoints map.
+ * remove it from our breakpoints map.
*/
@DsfServiceEventHandler
public void eventDispatched(MIWatchpointScopeEvent e) {
@@ -270,7 +270,7 @@ public class MIBreakpoints extends AbstractDsfService implements IBreakpoints
}
}
- @DsfServiceEventHandler
+ @DsfServiceEventHandler
public void eventDispatched(MIGDBExitEvent e) {
}
@@ -448,6 +448,15 @@ public class MIBreakpoints extends AbstractDsfService implements IBreakpoints
} else {
location = fileName + ":" + function; //$NON-NLS-1$
}
+ } else if (!function.equals(NULL_STRING)) {
+ // function location without source
+ location = function;
+ } else if (location.length() > 0) {
+ // address location
+ if (Character.isDigit(location.charAt(0))) {
+ // numeric address needs '*' prefix
+ location = '*' + location;
+ }
}
return location;
@@ -472,6 +481,13 @@ public class MIBreakpoints extends AbstractDsfService implements IBreakpoints
// Extract the relevant parameters (providing default values to avoid potential NPEs)
String location = formatLocation(attributes);
+
+ if (location.equals(NULL_STRING)) {
+ drm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, REQUEST_FAILED, UNKNOWN_BREAKPOINT_CONTEXT, null));
+ drm.done();
+ return;
+ }
+
Boolean isTemporary = (Boolean) getProperty(attributes, MIBreakpointDMData.IS_TEMPORARY, false);
Boolean isHardware = (Boolean) getProperty(attributes, MIBreakpointDMData.IS_HARDWARE, false);
final String condition = (String) getProperty(attributes, CONDITION, NULL_STRING);
@@ -900,7 +916,7 @@ public class MIBreakpoints extends AbstractDsfService implements IBreakpoints
// Queue the command
fConnection.queueCommand(
new MIBreakEnable(context, new int[] { reference }),
- new DataRequestMonitor(getExecutor(), rm) {
+ new DataRequestMonitor(getExecutor(), rm) {
@Override
protected void handleSuccess() {
MIBreakpointDMData breakpoint = contextBreakpoints.get(reference);
@@ -936,7 +952,7 @@ public class MIBreakpoints extends AbstractDsfService implements IBreakpoints
// Queue the command
fConnection.queueCommand(
new MIBreakDisable(context, new int[] { reference }),
- new DataRequestMonitor(getExecutor(), rm) {
+ new DataRequestMonitor(getExecutor(), rm) {
@Override
protected void handleSuccess() {
MIBreakpointDMData breakpoint = contextBreakpoints.get(reference);
diff --git a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIBreakpointsManager.java b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIBreakpointsManager.java
index 3e24bebb8f5..bec8c41bbae 100644
--- a/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIBreakpointsManager.java
+++ b/plugins/org.eclipse.dd.mi/src/org/eclipse/dd/mi/service/MIBreakpointsManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Wind River and others.
+ * Copyright (c) 2007, 2008 Wind River 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
@@ -8,9 +8,9 @@
* Contributors:
* Wind River - Initial API and implementation
* Ericsson - High-level breakpoints integration
- * Ericsson - Added breakpoint filter support
+ * Ericsson - Added breakpoint filter support
* Ericsson - Re-factored the service and put a few comments
- * Ericsson - Added Action support
+ * Ericsson - Added Action support
*******************************************************************************/
package org.eclipse.dd.mi.service;
@@ -27,6 +27,7 @@ import java.util.concurrent.RejectedExecutionException;
import org.eclipse.cdt.debug.core.CDebugCorePlugin;
import org.eclipse.cdt.debug.core.breakpointactions.BreakpointActionManager;
+import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpointExtension;
import org.eclipse.cdt.debug.core.model.ICLineBreakpoint;
@@ -119,7 +120,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
// - Augmented on breakpointAdded()
// - Modified on breakpointChanged()
// - Diminished on breakpointRemoved()
- private Map>> fPlatformBPs =
+ private Map>> fPlatformBPs =
new HashMap>>();
// Holds the set of target breakpoints, per execution context, and their
@@ -131,18 +132,18 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
// - We start/stop tracking an execution context
// - A platform breakpoint is added/removed
// - A thread filter is applied/removed
- private Map> fTargetBPs =
+ private Map> fTargetBPs =
new HashMap>();
// Holds the mapping from platform breakpoint to the corresponding target
- // breakpoint(s), per context. There can be multiple back-end BPs for a
+ // breakpoint(s), per context. There can be multiple back-end BPs for a
// single platform BP in the case of [1] multiple target contexts, and/or
// [2] thread filtering.
// Updated when:
// - We start/stop tracking an execution context
// - A platform breakpoint is added/removed
// - A thread filter is applied/removed
- private Map>> fBreakpointIDs =
+ private Map>> fBreakpointIDs =
new HashMap>>();
// Holds the mapping from platform breakpoint to the corresponding target
@@ -151,7 +152,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
// - We start/stop tracking an execution context
// - A platform breakpoint is added/removed
// - A thread filter is applied/removed
- private Map>> fBreakpointThreads =
+ private Map>> fBreakpointThreads =
new HashMap>>();
// Due to the very asynchronous nature of DSF, a new breakpoint request can
@@ -160,7 +161,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
private Set fPendingRequests = new HashSet();
private Set fPendingBreakpoints = new HashSet();
- private Map fBreakpointMarkerProblems =
+ private Map fBreakpointMarkerProblems =
new HashMap();
///////////////////////////////////////////////////////////////////////////
@@ -186,7 +187,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
static final String NO_MARKER_FOR_BREAKPOINT = "No marker associated with breakpoint"; //$NON-NLS-1$
///////////////////////////////////////////////////////////////////////////
- // AbstractDsfService
+ // AbstractDsfService
///////////////////////////////////////////////////////////////////////////
/**
@@ -207,7 +208,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
//-------------------------------------------------------------------------
// - Collect references for the services we interact with
// - Register to interesting events
- // - Obtain the list of platform breakpoints
+ // - Obtain the list of platform breakpoints
// - Register the service for interested parties
//-------------------------------------------------------------------------
@@ -217,7 +218,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
@Override
public void initialize(final RequestMonitor rm) {
super.initialize(
- new RequestMonitor(getExecutor(), rm) {
+ new RequestMonitor(getExecutor(), rm) {
@Override
protected void handleSuccess() {
doInitialize(rm);
@@ -254,7 +255,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
// - Un-register the service
// - Stop listening to events
// - Remove the breakpoints installed by this service
- //
+ //
// Since we are shutting down, there is no overwhelming need
// to keep the maps coherent...
//-------------------------------------------------------------------------
@@ -313,8 +314,8 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
//-------------------------------------------------------------------------
/**
- * Install and begin tracking breakpoints for given context. The service
- * will keep installing new breakpoints that appear in the IDE for this
+ * Install and begin tracking breakpoints for given context. The service
+ * will keep installing new breakpoints that appear in the IDE for this
* context until {@link #uninstallBreakpoints(IDMContext)} is called for that
* context.
* @param dmc Context to start tracking breakpoints for.
@@ -325,7 +326,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
// Validate the execution context
if (dmc == null) {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, REQUEST_FAILED, INVALID_CONTEXT, null));
- rm.done();
+ rm.done();
return;
}
@@ -336,7 +337,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
Map> threadIDs = fBreakpointThreads.get(dmc);
if ((platformBPs != null) || (breakpointIDs != null) || (targetIDs != null) || (threadIDs != null)) {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, INTERNAL_ERROR, CONTEXT_ALREADY_INITIALIZED, null));
- rm.done();
+ rm.done();
return;
}
@@ -360,7 +361,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
return Status.OK_STATUS;
}
- }.schedule();
+ }.schedule();
}
/**
@@ -436,7 +437,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
// Validate the context
if (dmc == null) {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, INTERNAL_ERROR, INVALID_CONTEXT, null));
- rm.done();
+ rm.done();
return;
}
@@ -464,7 +465,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
countingRm.setDoneCount(platformBPs.size());
for (final ICBreakpoint breakpoint : platformBPs.keySet()) {
- uninstallBreakpoint(dmc, breakpoint,
+ uninstallBreakpoint(dmc, breakpoint,
new RequestMonitor(getExecutor(), countingRm) {
@Override
protected void handleCompleted() {
@@ -486,7 +487,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
* Install a platform breakpoint on the back-end. For a given context, a
* platform breakpoint can resolve into multiple back-end breakpoints when
* threads are taken into account.
- *
+ *
* @param dmc
* @param breakpoint
* @param attributes
@@ -516,7 +517,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
}
// Ensure the breakpoint has a valid debugger source path
- if (!(breakpoint instanceof ICWatchpoint)) {
+ if (breakpoint instanceof ICLineBreakpoint && !(breakpoint instanceof ICAddressBreakpoint)) {
String debuggerPath = (String) attributes.get(ATTR_DEBUGGER_PATH);
if (debuggerPath == null || debuggerPath == NULL_STRING) {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, REQUEST_FAILED, NO_DEBUGGER_PATH, null));
@@ -546,7 +547,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
// Install the back-end breakpoint(s)
for (final String thread : threads) {
- DataRequestMonitor drm =
+ DataRequestMonitor drm =
new DataRequestMonitor(getExecutor(), installRM) {
@Override
protected void handleSuccess() {
@@ -619,7 +620,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
}
return Status.OK_STATUS;
}
- }.schedule();
+ }.schedule();
}
private void RemoveBreakpointProblemMarker(final ICBreakpoint breakpoint) {
@@ -638,7 +639,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
return Status.OK_STATUS;
}
- }.schedule();
+ }.schedule();
}
//-------------------------------------------------------------------------
@@ -647,7 +648,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
/**
* Un-install an individual breakpoint on the back-end. For one platform
- * breakpoint in a given execution context, there could be multiple
+ * breakpoint in a given execution context, there could be multiple
* corresponding back-end breakpoints (one per thread).
*
* @param dmc
@@ -687,7 +688,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
protected void handleSuccess() {
// Update the mappings
platformBPs.remove(breakpoint);
- threadsIDs.remove(breakpoint);
+ threadsIDs.remove(breakpoint);
Vector contexts = breakpointIDs.get(breakpoint);
if (contexts != null) {
@@ -775,7 +776,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
final Map attributesDelta = determineAttributesDelta(oldAttributes, newAttributes);
- // Get the list of back-end breakpoints
+ // Get the list of back-end breakpoints
final Vector oldTargetBPs = new Vector(breakpointIDs.get(breakpoint));
if (oldTargetBPs == null) {
rm.setStatus(new Status(IStatus.ERROR, MIPlugin.PLUGIN_ID, INVALID_HANDLE, INVALID_BREAKPOINT, null));
@@ -784,13 +785,13 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
}
// We're all set for the breakpoint update.
- //
+ //
// The path for a simple update is straightforward:
// - For each back-end BP corresponding to a platform BP
// - Send an update command to the back-end
// - If the operation succeeded, update the data structures
// - If the operation failed, try to roll-back
- //
+ //
// In cases where the the back-end breakpoint cannot be
// simply updated (e.g. thread filter modification), the old
// breakpoint has to be removed and new one(s) inserted.
@@ -812,7 +813,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
@Override
protected void handleError() {
- // Reset the breakpoint attributes. This will trigger a
+ // Reset the breakpoint attributes. This will trigger a
// breakpoint change event and the correct delta will be
// computed, resulting in a correctly restored breakpoint
// at the back-end.
@@ -845,7 +846,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
// New back-end breakpoints insertion monitor
// Holds the list of new back-end breakpoint contexts of the platform breakpoint
- final DataRequestMonitor> insertRM =
+ final DataRequestMonitor> insertRM =
new DataRequestMonitor>(getExecutor(), null) {
@Override
@@ -875,7 +876,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
}
};
- // If the changes in the breakpoint attributes justify it, install a
+ // If the changes in the breakpoint attributes justify it, install a
// new set of back-end breakpoint(s) and then update them
if (needsResinstallation(attributesDelta)) {
reinstallBreakpoint(dmc, breakpoint, attributes, newThreads, insertRM);
@@ -910,7 +911,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
@Override
protected void handleSuccess() {
// Report whatever we have managed to install
- // It is very likely installation either succeeded or failed for all
+ // It is very likely installation either succeeded or failed for all
drm.setData(breakpointList);
drm.done();
}
@@ -1050,7 +1051,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
}
// Modify the breakpoint in all the target contexts
- getExecutor().execute( new DsfRunnable() {
+ getExecutor().execute( new DsfRunnable() {
public void run() {
// If the breakpoint is currently being updated, queue the request and exit
@@ -1087,7 +1088,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
// Modify the breakpoint in all the execution contexts
for (final IBreakpointsTargetDMContext dmc : fPlatformBPs.keySet()) {
- determineDebuggerPath(dmc, attrs,
+ determineDebuggerPath(dmc, attrs,
new RequestMonitor(getExecutor(), countingRm) {
@Override
protected void handleSuccess() {
@@ -1143,17 +1144,17 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
// Breakpoints
//-------------------------------------------------------------------------
- @DsfServiceEventHandler
+ @DsfServiceEventHandler
public void eventDispatched(BreakpointAddedEvent e) {
// Nothing to do - already handled by breakpointAdded()
}
- @DsfServiceEventHandler
+ @DsfServiceEventHandler
public void eventDispatched(BreakpointUpdatedEvent e) {
// Nothing to do - already handled by breakpointChanged()
}
- @DsfServiceEventHandler
+ @DsfServiceEventHandler
public void eventDispatched(BreakpointRemovedEvent e) {
// Nothing to do - already handled by breakpointRemoved()
}
@@ -1162,7 +1163,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
* When a watchpoint goes out of scope, it is automatically removed from
* the back-end. To keep our internal state synchronized, we have to
* remove it from our breakpoints maps.
- * Unfortunately, GDB doesn't generate the correct event...
+ * Unfortunately, GDB doesn't generate the correct event...
*/
@DsfServiceEventHandler
public void eventDispatched(MIWatchpointScopeEvent e) {
@@ -1172,12 +1173,12 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
// Breakpoint actions
//-------------------------------------------------------------------------
- @DsfServiceEventHandler
+ @DsfServiceEventHandler
public void eventDispatched(MIBreakpointHitEvent e) {
performBreakpointAction(e.getNumber());
}
- @DsfServiceEventHandler
+ @DsfServiceEventHandler
public void eventDispatched(MIWatchpointTriggerEvent e) {
performBreakpointAction(e.getNumber());
}
@@ -1226,7 +1227,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
// Session exit
//-------------------------------------------------------------------------
- @DsfServiceEventHandler
+ @DsfServiceEventHandler
public void eventDispatched(MIGDBExitEvent e) {
terminated();
}
@@ -1243,8 +1244,8 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
/**
* @param bps
*/
- private void clearBreakpointStatus(final ICBreakpoint[] bps)
- {
+ private void clearBreakpointStatus(final ICBreakpoint[] bps)
+ {
new Job("Clear Breakpoints Status") { //$NON-NLS-1$
@Override
protected IStatus run(IProgressMonitor monitor) {
@@ -1284,7 +1285,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
}
return Status.OK_STATUS;
}
- }.schedule();
+ }.schedule();
}
///////////////////////////////////////////////////////////////////////////
@@ -1315,7 +1316,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
*
* Adds the path to the source file to the set of attributes
* (for the debugger).
- *
+ *
* @param dmc
* @param attributes
* @param rm
@@ -1361,7 +1362,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
Map delta = new HashMap();
- Set oldKeySet = oldAttributes.keySet();
+ Set oldKeySet = oldAttributes.keySet();
Set newKeySet = newAttributes.keySet();
Set commonKeys = new HashSet(newKeySet); commonKeys.retainAll(oldKeySet);
@@ -1479,7 +1480,7 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
IContainerDMContext ctx = DMContexts.getAncestorOfType(dmc, IContainerDMContext.class);
if (ctx == targetContext) {
filterExtension.setTargetFilter(ctx);
- targets = filterExtension.getTargetFilters();
+ targets = filterExtension.getTargetFilters();
}
}
}
@@ -1530,13 +1531,15 @@ public class MIBreakpointsManager extends AbstractDsfService implements IBreakpo
properties.put(MIBreakpoints.READ, attributes.get(ICWatchpoint.READ));
properties.put(MIBreakpoints.WRITE, attributes.get(ICWatchpoint.WRITE));
}
- else {
+ else if (breakpoint instanceof ICLineBreakpoint) {
// Convert the CDI breakpoint to an IBreakpoint
properties.put(MIBreakpoints.BREAKPOINT_TYPE, MIBreakpoints.BREAKPOINT);
properties.put(MIBreakpoints.FILE_NAME, attributes.get(ATTR_DEBUGGER_PATH));
properties.put(MIBreakpoints.LINE_NUMBER, attributes.get(IMarker.LINE_NUMBER));
properties.put(MIBreakpoints.FUNCTION, attributes.get(ICLineBreakpoint.FUNCTION));
properties.put(MIBreakpoints.ADDRESS, attributes.get(ICLineBreakpoint.ADDRESS));
+ } else {
+ // catchpoint?
}
// Common fields
diff --git a/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/BreakpointTestApp.exe b/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/BreakpointTestApp.exe
index 001fd61c5ce..fb44bcb63dc 100755
Binary files a/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/BreakpointTestApp.exe and b/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/BreakpointTestApp.exe differ
diff --git a/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/ExpressionTestApp.exe b/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/ExpressionTestApp.exe
index 021d8981d19..3dc5b2ca52f 100755
Binary files a/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/ExpressionTestApp.exe and b/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/ExpressionTestApp.exe differ
diff --git a/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/GDBMIGenericTestApp.exe b/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/GDBMIGenericTestApp.exe
index 7eb311144cc..4e090062430 100755
Binary files a/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/GDBMIGenericTestApp.exe and b/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/GDBMIGenericTestApp.exe differ
diff --git a/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/MemoryTestApp.exe b/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/MemoryTestApp.exe
index be5c37d13e4..f94584768a5 100755
Binary files a/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/MemoryTestApp.exe and b/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/MemoryTestApp.exe differ
diff --git a/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/MultiThread.exe b/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/MultiThread.exe
index c0f4b38faef..57009cf57bb 100755
Binary files a/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/MultiThread.exe and b/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/MultiThread.exe differ
diff --git a/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/SpecialTestApp.exe b/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/SpecialTestApp.exe
index 97775965e40..0856411d004 100755
Binary files a/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/SpecialTestApp.exe and b/plugins/org.eclipse.dd.tests.gdb/data/launch/bin/SpecialTestApp.exe differ
diff --git a/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/MIBreakpointsTest.java b/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/MIBreakpointsTest.java
index 549b11ce315..2a9b5756b1b 100644
--- a/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/MIBreakpointsTest.java
+++ b/plugins/org.eclipse.dd.tests.gdb/src/org/eclipse/dd/tests/gdb/MIBreakpointsTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007 Ericsson and others.
+ * Copyright (c) 2007, 2008 Ericsson 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
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.dd.tests.gdb;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@@ -176,7 +177,7 @@ public class MIBreakpointsTest extends BaseTestCase {
assert(fServicesTracker != null);
GDBControl gdbControl = fServicesTracker.getService(GDBControl.class);
- fGdbControlDmc = gdbControl.getGDBDMContext();
+ fGdbControlDmc = gdbControl.getGDBDMContext();
assert(fGdbControlDmc != null);
fRunControl = fServicesTracker.getService(MIRunControl.class);
@@ -338,7 +339,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// Get a stack context (temporary - should be an MIcontainerDMC)
final IExpressionDMContext expressionDMC = SyncUtil.SyncCreateExpression(fGdbControlDmc, expression);
- final FormattedValueDMContext formattedValueDMC = SyncUtil.SyncGetFormattedValue(fExpressionService,
+ final FormattedValueDMContext formattedValueDMC = SyncUtil.SyncGetFormattedValue(fExpressionService,
expressionDMC, IFormattedValues.DECIMAL_FORMAT);
// Create the DataRequestMonitor which will store the operation result in the wait object
@@ -390,7 +391,7 @@ public class MIBreakpointsTest extends BaseTestCase {
fWait.waitReset();
// Set the Request Monitor
- final DataRequestMonitor drm =
+ final DataRequestMonitor drm =
new DataRequestMonitor(fBreakpointService.getExecutor(), null) {
@Override
protected void handleCompleted() {
@@ -432,7 +433,7 @@ public class MIBreakpointsTest extends BaseTestCase {
fWait.waitReset();
// Set the Request Monitor
- final DataRequestMonitor drm =
+ final DataRequestMonitor drm =
new DataRequestMonitor(fBreakpointService.getExecutor(), null) {
@Override
protected void handleCompleted() {
@@ -476,7 +477,7 @@ public class MIBreakpointsTest extends BaseTestCase {
fWait.waitReset();
// Set the Request Monitor
- final DataRequestMonitor drm =
+ final DataRequestMonitor drm =
new DataRequestMonitor(fBreakpointService.getExecutor(), null) {
@Override
protected void handleCompleted() {
@@ -515,7 +516,7 @@ public class MIBreakpointsTest extends BaseTestCase {
fWait.waitReset();
// Set the Request Monitor
- final RequestMonitor rm =
+ final RequestMonitor rm =
new RequestMonitor(fBreakpointService.getExecutor(), null) {
@Override
protected void handleCompleted() {
@@ -547,14 +548,14 @@ public class MIBreakpointsTest extends BaseTestCase {
* @param delta the delta properties
* ------------------------------------------------------------------------
*/
- private void updateBreakpoint(final IBreakpointDMContext breakpoint,
+ private void updateBreakpoint(final IBreakpointDMContext breakpoint,
final Map delta) throws InterruptedException
{
// Clear the completion waiter
fWait.waitReset();
// Set the Request Monitor
- final RequestMonitor rm =
+ final RequestMonitor rm =
new RequestMonitor(fBreakpointService.getExecutor(), null) {
@Override
protected void handleCompleted() {
@@ -621,7 +622,7 @@ public class MIBreakpointsTest extends BaseTestCase {
fWait.getMessage().contains(expected));
// Ensure that no BreakpointEvent was received
- assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 0);
}
@@ -645,7 +646,7 @@ public class MIBreakpointsTest extends BaseTestCase {
fWait.getMessage().contains(expected));
// Ensure that no BreakpointEvent was received
- assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 0);
}
@@ -669,7 +670,7 @@ public class MIBreakpointsTest extends BaseTestCase {
fWait.getMessage().contains(expected));
// Ensure that no BreakpointEvent was received
- assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 0);
}
@@ -693,7 +694,7 @@ public class MIBreakpointsTest extends BaseTestCase {
fWait.getMessage().contains(expected));
// Ensure that no BreakpointEvent was received
- assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 0);
}
@@ -706,7 +707,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// Create an address breakpoint
Map breakpoint = new HashMap();
breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG);
- breakpoint.put(ADDRESS_TAG, "0x0");
+ breakpoint.put(ADDRESS_TAG, "0x0z");
// Perform the test
String expected = BREAKPOINT_INSERTION_FAILURE;
@@ -716,10 +717,56 @@ public class MIBreakpointsTest extends BaseTestCase {
fWait.getMessage().contains(expected));
// Ensure that no BreakpointEvent was received
- assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 0);
}
+
+ // ------------------------------------------------------------------------
+ // insertBreakpoint_Address
+ // Set a breakpoint on an address
+ // Ensure that it is set correctly at the back-end.
+ // ------------------------------------------------------------------------
+ @Test
+ public void insertBreakpoint_Address() throws Throwable {
+
+ // Create an address breakpoint
+ Map breakpoint = new HashMap();
+ breakpoint.put(BREAKPOINT_TYPE_TAG, BREAKPOINT_TAG);
+ final BigInteger ADDRESS= new BigInteger("00affe00", 16);
+ breakpoint.put(ADDRESS_TAG, "0x"+ADDRESS.toString(16));
+
+ // Perform the test
+ IBreakpointDMContext ref = insertBreakpoint(fGdbControlDmc, breakpoint);
+
+ // Ensure that right BreakpointEvents were received
+ waitForBreakpointEvent();
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ + fBreakpointEventCount, fBreakpointEventCount == 1);
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ + getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
+ clearEventCounters();
+
+ // Ensure that the breakpoint was correctly installed
+ MIBreakpointDMData breakpoint1 = (MIBreakpointDMData) getBreakpoint(ref);
+ assertEquals("BreakpointService problem: breakpoint mismatch (wrong address)",
+ breakpoint1.getAddresses()[0].getValue(), ADDRESS);
+ assertTrue("BreakpointService problem: breakpoint mismatch (wrong condition)",
+ breakpoint1.getCondition().equals(NO_CONDITION));
+ assertTrue("BreakpointService problem: breakpoint mismatch (wrong ignore count)",
+ breakpoint1.getIgnoreCount() == 0);
+ assertTrue("BreakpointService problem: breakpoint mismatch (wrong state)",
+ breakpoint1.isEnabled());
+
+ // Ensure the BreakpointService holds only the right breakpoints
+ IBreakpointDMContext[] breakpoints = getBreakpoints(fGdbControlDmc);
+ assertTrue("BreakpointService problem: expected " + 1 + " breakpoint(s), received "
+ + breakpoints.length, breakpoints.length == 1);
+ MIBreakpointDMData breakpoint2 = (MIBreakpointDMData) getBreakpoint(breakpoints[0]);
+ assertTrue("BreakpointService problem: breakpoint mismatch",
+ breakpoint1.equals(breakpoint2));
+ }
+
// ------------------------------------------------------------------------
// insertBreakpoint_LineNumber
// Set a breakpoint on a line number.
@@ -740,9 +787,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -761,7 +808,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the BreakpointService holds only the right breakpoints
IBreakpointDMContext[] breakpoints = getBreakpoints(fGdbControlDmc);
- assertTrue("BreakpointService problem: expected " + 1 + " breakpoint(s), received "
+ assertTrue("BreakpointService problem: expected " + 1 + " breakpoint(s), received "
+ breakpoints.length, breakpoints.length == 1);
MIBreakpointDMData breakpoint2 = (MIBreakpointDMData) getBreakpoint(breakpoints[0]);
assertTrue("BreakpointService problem: breakpoint mismatch",
@@ -789,9 +836,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -810,7 +857,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the BreakpointService holds only the right breakpoints
IBreakpointDMContext[] breakpoints = getBreakpoints(fGdbControlDmc);
- assertTrue("BreakpointService problem: expected " + 1 + " breakpoint(s), received "
+ assertTrue("BreakpointService problem: expected " + 1 + " breakpoint(s), received "
+ breakpoints.length, breakpoints.length == 1);
MIBreakpointDMData breakpoint2 = (MIBreakpointDMData) getBreakpoint(breakpoints[0]);
assertTrue("BreakpointService problem: breakpoint mismatch",
@@ -837,9 +884,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -856,7 +903,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the BreakpointService holds only the right breakpoints
IBreakpointDMContext[] breakpoints = getBreakpoints(fGdbControlDmc);
- assertTrue("BreakpointService problem: expected " + 1 + " breakpoint(s), received "
+ assertTrue("BreakpointService problem: expected " + 1 + " breakpoint(s), received "
+ breakpoints.length, breakpoints.length == 1);
MIBreakpointDMData breakpoint2 = (MIBreakpointDMData) getBreakpoint(breakpoints[0]);
assertTrue("BreakpointService problem: breakpoint mismatch",
@@ -884,9 +931,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -903,7 +950,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the BreakpointService holds only the right breakpoints
IBreakpointDMContext[] breakpoints = getBreakpoints(fGdbControlDmc);
- assertTrue("BreakpointService problem: expected " + 1 + " breakpoint(s), received "
+ assertTrue("BreakpointService problem: expected " + 1 + " breakpoint(s), received "
+ breakpoints.length, breakpoints.length == 1);
MIBreakpointDMData breakpoint2 = (MIBreakpointDMData) getBreakpoint(breakpoints[0]);
assertTrue("BreakpointService problem: breakpoint mismatch",
@@ -931,9 +978,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -950,7 +997,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the BreakpointService holds only the right breakpoints
IBreakpointDMContext[] breakpoints = getBreakpoints(fGdbControlDmc);
- assertTrue("BreakpointService problem: expected " + 1 + " breakpoint(s), received "
+ assertTrue("BreakpointService problem: expected " + 1 + " breakpoint(s), received "
+ breakpoints.length, breakpoints.length == 1);
MIBreakpointDMData breakpoint2 = (MIBreakpointDMData) getBreakpoint(breakpoints[0]);
assertTrue("BreakpointService problem: breakpoint mismatch",
@@ -977,9 +1024,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -1006,9 +1053,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -1025,7 +1072,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the BreakpointService holds only the right breakpoints
IBreakpointDMContext[] breakpoints = getBreakpoints(fGdbControlDmc);
- assertTrue("BreakpointService problem: expected " + 2 + " breakpoint(s), received "
+ assertTrue("BreakpointService problem: expected " + 2 + " breakpoint(s), received "
+ breakpoints.length, breakpoints.length == 2);
MIBreakpointDMData svc_bp1 = (MIBreakpointDMData) getBreakpoint(breakpoints[0]);
MIBreakpointDMData svc_bp2 = (MIBreakpointDMData) getBreakpoint(breakpoints[1]);
@@ -1063,9 +1110,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -1086,9 +1133,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -1105,7 +1152,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the BreakpointService holds only the right breakpoints
IBreakpointDMContext[] breakpoints = getBreakpoints(fGdbControlDmc);
- assertTrue("BreakpointService problem: expected " + 2 + " breakpoint(s), received "
+ assertTrue("BreakpointService problem: expected " + 2 + " breakpoint(s), received "
+ breakpoints.length, breakpoints.length == 2);
MIBreakpointDMData svc_bp1 = (MIBreakpointDMData) getBreakpoint(breakpoints[0]);
MIBreakpointDMData svc_bp2 = (MIBreakpointDMData) getBreakpoint(breakpoints[1]);
@@ -1147,9 +1194,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -1166,7 +1213,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the BreakpointService holds only the right watchpoints
IBreakpointDMContext[] watchpoints = getBreakpoints(fGdbControlDmc);
- assertTrue("BreakpointService problem: expected " + 1 + " watchpoints(s), received "
+ assertTrue("BreakpointService problem: expected " + 1 + " watchpoints(s), received "
+ watchpoints.length, watchpoints.length == 1);
MIBreakpointDMData watchpoint2 = (MIBreakpointDMData) getBreakpoint(watchpoints[0]);
assertTrue("BreakpointService problem: breakpoint mismatch",
@@ -1193,9 +1240,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -1212,7 +1259,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the BreakpointService holds only the right watchpoints
IBreakpointDMContext[] watchpoints = getBreakpoints(fGdbControlDmc);
- assertTrue("BreakpointService problem: expected " + 1 + " watchpoints(s), received "
+ assertTrue("BreakpointService problem: expected " + 1 + " watchpoints(s), received "
+ watchpoints.length, watchpoints.length == 1);
MIBreakpointDMData watchpoint2 = (MIBreakpointDMData) getBreakpoint(watchpoints[0]);
assertTrue("BreakpointService problem: breakpoint mismatch",
@@ -1240,9 +1287,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -1259,7 +1306,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the BreakpointService holds only the right watchpoints
IBreakpointDMContext[] watchpoints = getBreakpoints(fGdbControlDmc);
- assertTrue("BreakpointService problem: expected " + 1 + " watchpoints(s), received "
+ assertTrue("BreakpointService problem: expected " + 1 + " watchpoints(s), received "
+ watchpoints.length, watchpoints.length == 1);
MIBreakpointDMData watchpoint2 = (MIBreakpointDMData) getBreakpoint(watchpoints[0]);
assertTrue("BreakpointService problem: breakpoint mismatch",
@@ -1290,9 +1337,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -1302,15 +1349,15 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_REMOVED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_REMOVED event(s), received "
+ getBreakpointEventCount(BP_REMOVED), getBreakpointEventCount(BP_REMOVED) == 1);
clearEventCounters();
// Ensure the breakpoint was effectively removed
IBreakpointDMContext[] breakpoints = getBreakpoints(fGdbControlDmc);
- assertTrue("BreakpointService problem: expected " + 0 + " breakpoint(s), received "
+ assertTrue("BreakpointService problem: expected " + 0 + " breakpoint(s), received "
+ breakpoints.length, breakpoints.length == 0);
}
@@ -1333,7 +1380,7 @@ public class MIBreakpointsTest extends BaseTestCase {
fWait.getMessage().contains(expected));
// Ensure that right BreakpointEvents were received
- assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 0);
// Create a line breakpoint
@@ -1349,15 +1396,15 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
// Ensure the breakpoint list is OK
IBreakpointDMContext[] breakpoints = getBreakpoints(fGdbControlDmc);
- assertTrue("BreakpointService problem: expected " + 1 + " breakpoint(s), received "
+ assertTrue("BreakpointService problem: expected " + 1 + " breakpoint(s), received "
+ breakpoints.length, breakpoints.length == 1);
// Remove the installed breakpoint
@@ -1366,15 +1413,15 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_REMOVED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_REMOVED event(s), received "
+ getBreakpointEventCount(BP_REMOVED), getBreakpointEventCount(BP_REMOVED) == 1);
clearEventCounters();
// Ensure the breakpoint list is OK
breakpoints = getBreakpoints(fGdbControlDmc);
- assertTrue("BreakpointService problem: expected " + 0 + " breakpoint(s), received "
+ assertTrue("BreakpointService problem: expected " + 0 + " breakpoint(s), received "
+ breakpoints.length, breakpoints.length == 0);
// Remove the un-installed breakpoint
@@ -1384,12 +1431,12 @@ public class MIBreakpointsTest extends BaseTestCase {
fWait.getMessage().contains(expected));
// Ensure that right BreakpointEvents were received
- assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 0);
// Ensure the breakpoint list is OK
breakpoints = getBreakpoints(fGdbControlDmc);
- assertTrue("BreakpointService problem: expected " + 0 + " breakpoint(s), received "
+ assertTrue("BreakpointService problem: expected " + 0 + " breakpoint(s), received "
+ breakpoints.length, breakpoints.length == 0);
// Re-install the breakpoint
@@ -1399,9 +1446,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -1412,12 +1459,12 @@ public class MIBreakpointsTest extends BaseTestCase {
fWait.getMessage().contains(expected));
// Ensure that right BreakpointEvents were received
- assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 0);
// Ensure that the existing breakpoint is unaffected
breakpoints = getBreakpoints(fGdbControlDmc);
- assertTrue("BreakpointService problem: expected " + 1 + " breakpoint(s), received "
+ assertTrue("BreakpointService problem: expected " + 1 + " breakpoint(s), received "
+ breakpoints.length, breakpoints.length == 1);
MIBreakpointDMData breakpoint2 = (MIBreakpointDMData) getBreakpoint(breakpoints[0]);
assertTrue("BreakpointService problem: breakpoint mismatch",
@@ -1444,16 +1491,16 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
int expected = i + 1;
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + expected + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + expected + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == expected);
- assertTrue("BreakpointEvent problem: expected " + expected + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + expected + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == expected);
}
clearEventCounters();
// Get the list of breakpoints
IBreakpointDMContext[] breakpoints = getBreakpoints(fGdbControlDmc);
- assertTrue("BreakpointService problem: expected " + 4 + " breakpoint(s), received "
+ assertTrue("BreakpointService problem: expected " + 4 + " breakpoint(s), received "
+ breakpoints.length, breakpoints.length == 4);
// Remove the breakpoint one at a time in the following order: 1, 3, 2, 4
@@ -1471,9 +1518,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
int expected = i + 1;
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + expected + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + expected + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == expected);
- assertTrue("BreakpointEvent problem: expected " + expected + " BREAKPOINT_REMOVED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + expected + " BREAKPOINT_REMOVED event(s), received "
+ getBreakpointEventCount(BP_REMOVED), getBreakpointEventCount(BP_REMOVED) == expected);
// Ensure the breakpoint was effectively removed
@@ -1516,14 +1563,14 @@ public class MIBreakpointsTest extends BaseTestCase {
fWait.getMessage().contains(expected));
// Ensure that no BreakpointEvent was received
- assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 0 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 0);
}
// ------------------------------------------------------------------------
// updateBreakpoint_AddCondition
// Set a breakpoint and then add a condition.
- // Ensure that the new breakpoint reflects the changes
+ // Ensure that the new breakpoint reflects the changes
// ------------------------------------------------------------------------
@Test
public void updateBreakpoint_AddCondition() throws Throwable {
@@ -1540,9 +1587,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -1554,9 +1601,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ getBreakpointEventCount(BP_UPDATED), getBreakpointEventCount(BP_UPDATED) == 1);
clearEventCounters();
@@ -1569,7 +1616,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// ------------------------------------------------------------------------
// updateBreakpoint_RemoveCondition
// Set a conditional breakpoint and then remove the condition.
- // Ensure that the new breakpoint reflects the changes
+ // Ensure that the new breakpoint reflects the changes
// ------------------------------------------------------------------------
@Test
public void updateBreakpoint_RemoveCondition() throws Throwable {
@@ -1587,9 +1634,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -1601,9 +1648,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ getBreakpointEventCount(BP_UPDATED), getBreakpointEventCount(BP_UPDATED) == 1);
clearEventCounters();
@@ -1616,7 +1663,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// ------------------------------------------------------------------------
// updateBreakpoint_ModifyCondition
// Set a conditional breakpoint and then modify the condition.
- // Ensure that the new breakpoint reflects the changes
+ // Ensure that the new breakpoint reflects the changes
// ------------------------------------------------------------------------
@Test
public void updateBreakpoint_ModifyCondition() throws Throwable {
@@ -1634,9 +1681,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -1648,9 +1695,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ getBreakpointEventCount(BP_UPDATED), getBreakpointEventCount(BP_UPDATED) == 1);
clearEventCounters();
@@ -1663,7 +1710,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// ------------------------------------------------------------------------
// updateWatchpoint_AddCondition
// Set a watchpoint and then add a condition.
- // Ensure that the new breakpoint reflects the changes
+ // Ensure that the new breakpoint reflects the changes
// ------------------------------------------------------------------------
@Test
public void updateWatchpoint_AddCondition() throws Throwable {
@@ -1685,9 +1732,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -1699,9 +1746,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ getBreakpointEventCount(BP_UPDATED), getBreakpointEventCount(BP_UPDATED) == 1);
clearEventCounters();
@@ -1714,7 +1761,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// ------------------------------------------------------------------------
// updateWatchpoint_RemoveCondition
// Set a conditional watchpoint and then remove the condition.
- // Ensure that the new breakpoint reflects the changes
+ // Ensure that the new breakpoint reflects the changes
// ------------------------------------------------------------------------
@Test
public void updateWatchpoint_RemoveCondition() throws Throwable {
@@ -1737,9 +1784,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -1751,9 +1798,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ getBreakpointEventCount(BP_UPDATED), getBreakpointEventCount(BP_UPDATED) == 1);
clearEventCounters();
@@ -1766,7 +1813,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// ------------------------------------------------------------------------
// updateWatchpoint_ModifyCondition
// Set a conditional watchpoint and then modify the condition.
- // Ensure that the new breakpoint reflects the changes
+ // Ensure that the new breakpoint reflects the changes
// ------------------------------------------------------------------------
@Test
public void updateWatchpoint_ModifyCondition() throws Throwable {
@@ -1789,9 +1836,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -1803,9 +1850,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ getBreakpointEventCount(BP_UPDATED), getBreakpointEventCount(BP_UPDATED) == 1);
clearEventCounters();
@@ -1818,7 +1865,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// ------------------------------------------------------------------------
// updateBreakpoint_AddCount
// Set a breakpoint and then add an ignore count.
- // Ensure that the new breakpoint reflects the changes
+ // Ensure that the new breakpoint reflects the changes
// ------------------------------------------------------------------------
@Test
public void updateBreakpoint_AddCount() throws Throwable {
@@ -1835,9 +1882,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -1849,9 +1896,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ getBreakpointEventCount(BP_UPDATED), getBreakpointEventCount(BP_UPDATED) == 1);
clearEventCounters();
@@ -1864,7 +1911,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// ------------------------------------------------------------------------
// updateBreakpoint_RemoveCount
// Set a conditional breakpoint and then remove the count..
- // Ensure that the new breakpoint reflects the changes
+ // Ensure that the new breakpoint reflects the changes
// ------------------------------------------------------------------------
@Test
public void updateBreakpoint_RemoveCount() throws Throwable {
@@ -1882,9 +1929,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -1896,9 +1943,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ getBreakpointEventCount(BP_UPDATED), getBreakpointEventCount(BP_UPDATED) == 1);
clearEventCounters();
@@ -1911,7 +1958,7 @@ public class MIBreakpointsTest extends BaseTestCase {
// ------------------------------------------------------------------------
// updateBreakpoint_ModifyCount
// Set a conditional breakpoint and then modify the count.
- // Ensure that the new breakpoint reflects the changes
+ // Ensure that the new breakpoint reflects the changes
// ------------------------------------------------------------------------
@Test
public void updateBreakpoint_ModifyCount() throws Throwable {
@@ -1929,9 +1976,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -1943,9 +1990,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ getBreakpointEventCount(BP_UPDATED), getBreakpointEventCount(BP_UPDATED) == 1);
clearEventCounters();
@@ -1985,9 +2032,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 2 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 2 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 2);
- assertTrue("BreakpointEvent problem: expected " + 2 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 2 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 2);
clearEventCounters();
@@ -2005,9 +2052,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ getBreakpointEventCount(BP_UPDATED), getBreakpointEventCount(BP_UPDATED) == 1);
clearEventCounters();
@@ -2022,9 +2069,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the BreakpointEvent was received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_HIT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_HIT event(s), received "
+ getBreakpointEventCount(BP_HIT), getBreakpointEventCount(BP_HIT) == 1);
assertTrue("BreakpointService problem: breakpoint mismatch",
fBreakpointRef == breakpoint2.getNumber());
@@ -2062,9 +2109,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 2 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 2 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 2);
- assertTrue("BreakpointEvent problem: expected " + 2 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 2 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 2);
clearEventCounters();
@@ -2082,9 +2129,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ getBreakpointEventCount(BP_UPDATED), getBreakpointEventCount(BP_UPDATED) == 1);
clearEventCounters();
@@ -2099,9 +2146,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the BreakpointEvent was received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_HIT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_HIT event(s), received "
+ getBreakpointEventCount(BP_HIT), getBreakpointEventCount(BP_HIT) == 1);
assertTrue("BreakpointService problem: breakpoint mismatch",
fBreakpointRef == breakpoint2.getNumber());
@@ -2115,9 +2162,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ getBreakpointEventCount(BP_UPDATED), getBreakpointEventCount(BP_UPDATED) == 1);
clearEventCounters();
@@ -2132,9 +2179,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the BreakpointEvent was received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_HIT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_HIT event(s), received "
+ getBreakpointEventCount(BP_HIT), getBreakpointEventCount(BP_HIT) == 1);
assertTrue("BreakpointService problem: breakpoint mismatch",
fBreakpointRef == breakpoint1.getNumber());
@@ -2164,9 +2211,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -2176,11 +2223,11 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the correct BreakpointEvent was received
waitForBreakpointEvent();
MIBreakpointDMData breakpoint1 = (MIBreakpointDMData) getBreakpoint(ref);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_HIT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_HIT event(s), received "
+ getBreakpointEventCount(BP_HIT), getBreakpointEventCount(BP_HIT) == 1);
- assertTrue("BreakpointService problem: breakpoint mismatch",
+ assertTrue("BreakpointService problem: breakpoint mismatch",
fBreakpointRef == breakpoint1.getNumber());
clearEventCounters();
}
@@ -2204,9 +2251,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -2216,11 +2263,11 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the correct BreakpointEvent was received
waitForBreakpointEvent();
MIBreakpointDMData breakpoint1 = (MIBreakpointDMData) getBreakpoint(ref);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_HIT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_HIT event(s), received "
+ getBreakpointEventCount(BP_HIT), getBreakpointEventCount(BP_HIT) == 1);
- assertTrue("BreakpointService problem: breakpoint mismatch",
+ assertTrue("BreakpointService problem: breakpoint mismatch",
fBreakpointRef == breakpoint1.getNumber());
clearEventCounters();
}
@@ -2247,9 +2294,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -2259,11 +2306,11 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the correct BreakpointEvent was received
waitForBreakpointEvent();
MIBreakpointDMData breakpoint1 = (MIBreakpointDMData) getBreakpoint(ref);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_HIT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_HIT event(s), received "
+ getBreakpointEventCount(BP_HIT), getBreakpointEventCount(BP_HIT) == 1);
- assertTrue("BreakpointService problem: breakpoint mismatch",
+ assertTrue("BreakpointService problem: breakpoint mismatch",
fBreakpointRef == breakpoint1.getNumber());
clearEventCounters();
@@ -2293,9 +2340,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -2307,9 +2354,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ getBreakpointEventCount(BP_UPDATED), getBreakpointEventCount(BP_UPDATED) == 1);
clearEventCounters();
@@ -2319,11 +2366,11 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the correct BreakpointEvent was received
waitForBreakpointEvent();
MIBreakpointDMData breakpoint1 = (MIBreakpointDMData) getBreakpoint(ref);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_HIT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_HIT event(s), received "
+ getBreakpointEventCount(BP_HIT), getBreakpointEventCount(BP_HIT) == 1);
- assertTrue("BreakpointService problem: breakpoint mismatch",
+ assertTrue("BreakpointService problem: breakpoint mismatch",
fBreakpointRef == breakpoint1.getNumber());
clearEventCounters();
@@ -2354,9 +2401,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -2366,11 +2413,11 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the correct BreakpointEvent was received
waitForBreakpointEvent();
MIBreakpointDMData breakpoint1 = (MIBreakpointDMData) getBreakpoint(ref);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_HIT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_HIT event(s), received "
+ getBreakpointEventCount(BP_HIT), getBreakpointEventCount(BP_HIT) == 1);
- assertTrue("BreakpointService problem: breakpoint mismatch",
+ assertTrue("BreakpointService problem: breakpoint mismatch",
fBreakpointRef == breakpoint1.getNumber());
clearEventCounters();
@@ -2400,9 +2447,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -2414,9 +2461,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ getBreakpointEventCount(BP_UPDATED), getBreakpointEventCount(BP_UPDATED) == 1);
clearEventCounters();
@@ -2426,11 +2473,11 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the correct BreakpointEvent was received
waitForBreakpointEvent();
MIBreakpointDMData breakpoint1 = (MIBreakpointDMData) getBreakpoint(ref);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_HIT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_HIT event(s), received "
+ getBreakpointEventCount(BP_HIT), getBreakpointEventCount(BP_HIT) == 1);
- assertTrue("BreakpointService problem: breakpoint mismatch",
+ assertTrue("BreakpointService problem: breakpoint mismatch",
fBreakpointRef == breakpoint1.getNumber());
clearEventCounters();
@@ -2459,9 +2506,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -2471,11 +2518,11 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the correct BreakpointEvent was received
waitForBreakpointEvent();
MIBreakpointDMData watchpoint1 = (MIBreakpointDMData) getBreakpoint(ref);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " WATCHPOINT_HIT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " WATCHPOINT_HIT event(s), received "
+ getBreakpointEventCount(WP_HIT), getBreakpointEventCount(WP_HIT) == 1);
- assertTrue("BreakpointService problem: watchpoint mismatch",
+ assertTrue("BreakpointService problem: watchpoint mismatch",
fBreakpointRef == watchpoint1.getNumber());
clearEventCounters();
@@ -2504,9 +2551,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -2516,11 +2563,11 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the correct BreakpointEvent was received
waitForBreakpointEvent();
MIBreakpointDMData watchpoint1 = (MIBreakpointDMData) getBreakpoint(ref);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " WATCHPOINT_HIT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " WATCHPOINT_HIT event(s), received "
+ getBreakpointEventCount(WP_HIT), getBreakpointEventCount(WP_HIT) == 1);
- assertTrue("BreakpointService problem: watchpoint mismatch",
+ assertTrue("BreakpointService problem: watchpoint mismatch",
fBreakpointRef == watchpoint1.getNumber());
clearEventCounters();
@@ -2550,9 +2597,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -2562,11 +2609,11 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the correct BreakpointEvent was received
waitForBreakpointEvent();
MIBreakpointDMData watchpoint1 = (MIBreakpointDMData) getBreakpoint(ref);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " WATCHPOINT_HIT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " WATCHPOINT_HIT event(s), received "
+ getBreakpointEventCount(WP_HIT), getBreakpointEventCount(WP_HIT) == 1);
- assertTrue("BreakpointService problem: watchpoint mismatch",
+ assertTrue("BreakpointService problem: watchpoint mismatch",
fBreakpointRef == watchpoint1.getNumber());
clearEventCounters();
@@ -2601,9 +2648,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -2615,9 +2662,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ getBreakpointEventCount(BP_UPDATED), getBreakpointEventCount(BP_UPDATED) == 1);
clearEventCounters();
@@ -2627,11 +2674,11 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the correct BreakpointEvent was received
waitForBreakpointEvent();
MIBreakpointDMData watchpoint1 = (MIBreakpointDMData) getBreakpoint(ref);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " WATCHPOINT_HIT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " WATCHPOINT_HIT event(s), received "
+ getBreakpointEventCount(WP_HIT), getBreakpointEventCount(WP_HIT) == 1);
- assertTrue("BreakpointService problem: watchpoint mismatch",
+ assertTrue("BreakpointService problem: watchpoint mismatch",
fBreakpointRef == watchpoint1.getNumber());
clearEventCounters();
@@ -2666,9 +2713,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -2680,9 +2727,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_UPDATED event(s), received "
+ getBreakpointEventCount(BP_UPDATED), getBreakpointEventCount(BP_UPDATED) == 1);
clearEventCounters();
@@ -2692,11 +2739,11 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the correct BreakpointEvent was received
waitForBreakpointEvent();
MIBreakpointDMData watchpoint1 = (MIBreakpointDMData) getBreakpoint(ref);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " WATCHPOINT_HIT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " WATCHPOINT_HIT event(s), received "
+ getBreakpointEventCount(WP_HIT), getBreakpointEventCount(WP_HIT) == 1);
- assertTrue("BreakpointService problem: watchpoint mismatch",
+ assertTrue("BreakpointService problem: watchpoint mismatch",
fBreakpointRef == watchpoint1.getNumber());
clearEventCounters();
@@ -2732,9 +2779,9 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure that right BreakpointEvents were received
waitForBreakpointEvent();
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT_ADDED event(s), received "
+ getBreakpointEventCount(BP_ADDED), getBreakpointEventCount(BP_ADDED) == 1);
clearEventCounters();
@@ -2744,11 +2791,11 @@ public class MIBreakpointsTest extends BaseTestCase {
// Ensure the correct BreakpointEvent was received
waitForBreakpointEvent();
MIBreakpointDMData watchpoint1 = (MIBreakpointDMData) getBreakpoint(ref);
- assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " BREAKPOINT event(s), received "
+ fBreakpointEventCount, fBreakpointEventCount == 1);
- assertTrue("BreakpointEvent problem: expected " + 1 + " WATCHPOINT_HIT event(s), received "
+ assertTrue("BreakpointEvent problem: expected " + 1 + " WATCHPOINT_HIT event(s), received "
+ getBreakpointEventCount(WP_OOS), getBreakpointEventCount(WP_OOS) == 1);
- assertTrue("BreakpointService problem: watchpoint mismatch",
+ assertTrue("BreakpointService problem: watchpoint mismatch",
fBreakpointRef == watchpoint1.getNumber());
clearEventCounters();