- refactor debugger tests and added one about AddressBreakpoints

debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/AbstractDebugTest.java

@@ -14,11 +14,20 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 
+import junit.extensions.TestSetup;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
 import org.eclipse.cdt.core.model.CModelException;
 import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.debug.core.cdi.CDIException;
+import org.eclipse.cdt.debug.core.cdi.ICDIFunctionLocation;
+import org.eclipse.cdt.debug.core.cdi.ICDILocation;
+import org.eclipse.cdt.debug.core.cdi.ICDILocator;
 import org.eclipse.cdt.debug.core.cdi.ICDISession;
+import org.eclipse.cdt.debug.core.cdi.model.ICDIStackFrame;
 import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
+import org.eclipse.cdt.debug.core.model.ICBreakpointType;
 import org.eclipse.cdt.debug.mi.core.MIException;
 import org.eclipse.cdt.debug.testplugin.CDebugHelper;
 import org.eclipse.cdt.debug.testplugin.CProjectHelper;
@@ -29,11 +38,8 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
-
+import org.eclipse.swt.widgets.Display;
-import junit.extensions.TestSetup;
+import org.eclipse.ui.PlatformUI;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 public abstract class AbstractDebugTest extends TestCase {
 	IWorkspace workspace;
@@ -110,6 +116,26 @@ public abstract class AbstractDebugTest extends TestCase {
 		return "main";
 	}
 
+
+	public static Display getDisplay() {
+		return PlatformUI.getWorkbench().getDisplay();
+	}
+	/**
+	 * Dispatch ui events for at least msec - milliseconds
+	 * 
+	 * @param msec -
+	 *            milliseconds delay
+	 */
+	public static void uimsleep(int msec) {
+		long cur = System.currentTimeMillis();
+		long pass = 0;
+		Display display = getDisplay();
+		while (pass < msec) {
+			if (!display.readAndDispatch())
+				display.sleep();
+			pass = System.currentTimeMillis() - cur;
+		}
+	}
 	/**
 	 * Tears down the test fixture.
 	 * 
@@ -166,21 +192,22 @@ public abstract class AbstractDebugTest extends TestCase {
 	}
 
 	void pause() {
-		try {
+		uimsleep(200);
-			Thread.sleep(100);
-		} catch (InterruptedException e) {
-		}
 	}
 
+	public ICDILocator getCurrentLocator() throws CDIException {
+		return getCurrentFrame().getLocator();
+	}
+
+	public ICDIStackFrame getCurrentFrame() throws CDIException {
+		return currentTarget.getCurrentThread().getStackFrames()[0];
+	}
+	
 	void waitSuspend(ICDITarget currentTarget) {
 		int loop;
 		loop = 0;
 		while ((currentTarget.isSuspended() == false) && (currentTarget.isTerminated() == false) && (loop < 20)) {
-			try {
+			uimsleep(500);
-				Thread.sleep(500);
-			} catch (InterruptedException e) {
-				// Ignore
-			}
 			loop++;
 		}
 		assertFalse("Target should be suspended, but it is terminated " + currentTarget.isTerminated(), currentTarget
@@ -188,6 +215,16 @@ public abstract class AbstractDebugTest extends TestCase {
 		assertTrue("Target should be suspended but it is not", currentTarget.isSuspended());
 
 	}
+	
+	public void resumeCurrentTarget() throws CDIException{
+		currentTarget.resume(false);
+	}
+
+	void setBreakOnMain() throws CDIException {
+		ICDILocation location = null;
+		location = currentTarget.createFunctionLocation("", "main"); //$NON-NLS-1$	
+		currentTarget.setFunctionBreakpoint(ICBreakpointType.TEMPORARY, (ICDIFunctionLocation) location, null, false);
+	}
 
 	@Override
 	protected void tearDown() throws Exception {

debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/BreakpointTests.java

@@ -13,12 +13,15 @@ package org.eclipse.cdt.debug.core.tests;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
+import java.math.BigInteger;
+
 import junit.extensions.TestSetup;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 import org.eclipse.cdt.core.model.ICProject;
 import org.eclipse.cdt.debug.core.cdi.CDIException;
+import org.eclipse.cdt.debug.core.cdi.ICDIAddressLocation;
 import org.eclipse.cdt.debug.core.cdi.ICDICondition;
 import org.eclipse.cdt.debug.core.cdi.ICDIFunctionLocation;
 import org.eclipse.cdt.debug.core.cdi.ICDILineLocation;
@@ -38,6 +41,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.viewers.deferred.SetModel;
 
 /**
  * @author Peter Graves
@@ -136,26 +140,17 @@ public class BreakpointTests extends AbstractDebugTest {
 		 * Resume the target, this should cause it to run till it hits the
 		 * breakpoint
 		 */
-		targets[0].resume();
+		resumeCurrentTarget();
 		/**
 		 * Give the process up to 10 seconds to become either terminated or
 		 * suspended. It sould hit the breakponint almost immediatly so we
 		 * should only sleep for max 100 ms
 		 */
-		for (int x = 0; x < 100; x++) {
+		waitSuspend(cdiTarget);
-			if (targets[0].isTerminated() || targets[0].isSuspended())
+		ICDILocator locator = getCurrentLocator();
-				break;
-			Thread.sleep(100);
-		}
-		assertTrue(targets[0].isSuspended());
-		ICDILocator locator = targets[0].getCurrentThread().getStackFrames()[0].getLocator();
 		assertTrue(locator.getLineNumber() == 6);
 		assertTrue(locator.getFunction().equals("func1")); //$NON-NLS-1$
 		assertTrue(locator.getFile().endsWith("main.c")); //$NON-NLS-1$
-
-
-
-
 	}
 
 	/***************************************************************************
@@ -259,7 +254,7 @@ public class BreakpointTests extends AbstractDebugTest {
 		}
 		assertTrue("Suspended: " + targets[0].isSuspended() + " Termiunated: " + targets[0].isTerminated(), targets[0]
 				.isSuspended());
-		ICDILocator locator = targets[0].getCurrentThread().getStackFrames()[0].getLocator();
+		ICDILocator locator = getCurrentLocator();
 		assertTrue(locator.getLineNumber() == 7);
 		assertTrue(locator.getFunction().equals("func1"));
 		assertTrue(locator.getFile().endsWith("main.c"));
@@ -499,6 +494,39 @@ public class BreakpointTests extends AbstractDebugTest {
 	public void testCondBreak() throws CoreException, MIException, IOException, CDIException, InterruptedException {
 		boolean caught = false;
 		ICDITarget cdiTarget = currentTarget;
+		ICDICondition cond;
+
+		/***********************************************************************
+		 * Create a break point on a line number with a condition and make sure
+		 * it does not suspend execution of the application until the condition
+		 * is true
+		 **********************************************************************/
+		cdiTarget.deleteAllBreakpoints();
+		pause();
+		ICDILineLocation lineLocation = cdiTarget.createLineLocation(null, 23);
+		assertNotNull(lineLocation);
+		cond = cdiTarget.createCondition(0, "a>10");
+		cdiTarget.setLineBreakpoint(0, lineLocation, cond, false);
+		pause();
+		resumeCurrentTarget();
+		/**
+		 * Give the process up to 10 seconds to become either terminated or
+		 * suspended. It sould hit the breakponint almost immediatly so we
+		 * should only sleep for max 100 ms
+		 */
+		waitSuspend(cdiTarget);
+		ICDIStackFrame frame = getCurrentFrame(); 
+		ICDILocator locator = getCurrentLocator();
+		assertTrue(locator.getLineNumber() == 23);
+		assertTrue(locator.getFunction().equals("main"));
+		assertTrue(locator.getFile().endsWith("main.c"));
+		/* Get the value of a and and make sure it is 11 */
+		assertTrue(targets[0].evaluateExpressionToString(frame, "a"), targets[0].evaluateExpressionToString(frame, "a").equals("11"));
+
+	}
+	public void testCondBreak2() throws CoreException, MIException, IOException, CDIException, InterruptedException {
+		boolean caught = false;
+		ICDITarget cdiTarget = currentTarget;
 
 		/***********************************************************************
 		 * Create a break point on a generic function with an empty condition
@@ -528,51 +556,49 @@ public class BreakpointTests extends AbstractDebugTest {
 		} catch (CDIException e) {
 			caught = true;
 		}
-		assertTrue(caught);
+		assertTrue("Setting wrong condition should fail",caught);
+	}
+	
+	public void testHitCond() throws CoreException, MIException, IOException, CDIException, InterruptedException {
+		// this currently fails sometimes - after set bad breakpoint it does not hit any
+		setBreakOnMain();
+		testCondBreak2();
+		resumeCurrentTarget();
+		waitSuspend(currentTarget);
+	}
+	/***************************************************************************
+	 * A test to make sure setting address breakpoints works as
+	 * expected.
+	 */
+	public void testAddressBreak() throws CoreException, MIException, IOException, CDIException, InterruptedException {
+		
+		
+		ICDIAddressLocation location;
+		boolean caught = false;
 
+		setBreakOnMain();
+		currentTarget.resume(false);
+		waitSuspend(currentTarget);
+		currentTarget.stepOver(1);
+		pause();
+		BigInteger address = getCurrentLocator().getAddress();
 		/***********************************************************************
-		 * Create a break point on a line number with a condition and make sure
+		 * Create a break point on first instruction
-		 * it does not suspend execution of the application until the condition
-		 * is true
 		 **********************************************************************/
-		cdiTarget.deleteAllBreakpoints();
+
-		ICDILineLocation lineLocation = cdiTarget.createLineLocation(null, 23);
+		location = currentTarget.createAddressLocation(address); //$NON-NLS-1$
 		assertNotNull(location);
-		cond = cdiTarget.createCondition(0, "a>10");
+		currentTarget.setAddressBreakpoint(0, location, null, false);
-
+		
-		cdiTarget.setLineBreakpoint(0, lineLocation, cond, false);
+		// restart
-		targets = session.getTargets();
+		currentTarget.restart();
-		/*
+		pause();
-		 * We better only have one target connected to this session or something
+		waitSuspend(currentTarget);
-		 * is not right...
+		
-		 */
+		ICDILocator locator = getCurrentLocator();
-		assertTrue(targets.length == 1);
+		assertTrue(locator.getLineNumber() == 18);
-		/*
+		assertTrue(locator.getFunction().equals("main")); //$NON-NLS-1$
-		 * Resume the target, this should cause it to run till it hits the
+		assertTrue(locator.getFile().endsWith("main.c")); //$NON-NLS-1$
-		 * breakpoint
-		 */
-		targets[0].resume();
-		/**
-		 * Give the process up to 10 seconds to become either terminated or
-		 * suspended. It sould hit the breakponint almost immediatly so we
-		 * should only sleep for max 100 ms
-		 */
-		for (int x = 0; x < 100; x++) {
-			if (targets[0].isSuspended() || targets[0].isTerminated())
-				break;
-			Thread.sleep(100);
-		}
-		assertTrue("Suspended: " + targets[0].isSuspended() + " Termiunated: " + targets[0].isTerminated(), targets[0]
-				.isSuspended());
-		ICDIStackFrame frame = targets[0].getCurrentThread().getStackFrames()[0]; 
-		ICDILocator locator = frame.getLocator();
-		assertTrue(locator.getLineNumber() == 23);
-		assertTrue(locator.getFunction().equals("main"));
-		assertTrue(locator.getFile().endsWith("main.c"));
-		/* Get the value of a and and make sure it is 11 */
-		assertTrue(targets[0].evaluateExpressionToString(frame, "a"), targets[0].evaluateExpressionToString(frame, "a").equals("11"));
-
 	}
 
-
 }

debug/org.eclipse.cdt.debug.ui.tests/core/org/eclipse/cdt/debug/core/tests/EventBreakpointTests.java

@@ -52,12 +52,6 @@ public class EventBreakpointTests extends AbstractDebugTest {
 		pause();
 	}
 
-	void setBreakOnMain() throws CDIException {
-		ICDILocation location = null;
-		location = currentTarget.createFunctionLocation("", "main"); //$NON-NLS-1$	
-		currentTarget.setFunctionBreakpoint(ICBreakpointType.TEMPORARY, (ICDIFunctionLocation) location, null, false);
-
-	}
 
 	public void testCatch() throws CModelException, IOException, MIException, CDIException {
 		eventbreakpoints(EventBreakpoint.CATCH, "");
@@ -74,7 +68,7 @@ public class EventBreakpointTests extends AbstractDebugTest {
 		setBreakOnMain();
 		currentTarget.restart();
 		waitSuspend(currentTarget);
-		ICDILocator locator = currentTarget.getThreads()[0].getStackFrames()[0].getLocator();
+		ICDILocator locator = getCurrentLocator();
 		assertEquals("Debug should be stopped in function 'main' but it is stopped in: " + locator.getFunction(),
 				"main", locator.getFunction());