[nobug] diagnostics
diff --git a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java index 33d077d..1ec896e 100644 --- a/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java +++ b/tests/org.eclipse.jst.jsp.core.tests/src/org/eclipse/jst/jsp/core/tests/translation/JSPJavaTranslatorCoreTest.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2012 IBM Corporation and others. + * Copyright (c) 2006, 2013 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 @@ -725,7 +725,7 @@ translator.reset(structuredModel.getDocument(), new NullProgressMonitor()); translator.translate(); - assertTrue("specified type did not survive translation", translator.getTranslation().indexOf(typeName) >= 0); + assertTrue("specified type did not survive translation:\n"+translator.getTranslation().toString(), translator.getTranslation().indexOf(typeName) >= 0); IJSPProblem[] translationProblems = (IJSPProblem[]) translator.getTranslationProblems().toArray(new IJSPProblem[0]); for (int i = 0; i < translationProblems.length; i++) { assertTrue(translationProblems[i].getID() != IProblem.UndefinedType);
diff --git a/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/format/FormattingTests.java b/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/format/FormattingTests.java index d0f40e3..9a247ab 100644 --- a/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/format/FormattingTests.java +++ b/tests/org.eclipse.wst.jsdt.web.ui.tests/src/org/eclipse/wst/jsdt/web/ui/tests/format/FormattingTests.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2012 IBM Corporation and others. + * Copyright (c) 2010, 2013 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 @@ -397,8 +397,11 @@ */ public void tearDown() throws Exception { //delete test projects - fProject.delete(true, new NullProgressMonitor()); - + try { + fProject.delete(true, new NullProgressMonitor()); + } catch (CoreException e) { + // problem should not cause test error + } //reset non-interactive if (previousWTPAutoTestNonInteractivePropValue != null) { System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, previousWTPAutoTestNonInteractivePropValue);
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java index 9923260..63bd313 100644 --- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java +++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/model/TestStructuredModel.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2005, 2012 IBM Corporation and others. + * Copyright (c) 2005, 2013 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 @@ -317,7 +317,7 @@ public void testGetModelResource() throws IOException, CoreException { IStructuredModel model = getTestModel(); IResource resource = (IResource) model.getAdapter(IResource.class); - assertNotNull("A resource wasn't obtained from the model", resource); + assertNotNull("A resource wasn't obtained from the model:"+resource, resource); assertEquals("The resource doesn't correspond to the model's base location", new Path("/" + fProjectName + "/files/simple.xml"), resource.getFullPath()); } @@ -330,7 +330,7 @@ public void testGetNodeResource() throws IOException, CoreException { IStructuredModel model = getTestModel(); IndexedRegion region = model.getIndexedRegion(0); - assertTrue("The region is not adaptable", region instanceof IAdaptable); + assertTrue("The region is not adaptable:"+region.getClass().getName(), region instanceof IAdaptable); IResource resource = (IResource) ((IAdaptable) region).getAdapter(IResource.class); assertNotNull("A resource wasn't obtained from the model", resource); assertEquals("The resource doesn't correspond to the model's base location", new Path("/" + fProjectName + "/files/simple.xml"), resource.getFullPath());
diff --git a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLCodeFoldingTest.java b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLCodeFoldingTest.java index 7a8e862..8af2ec8 100644 --- a/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLCodeFoldingTest.java +++ b/tests/org.eclipse.wst.xml.ui.tests/src/org/eclipse/wst/xml/ui/tests/XMLCodeFoldingTest.java
@@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009, 2012 IBM Corporation and others. + * Copyright (c) 2009, 2013 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 @@ -25,6 +25,7 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.text.BadLocationException; @@ -453,8 +454,11 @@ if (previousWTPAutoTestNonInteractivePropValue != null) { System.setProperty(WTP_AUTOTEST_NONINTERACTIVE, previousWTPAutoTestNonInteractivePropValue); } - - fProject.delete(true, new NullProgressMonitor()); + try { + fProject.delete(true, new NullProgressMonitor()); + } catch (CoreException e) { + // shouldn't cause an error report + } } /**