Remove obsolete exception handling in tests

Let the tests throw the exceptions instead to be handled by the JUnit
framework. The adapted places do not throw CoreExceptions that would
require additional handling for proper formatting.

Author: HeikoKlare

tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/FileImageDescriptorTest.java

@@ -14,7 +14,6 @@
 
 package org.eclipse.jface.tests.performance;
 
-import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Enumeration;
@@ -70,12 +69,7 @@ public void testRefresh() throws Throwable {
 
 				for (URL file : files) {
 					startMeasuring();
-					try {
-						descriptor = ImageDescriptor.createFromFile(missing, FileLocator.toFileURL(file).getFile());
-					} catch (IOException e) {
-						fail(e.getLocalizedMessage(), e);
-						continue;
-					}
+					descriptor = ImageDescriptor.createFromFile(missing, FileLocator.toFileURL(file).getFile());
 
 					for (int j = 0; j < 10; j++) {
 						Image image = descriptor.createImage();

tests/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/ProgressMonitorDialogPerformanceTest.java

@@ -14,8 +14,6 @@
 
 package org.eclipse.jface.tests.performance;
 
-import java.lang.reflect.InvocationTargetException;
-
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.swt.widgets.Display;
@@ -80,11 +78,7 @@ public void testLongNames() throws Throwable {
 			}
 		};
 
-		try {
-			dialog.run(false, true, runnable);
-		} catch (InvocationTargetException | InterruptedException e) {
-			fail(e.getMessage(), e);
-		}
+		dialog.run(false, true, runnable);
 
 		commitMeasurements();
 		assertPerformance();

tests/org.eclipse.ui.tests.performance/src/org/eclipse/ui/tests/performance/BasicPerformanceTest.java

@@ -26,6 +26,7 @@
 import org.eclipse.test.performance.Dimension;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.tests.harness.util.UITestCase;
+import org.junit.function.ThrowingRunnable;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
@@ -221,7 +222,7 @@ protected IStatus run(IProgressMonitor monitor) {
 	 *
 	 * @since 3.1
 	 */
-	public static void exercise(Runnable runnable) throws CoreException {
+	public static void exercise(ThrowingRunnable runnable) throws CoreException {
 		exercise(runnable, 3, 100, 4000);
 	}
 
@@ -231,7 +232,7 @@ public static void exercise(Runnable runnable) throws CoreException {
 	 *
 	 * @since 3.1
 	 */
-	public static void exercise(Runnable runnable,
+	public static void exercise(ThrowingRunnable runnable,
 			int minIterations,
 			int maxIterations, int maxTime) throws CoreException {
 		long startTime = System.currentTimeMillis();
@@ -240,7 +241,7 @@ public static void exercise(Runnable runnable,
 
 			try {
 				runnable.run();
-			} catch (Exception e) {
+			} catch (Throwable e) {
 				throw new CoreException(new Status(IStatus.ERROR,
 						FrameworkUtil.getBundle(BasicPerformanceTest.class)
 								.getSymbolicName(), IStatus.OK,

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

@@ -173,9 +173,6 @@ public void testWorkingSetCycle() throws Throwable {
 			aggregateReloaded = (IAggregateWorkingSet) manager.createWorkingSet(memento);
 			manager.addWorkingSet(aggregateReloaded);
 			aggregateReloaded.getComponents();
-		} catch (StackOverflowError e) {
-			e.printStackTrace();
-			fail("Stack overflow for self-referenced aggregate working set", e);
 		} finally {
 			if (aggregateReloaded != null) {
 				manager.removeWorkingSet(aggregateReloaded);
@@ -230,9 +227,6 @@ public void testCycleCleanup() throws Throwable {
 			for (IWorkingSet aggregate2 : aggregates) {
 				assertFalse("testCycle".equals(aggregate2.getName()));
 			}
-		} catch (StackOverflowError e) {
-			e.printStackTrace();
-			fail("Stack overflow for self-referenced aggregate working set", e);
 		} finally {
 			if (aggregateReloaded != null) {
 				manager.removeWorkingSet(aggregateReloaded);
@@ -385,7 +379,13 @@ public void testWorkingSetSaveNeverRestoresAggregate() throws Throwable {
 				if (!(ws instanceof AggregateWorkingSet aws)) {
 					return;
 				}
-				IMemento m = readField(AbstractWorkingSet.class, "workingSetMemento", IMemento.class, aws);
+				IMemento m;
+				try {
+					m = readField(AbstractWorkingSet.class, "workingSetMemento", IMemento.class, aws);
+				} catch (Exception e) {
+					error.set(e.getMessage());
+					return;
+				}
 				IWorkingSet[] sets = aws.getComponents();
 				if (m != null) {
 					IMemento[] msets = m.getChildren(IWorkbenchConstants.TAG_WORKING_SET);
@@ -442,7 +442,7 @@ public void testWorkingSetSaveNeverRestoresAggregate() throws Throwable {
 		}
 	}
 
-	private IMemento saveAndRemoveWorkingSets(IWorkingSet... sets) {
+	private IMemento saveAndRemoveWorkingSets(IWorkingSet... sets) throws Exception {
 		IMemento managerMemento = XMLMemento
 				.createWriteRoot(IWorkbenchConstants.TAG_WORKING_SET_MANAGER);
 		IWorkingSetManager manager = fWorkbench.getWorkingSetManager();
@@ -467,7 +467,7 @@ private IMemento saveAndRemoveWorkingSets(IWorkingSet... sets) {
 		return managerMemento;
 	}
 
-	private void restoreWorkingSetManager(IMemento managerMemento) {
+	private void restoreWorkingSetManager(IMemento managerMemento) throws Exception {
 		IWorkingSetManager manager = fWorkbench.getWorkingSetManager();
 
 		invokeMethod(AbstractWorkingSetManager.class, "restoreWorkingSetState",
@@ -479,25 +479,16 @@ private void restoreWorkingSetManager(IMemento managerMemento) {
 	}
 
 	private Object invokeMethod(Class<?> clazz, String methodName, Object instance, Object[] args,
-			Class<?>[] argsClasses) {
-		try {
-			Method method = clazz.getDeclaredMethod(methodName, argsClasses);
-			method.setAccessible(true);
-			return method.invoke(instance, args);
-		} catch (Exception e) {
-			fail("Failure in invoking " + clazz.getName() + methodName, e);
-		}
-		return null;
+			Class<?>[] argsClasses) throws Exception {
+		Method method = clazz.getDeclaredMethod(methodName, argsClasses);
+		method.setAccessible(true);
+		return method.invoke(instance, args);
 	}
 
-	private <T> T readField(Class<?> clazz, String filedName, Class<T> type, Object instance) {
-		try {
-			Field field = clazz.getDeclaredField(filedName);
-			field.setAccessible(true);
-			return type.cast(field.get(instance));
-		} catch (Exception e) {
-			fail("Failure in reading " + clazz.getName() + filedName, e);
-		}
-		return null;
+	private <T> T readField(Class<?> clazz, String filedName, Class<T> type, Object instance)
+			throws Exception {
+		Field field = clazz.getDeclaredField(filedName);
+		field.setAccessible(true);
+		return type.cast(field.get(instance));
 	}
 }