Remove obsolete fail statements in org.eclipse.ui.tests

Several test methods in org.eclipse.ui.tests catch exceptions to then
simply fail with the message of that same exception. With this change,
the test methods are adapted to directly throw those exceptions so
simplify the test implementation and remove obsolete fail statements.

Author: HeikoKlare

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/adaptable/AdaptableDecoratorTestCase.java

@@ -15,7 +15,6 @@
 package org.eclipse.ui.tests.adaptable;
 
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.io.ByteArrayInputStream;
 
@@ -89,11 +88,7 @@ private DecoratorManager getDecoratorManager() {
 	@After
 	public void doTearDown() throws Exception {
 		if (testProject != null) {
-			try {
-				testProject.delete(true, null);
-			} catch (CoreException e) {
-				fail(e.toString());
-			}
+			testProject.delete(true, null);
 			testProject = null;
 			testFolder = null;
 			testFile = null;

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IActionBarsTest.java

@@ -18,10 +18,11 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
+import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.NotEnabledException;
 import org.eclipse.core.commands.NotHandledException;
+import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IStatusLineManager;
@@ -210,7 +211,8 @@ public void testSetGlobalActionHandler() throws Throwable {
 			assertTrue(quit.hasRun);
 		}
 
-	private void runMatchingCommand(IWorkbenchWindow window, String actionId) {
+		private void runMatchingCommand(IWorkbenchWindow window, String actionId)
+				throws ExecutionException, NotDefinedException {
 		IHandlerService hs = window.getService(IHandlerService.class);
 		IActionCommandMappingService ms = window.getService(IActionCommandMappingService.class);
 		String commandId = ms.getCommandId(actionId);
@@ -220,8 +222,6 @@ private void runMatchingCommand(IWorkbenchWindow window, String actionId) {
 		} catch (NotHandledException | NotEnabledException e) {
 			// this is not a failure, just a condition to be checked by
 			// the test
-		} catch (Exception e) {
-			fail("Failed to run " + commandId);
 		}
 	}
 }

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkbenchPageTest.java

@@ -1283,11 +1283,7 @@ public void testGetViews() throws Throwable {
 	@Test
 	public void testHideViewWithPart() throws Throwable {
 		// test that nothing bad happens with a null parameter
-		try {
-			fActivePage.hideView((IViewPart) null);
-		} catch (RuntimeException e) {
-			fail(e.getMessage());
-		}
+		fActivePage.hideView((IViewPart) null);
 
 		IViewPart view = fActivePage.showView(MockViewPart.ID3);
 
@@ -1299,11 +1295,7 @@ public void testHideViewWithPart() throws Throwable {
 	@Test
 	public void testHideViewWithReference() throws Throwable {
 		// test that nothing bad happens with a null parameter
-		try {
-			fActivePage.hideView((IViewReference) null);
-		} catch (RuntimeException e) {
-			fail(e.getMessage());
-		}
+		fActivePage.hideView((IViewReference) null);
 
 		IViewPart view = fActivePage.showView(MockViewPart.ID4);
 		IViewReference ref = fActivePage.findViewReference(MockViewPart.ID4);
@@ -2133,22 +2125,18 @@ public void testView_VISIBLE3() throws PartInitException {
 	}
 
 	/**
-	 * Test opening a perspective with placeholders for multi instance views.
-	 * The placeholders are added at top level (not in any folder).
+	 * Test opening a perspective with placeholders for multi instance views. The
+	 * placeholders are added at top level (not in any folder).
+	 *
+	 * @throws WorkbenchException
 	 *
 	 * @since 3.1
 	 */
 	@Test
 	@Ignore
-	public void testOpenPerspectiveWithMultiViewPlaceholdersAtTopLevel() {
+	public void testOpenPerspectiveWithMultiViewPlaceholdersAtTopLevel() throws WorkbenchException {
 
-		try {
-			fWin.getWorkbench().showPerspective(
-					PerspectiveWithMultiViewPlaceholdersAtTopLevel.PERSP_ID,
-					fWin);
-		} catch (WorkbenchException e) {
-			fail("Unexpected WorkbenchException: " + e);
-		}
+		fWin.getWorkbench().showPerspective(PerspectiveWithMultiViewPlaceholdersAtTopLevel.PERSP_ID, fWin);
 
 //		ArrayList partIds = facade.getPerspectivePartIds(fActivePage, null);
 		// FIXME: No implementation for facade.getPerspectivePartIds()
@@ -2160,26 +2148,20 @@ public void testOpenPerspectiveWithMultiViewPlaceholdersAtTopLevel() {
 	}
 
 	/**
-	 * Test opening a perspective with placeholders for multi instance views.
-	 * The placeholders are added in a placeholder folder. This is a regression
-	 * test for bug 72383 [Perspectives] Placeholder folder error with multiple
-	 * instance views
+	 * Test opening a perspective with placeholders for multi instance views. The
+	 * placeholders are added in a placeholder folder. This is a regression test for
+	 * bug 72383 [Perspectives] Placeholder folder error with multiple instance
+	 * views
+	 *
+	 * @throws WorkbenchException
 	 *
 	 * @since 3.1
 	 */
 	@Test
 	@Ignore
-	public void testOpenPerspectiveWithMultiViewPlaceholdersInPlaceholderFolder() {
+	public void testOpenPerspectiveWithMultiViewPlaceholdersInPlaceholderFolder() throws WorkbenchException {
 
-		try {
-			fWin
-					.getWorkbench()
-					.showPerspective(
-							PerspectiveWithMultiViewPlaceholdersInPlaceholderFolder.PERSP_ID,
-							fWin);
-		} catch (WorkbenchException e) {
-			fail("Unexpected WorkbenchException: " + e);
-		}
+		fWin.getWorkbench().showPerspective(PerspectiveWithMultiViewPlaceholdersInPlaceholderFolder.PERSP_ID, fWin);
 
 //		ArrayList partIds = facade.getPerspectivePartIds(fActivePage,"placeholderFolder");
 
@@ -2192,23 +2174,17 @@ public void testOpenPerspectiveWithMultiViewPlaceholdersInPlaceholderFolder() {
 	}
 
 	/**
-	 * Test opening a perspective with placeholders for multi instance views.
-	 * The placeholders are added at top level (not in any folder).
+	 * Test opening a perspective with placeholders for multi instance views. The
+	 * placeholders are added at top level (not in any folder).
+	 *
+	 * @throws WorkbenchException
 	 *
 	 * @since 3.1
 	 */
 	@Test
 	@Ignore
-	public void testOpenPerspectiveWithMultiViewPlaceholdersInFolder() {
-		try {
-			fWin
-					.getWorkbench()
-					.showPerspective(
-							PerspectiveWithMultiViewPlaceholdersInFolder.PERSP_ID,
-							fWin);
-		} catch (WorkbenchException e) {
-			fail("Unexpected WorkbenchException: " + e);
-		}
+	public void testOpenPerspectiveWithMultiViewPlaceholdersInFolder() throws WorkbenchException {
+		fWin.getWorkbench().showPerspective(PerspectiveWithMultiViewPlaceholdersInFolder.PERSP_ID, fWin);
 
 //		ArrayList partIds = facade.getPerspectivePartIds(fActivePage,"folder");
 
@@ -2570,20 +2546,19 @@ public void testCloseAllPerspectivesDoesNotPromptBug272070()
 	 * Tests that relative view is correctly shown if visible parameter specified.
 	 * See bug 538199 - perspectiveExtension: visible="false" not honored when
 	 * relative view does not exist
+	 *
+	 * @throws WorkbenchException
 	 */
 	@Test
-	public void testRelativeViewVisibility() {
+	public void testRelativeViewVisibility() throws WorkbenchException {
 		processEvents();
 
 		fActivePage.closeAllPerspectives(true, false);
 		IPerspectiveRegistry reg = fWorkbench.getPerspectiveRegistry();
 		IPerspectiveDescriptor testPerspective = reg.findPerspectiveWithId(PerspectiveViewsBug538199.ID);
 		fActivePage.setPerspective(testPerspective);
-		try {
-			fWin.getWorkbench().showPerspective(PerspectiveViewsBug538199.ID, fWin);
-		} catch (WorkbenchException e) {
-			fail("Unexpected WorkbenchException: " + e);
-		}
+		fWin.getWorkbench().showPerspective(PerspectiveViewsBug538199.ID, fWin);
+
 		processEvents();
 		IWorkbenchPage activePage = fWin.getActivePage();
 
@@ -2605,12 +2580,14 @@ public void testRelativeViewVisibility() {
 	}
 
 	/**
-	 * Regression test for Bug 76285 [Presentations] Folder tab does not
-	 * indicate current view. Tests that, when switching between perspectives,
-	 * the remembered old part correctly handles multi-view instances.
+	 * Regression test for Bug 76285 [Presentations] Folder tab does not indicate
+	 * current view. Tests that, when switching between perspectives, the remembered
+	 * old part correctly handles multi-view instances.
+	 *
+	 * @throws PartInitException
 	 */
 	@Test
-	public void testBug76285() {
+	public void testBug76285() throws PartInitException {
 		IWorkbenchPage page = fActivePage;
 		IPerspectiveDescriptor originalPersp = page.getPerspective();
 		IPerspectiveDescriptor resourcePersp = PlatformUI.getWorkbench()
@@ -2622,12 +2599,7 @@ public void testBug76285() {
 		int n = 5;
 		IViewPart[] views = new IViewPart[n];
 		for (int i = 0; i < n; ++i) {
-			try {
-				views[i] = page.showView(MockViewPart.IDMULT, Integer
-						.toString(i), IWorkbenchPage.VIEW_CREATE);
-			} catch (PartInitException e) {
-				fail(e.getMessage());
-			}
+			views[i] = page.showView(MockViewPart.IDMULT, Integer.toString(i), IWorkbenchPage.VIEW_CREATE);
 		}
 		assertEquals(5, page.getViews().length);
 		for (int i = 0; i < n; ++i) {

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/api/IWorkingSetTest.java

@@ -306,15 +306,10 @@ public void testBadFactory_Restore() {
 		fWorkingSet.saveState(m);
 		BadElementFactory.shouldFailOnCreateElement = true;
 		IWorkingSet copy = new WorkingSet(fWorkingSet.getName(), fWorkingSet.getId(), m) {};
-		try {
-			assertFalse(BadElementFactory.elementCreationAttemptedWhileShouldFail);
-			IAdaptable [] elements = copy.getElements();
-			assertTrue(BadElementFactory.elementCreationAttemptedWhileShouldFail);
-			assertEquals("Element array should be empty", 0, elements.length);
-		}
-		catch (RuntimeException e) {
-			fail("Error getting elements for broken factory", e);
-		}
+		assertFalse(BadElementFactory.elementCreationAttemptedWhileShouldFail);
+		IAdaptable[] elements = copy.getElements();
+		assertTrue(BadElementFactory.elementCreationAttemptedWhileShouldFail);
+		assertEquals("Element array should be empty", 0, elements.length);
 	}
 
 	/**
@@ -328,12 +323,8 @@ public void testBadFactory_Save() {
 		IMemento m = XMLMemento.createWriteRoot("ws");
 		BadElementFactory.BadElementInstance.shouldSaveFail = true;
 		assertFalse(BadElementFactory.BadElementInstance.saveAttemptedWhileShouldFail);
-		try {
-			fWorkingSet.saveState(m);
-			assertTrue(BadElementFactory.BadElementInstance.saveAttemptedWhileShouldFail);
-		} catch (RuntimeException e) {
-			fail("Error saving elements for broken persistable", e);
-		}
+		fWorkingSet.saveState(m);
+		assertTrue(BadElementFactory.BadElementInstance.saveAttemptedWhileShouldFail);
 	}
 
 	public static class Foo implements IAdaptable {