Bug 369409 - LiteralTests17 fail (added exception handling)
diff --git a/org.eclipse.jdt.debug.tests/JDT Debug Test Suite.launch b/org.eclipse.jdt.debug.tests/JDT Debug Test Suite.launch
index 5750181..f3777b5 100644
--- a/org.eclipse.jdt.debug.tests/JDT Debug Test Suite.launch
+++ b/org.eclipse.jdt.debug.tests/JDT Debug Test Suite.launch
@@ -23,7 +23,7 @@
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jdt.debug.tests.AutomatedSuite"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jdt.debug.tests"/>
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 9db86c4..ec52e6e 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
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2012 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -312,7 +312,7 @@
catch (CoreException ce) {
//ignore
}
- fail(e.getMessage());
+ handleProjectCreationException(e, ONE_FOUR_PROJECT_NAME);
}
}
@@ -343,7 +343,7 @@
catch (CoreException ce) {
//ignore
}
- fail(e.getMessage());
+ handleProjectCreationException(e, ONE_FIVE_PROJECT_NAME);
}
}
@@ -373,7 +373,7 @@
catch (CoreException ce) {
//ignore
}
- fail(e.getMessage());
+ handleProjectCreationException(e, ONE_SEVEN_PROJECT_NAME);
}
}
@@ -402,7 +402,7 @@
catch (CoreException ce) {
//ignore
}
- fail(e.getMessage());
+ handleProjectCreationException(e, BOUND_JRE_PROJECT_NAME);
}
}
@@ -435,7 +435,7 @@
catch (CoreException ce) {
//ignore
}
- fail(e.getMessage());
+ handleProjectCreationException(e,BOUND_EE_PROJECT_NAME);
}
}
@@ -468,10 +468,19 @@
catch (CoreException ce) {
//ignore
}
- fail(e.getMessage());
+ handleProjectCreationException(e, MULTI_OUTPUT_PROJECT_NAME);
}
}
+ void handleProjectCreationException(Exception e, String pname) {
+ String msg = e.getMessage();
+ e.printStackTrace();
+ if(msg == null) {
+ msg = "could not acquire message for exception class: "+e.getClass();
+ }
+ fail("Failed to create the '"+pname+"' test project: "+msg);
+ }
+
/**
* Sets the last relevant event set
*
