Bug 413705 - 3 failures from MoveCompilationUnitTests
Change-Id: I3c69b3dd2b1479e51ff5f0e4fd5f710a31dc879b
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
index 43bf121..9be1d30 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
@@ -1435,6 +1435,7 @@
*/
protected IJavaLineBreakpoint createLineBreakpoint(int lineNumber, String typeName) throws Exception {
IType type = getType(typeName);
+ assertNotNull("Could not find the requested IType: "+typeName, type);
return createLineBreakpoint(type, lineNumber);
}
@@ -1472,6 +1473,7 @@
*/
protected IJavaLineBreakpoint createLineBreakpoint(int lineNumber, String packageName, String cuName, String typeName) throws Exception {
IType type = getType(packageName, cuName, typeName);
+ assertNotNull("Could not find the requested IType: "+typeName, type);
return createLineBreakpoint(type, lineNumber);
}
@@ -1484,28 +1486,27 @@
* @throws Exception
*/
protected IJavaLineBreakpoint createLineBreakpoint(IType type, int lineNumber) throws Exception {
+ assertNotNull("You cannot create a line breakpoint for a null IType", type);
IMember member = null;
- if (type != null) {
- IJavaElement sourceElement = null;
- String source = null;
- if (type.isBinary()) {
- IClassFile classFile = type.getClassFile();
- source = classFile.getSource();
- sourceElement = classFile;
+ IJavaElement sourceElement = null;
+ String source = null;
+ if (type.isBinary()) {
+ IClassFile classFile = type.getClassFile();
+ source = classFile.getSource();
+ sourceElement = classFile;
+ } else {
+ ICompilationUnit unit = type.getCompilationUnit();
+ source = unit.getSource();
+ sourceElement = unit;
+ }
+ // translate line number to offset
+ if (source != null) {
+ Document document = new Document(source);
+ IRegion region = document.getLineInformation(lineNumber);
+ if (sourceElement instanceof ICompilationUnit) {
+ member = (IMember) ((ICompilationUnit)sourceElement).getElementAt(region.getOffset());
} else {
- ICompilationUnit unit = type.getCompilationUnit();
- source = unit.getSource();
- sourceElement = unit;
- }
- // translate line number to offset
- if (source != null) {
- Document document = new Document(source);
- IRegion region = document.getLineInformation(lineNumber);
- if (sourceElement instanceof ICompilationUnit) {
- member = (IMember) ((ICompilationUnit)sourceElement).getElementAt(region.getOffset());
- } else {
- member = (IMember) ((IClassFile)sourceElement).getElementAt(region.getOffset());
- }
+ member = (IMember) ((IClassFile)sourceElement).getElementAt(region.getOffset());
}
}
Map<String, Object> map = getExtraBreakpointAttributes(member);
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/refactoring/AbstractRefactoringDebugTest.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/refactoring/AbstractRefactoringDebugTest.java
index 55bf8fa..c7b8be3 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/refactoring/AbstractRefactoringDebugTest.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/refactoring/AbstractRefactoringDebugTest.java
@@ -13,10 +13,8 @@
import org.eclipse.core.internal.resources.ResourceException;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
@@ -93,17 +91,13 @@
* @throws CoreException
*/
protected void cleanTestFiles() throws CoreException {
- IWorkspaceRunnable cleaner = new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- waitUntilIndexesReady();
- try {
- doClean();
- } catch (Exception e) {
- throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.jdt.debug.tests", 0, "Error", e));
- }
- }
- };
- ResourcesPlugin.getWorkspace().run(cleaner, null);
+ waitUntilIndexesReady();
+ try {
+ doClean();
+ waitForBuild();
+ } catch (Exception e) {
+ throw new CoreException(new Status(IStatus.ERROR, "org.eclipse.jdt.debug.tests", 0, "Error", e));
+ }
}
/**
