Replace fail() calls in org.eclipse.ui.tests

This replaces JUnit fail() calls in org.eclipse.ui.tests by various
means:
- Replace exception catching and fail() statements with assertThrows()
- Remove exception catching and fail() statements by letting the test
methods simply throw the exception

Author: HeikoKlare

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

@@ -21,7 +21,6 @@
 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 java.util.Arrays;
 import java.util.List;
@@ -89,13 +88,13 @@ public void setUp() {
 	}
 
 	@After
-	public void tearDown() {
+	public void tearDown() throws CoreException {
 		if (proj != null) {
 			try {
 				FileUtil.deleteProject(proj);
 			} catch (CoreException e) {
 				TestPlugin.getDefault().getLog().log(e.getStatus());
-				fail();
+				throw e;
 			}
 		}
 	}
@@ -360,11 +359,7 @@ public void testRemovePropertyListener() {
 
 		// removing the listener that is not registered yet should have no
 		// effect
-		try {
-			fReg.removePropertyListener(listener);
-		} catch (Throwable e) {
-			fail();
-		}
+		fReg.removePropertyListener(listener);
 	}
 
 	/**

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

@@ -13,6 +13,8 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.api;
 
+import static org.junit.Assert.assertThrows;
+
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.jface.action.StatusLineManager;
 import org.eclipse.swt.custom.CLabel;
@@ -175,13 +177,10 @@ public void testOpenPage2() throws Throwable {
 		}
 
 		// test openPage() fails
-		try {
-			page = fWin.openPage("*************", ResourcesPlugin.getWorkspace());
-			fail();
-		} catch (WorkbenchException ex) {
-		}
-
-		page.close();
+		assertThrows(WorkbenchException.class, () -> {
+			IWorkbenchPage p = fWin.openPage("*************", ResourcesPlugin.getWorkspace());
+			p.close();
+		});
 	}
 
 	@Test

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/AcceleratorConfigurationsExtensionDynamicTest.java

@@ -13,6 +13,8 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.dynamicplugins;
 
+import static org.junit.Assert.assertThrows;
+
 import org.eclipse.core.commands.common.NamedHandleObject;
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.ui.internal.registry.IWorkbenchRegistryConstants;
@@ -72,40 +74,27 @@ protected final String getInstallLocation() {
 
 	/**
 	 * Tests whether the items defined in the extension point can be added and
-	 * removed dynamically. It tests that the data doesn't exist, and then loads
-	 * the extension. It tests that the data then exists, and unloads the
-	 * extension. It tests that the data then doesn't exist.
+	 * removed dynamically. It tests that the data doesn't exist, and then loads the
+	 * extension. It tests that the data then exists, and unloads the extension. It
+	 * tests that the data then doesn't exist.
+	 *
+	 * @throws NotDefinedException
 	 */
 	@Test
-	public final void testAcceleratorConfigurations() {
+	public final void testAcceleratorConfigurations() throws NotDefinedException {
 		final IBindingService service = getWorkbench().getAdapter(IBindingService.class);
-		NamedHandleObject namedHandleObject;
 
-		namedHandleObject = service.getScheme("monkey");
-		try {
-			namedHandleObject.getName();
-			fail();
-		} catch (final NotDefinedException e) {
-			assertTrue(true);
-		}
+		NamedHandleObject namedHandleObject1 = service.getScheme("monkey");
+		assertThrows(NotDefinedException.class, () -> namedHandleObject1.getName());
 
 		getBundle();
 
-		namedHandleObject = service.getScheme("monkey");
-		try {
-			assertTrue("Monkey".equals(namedHandleObject.getName()));
-		} catch (final NotDefinedException e) {
-			fail();
-		}
+		NamedHandleObject namedHandleObject2 = service.getScheme("monkey");
+		assertTrue("Monkey".equals(namedHandleObject2.getName()));
 
 		removeBundle();
 
-		namedHandleObject = service.getScheme("monkey");
-		try {
-			namedHandleObject.getName();
-			fail();
-		} catch (final NotDefinedException e) {
-			assertTrue(true);
-		}
+		NamedHandleObject namedHandleObject3 = service.getScheme("monkey");
+		assertThrows(NotDefinedException.class, () -> namedHandleObject3.getName());
 	}
 }

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/AcceleratorScopesExtensionDynamicTest.java

@@ -13,6 +13,8 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.dynamicplugins;
 
+import static org.junit.Assert.assertThrows;
+
 import org.eclipse.core.commands.common.NamedHandleObject;
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.ui.contexts.IContextService;
@@ -72,40 +74,26 @@ protected final String getInstallLocation() {
 
 	/**
 	 * Tests whether the items defined in the extension point can be added and
-	 * removed dynamically. It tests that the data doesn't exist, and then loads
-	 * the extension. It tests that the data then exists, and unloads the
-	 * extension. It tests that the data then doesn't exist.
+	 * removed dynamically. It tests that the data doesn't exist, and then loads the
+	 * extension. It tests that the data then exists, and unloads the extension. It
+	 * tests that the data then doesn't exist.
+	 *
+	 * @throws NotDefinedException
 	 */
 	@Test
-	public final void testAcceleratorScopes() {
+	public final void testAcceleratorScopes() throws NotDefinedException {
 		final IContextService service = getWorkbench().getAdapter(IContextService.class);
-		NamedHandleObject namedHandleObject;
-
-		namedHandleObject = service.getContext("monkey");
-		try {
-			namedHandleObject.getName();
-			fail();
-		} catch (final NotDefinedException e) {
-			assertTrue(true);
-		}
+		NamedHandleObject namedHandleObject1 = service.getContext("monkey");
+		assertThrows(NotDefinedException.class, () -> namedHandleObject1.getName());
 
 		getBundle();
 
-		namedHandleObject = service.getContext("monkey");
-		try {
-			assertTrue("Monkey".equals(namedHandleObject.getName()));
-		} catch (final NotDefinedException e) {
-			fail();
-		}
+		NamedHandleObject namedHandleObject2 = service.getContext("monkey");
+		assertTrue("Monkey".equals(namedHandleObject2.getName()));
 
 		removeBundle();
 
-		namedHandleObject = service.getContext("monkey");
-		try {
-			namedHandleObject.getName();
-			fail();
-		} catch (final NotDefinedException e) {
-			assertTrue(true);
-		}
+		NamedHandleObject namedHandleObject3 = service.getContext("monkey");
+		assertThrows(NotDefinedException.class, () -> namedHandleObject3.getName());
 	}
 }

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/ActionDefinitionsExtensionDynamicTest.java

@@ -13,6 +13,8 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.dynamicplugins;
 
+import static org.junit.Assert.assertThrows;
+
 import org.eclipse.core.commands.common.NamedHandleObject;
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.ui.commands.ICommandService;
@@ -72,40 +74,27 @@ protected final String getInstallLocation() {
 
 	/**
 	 * Tests whether the items defined in the extension point can be added and
-	 * removed dynamically. It tests that the data doesn't exist, and then loads
-	 * the extension. It tests that the data then exists, and unloads the
-	 * extension. It tests that the data then doesn't exist.
+	 * removed dynamically. It tests that the data doesn't exist, and then loads the
+	 * extension. It tests that the data then exists, and unloads the extension. It
+	 * tests that the data then doesn't exist.
+	 *
+	 * @throws NotDefinedException
 	 */
 	@Test
-	public final void testActionDefinitions() {
+	public final void testActionDefinitions() throws NotDefinedException {
 		final ICommandService service = getWorkbench().getAdapter(ICommandService.class);
-		NamedHandleObject namedHandleObject;
 
-		namedHandleObject = service.getCommand("monkey");
-		try {
-			namedHandleObject.getName();
-			fail();
-		} catch (final NotDefinedException e) {
-			assertTrue(true);
-		}
+		NamedHandleObject namedHandleObject1 = service.getCommand("monkey");
+		assertThrows(NotDefinedException.class, () -> namedHandleObject1.getName());
 
 		getBundle();
 
-		namedHandleObject = service.getCommand("monkey");
-		try {
-			assertTrue("Monkey".equals(namedHandleObject.getName()));
-		} catch (final NotDefinedException e) {
-			fail();
-		}
+		NamedHandleObject namedHandleObject2 = service.getCommand("monkey");
+		assertTrue("Monkey".equals(namedHandleObject2.getName()));
 
 		removeBundle();
 
-		namedHandleObject = service.getCommand("monkey");
-		try {
-			namedHandleObject.getName();
-			fail();
-		} catch (final NotDefinedException e) {
-			assertTrue(true);
-		}
+		NamedHandleObject namedHandleObject3 = service.getCommand("monkey");
+		assertThrows(NotDefinedException.class, () -> namedHandleObject3.getName());
 	}
 }

tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dynamicplugins/BindingsExtensionDynamicTest.java

@@ -13,6 +13,8 @@
  *******************************************************************************/
 package org.eclipse.ui.tests.dynamicplugins;
 
+import static org.junit.Assert.assertThrows;
+
 import org.eclipse.core.commands.common.NotDefinedException;
 import org.eclipse.jface.bindings.Binding;
 import org.eclipse.jface.bindings.Scheme;
@@ -76,19 +78,18 @@ protected final String getInstallLocation() {
 
 	/**
 	 * Tests whether the items defined in the extension point can be added and
-	 * removed dynamically. It tests that the data doesn't exist, and then loads
-	 * the extension. It tests that the data then exists, and unloads the
-	 * extension. It tests that the data then doesn't exist.
+	 * removed dynamically. It tests that the data doesn't exist, and then loads the
+	 * extension. It tests that the data then exists, and unloads the extension. It
+	 * tests that the data then doesn't exist.
 	 *
-	 * @throws ParseException
-	 *             If "M1+W" can't be parsed by the extension point.
+	 * @throws ParseException      If "M1+W" can't be parsed by the extension point.
+	 * @throws NotDefinedException
 	 */
 	@Test
-	public void testBindings() throws ParseException {
+	public void testBindings() throws ParseException, NotDefinedException {
 		final IBindingService bindingService = getWorkbench().getAdapter(IBindingService.class);
 		final TriggerSequence triggerSequence = KeySequence.getInstance("M1+W");
 		Binding[] bindings;
-		Scheme scheme;
 		boolean found;
 
 		found = false;
@@ -113,13 +114,8 @@ public void testBindings() throws ParseException {
 			}
 		}
 		assertTrue(!found);
-		scheme = bindingService.getScheme("monkey");
-		try {
-			scheme.getName();
-			fail();
-		} catch (final NotDefinedException e) {
-			assertTrue(true);
-		}
+		Scheme scheme1 = bindingService.getScheme("monkey");
+		assertThrows(NotDefinedException.class, () -> scheme1.getName());
 
 		getBundle();
 
@@ -145,12 +141,8 @@ public void testBindings() throws ParseException {
 			}
 		}
 		assertTrue(found);
-		scheme = bindingService.getScheme("monkey");
-		try {
-			assertTrue("Monkey".equals(scheme.getName()));
-		} catch (final NotDefinedException e) {
-			fail();
-		}
+		Scheme scheme2 = bindingService.getScheme("monkey");
+		assertTrue("Monkey".equals(scheme2.getName()));
 
 		removeBundle();
 
@@ -176,12 +168,7 @@ public void testBindings() throws ParseException {
 			}
 		}
 		assertTrue(!found);
-		scheme = bindingService.getScheme("monkey");
-		try {
-			scheme.getName();
-			fail();
-		} catch (final NotDefinedException e) {
-			assertTrue(true);
-		}
+		Scheme scheme3 = bindingService.getScheme("monkey");
+		assertThrows(NotDefinedException.class, () -> scheme3.getName());
 	}
 }