introduced ArgumentResolutionException (->johannes, marc)

junit-commons/src/main/java/org/junit/gen5/commons/util/ReflectionUtils.java

@@ -64,7 +64,6 @@ public static Object invokeMethod(Method method, Object target, Object... argume
 		return method.invoke(target, arguments);
 	}
 
-
 	public static Optional<Class<?>> loadClass(String name) {
 		return loadClass(name, getDefaultClassLoader());
 	}

junit5-engine/src/main/java/org/junit/gen5/engine/junit5/execution/MethodTestExecutionNode.java

@@ -76,6 +76,9 @@ public void execute(EngineExecutionContext context) {
 			if (ex instanceof InvocationTargetException) {
 				exceptionThrown = ((InvocationTargetException) ex).getTargetException();
 			}
+			if (ex instanceof ArgumentResolutionException) {
+				exceptionThrown = ex.getCause();
+			}
 		}
 		finally {
 			exceptionThrown = executeAfterMethods(context, testClass, testInstance, exceptionThrown);
@@ -98,7 +101,7 @@ else if (exceptionThrown instanceof TestAbortedException) {
 	}
 
 	private void invokeTestMethod(EngineExecutionContext context, Object testInstance)
-			throws IllegalAccessException, InvocationTargetException, NoSuchMethodException, InstantiationException {
+			throws InvocationTargetException, IllegalAccessException, ArgumentResolutionException {
 
 		MethodTestDescriptor methodTestDescriptor = getTestDescriptor();
 
@@ -109,7 +112,7 @@ private void invokeTestMethod(EngineExecutionContext context, Object testInstanc
 	}
 
 	private List<Object> prepareArguments(MethodTestDescriptor methodTestDescriptor)
-			throws NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
+			throws ArgumentResolutionException {
 
 		//todo: should probably not be instantiated here, maybe be brought along by the executionContext
 		MethodArgumentResolverEngine argumentResolver = new MethodArgumentResolverEngine();

junit5-engine/src/main/java/org/junit/gen5/engine/junit5/execution/injection/ArgumentResolutionException.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2015 the original author or authors.
+ *
+ * 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
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.junit.gen5.engine.junit5.execution.injection;
+
+public class ArgumentResolutionException extends Exception {
+
+	public ArgumentResolutionException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+}

junit5-engine/src/main/java/org/junit/gen5/engine/junit5/execution/injection/MethodArgumentResolverEngine.java

@@ -26,15 +26,21 @@ public class MethodArgumentResolverEngine {
 	 *
 	 * @param methodTestDescriptor the test descriptor for the underlying (test) method
 	 * @return a list of Objects to be used as arguments in the method call - will be an empty list in case of no-arg methods
-	 * @throws NoSuchMethodException
-	 * @throws InstantiationException
-	 * @throws IllegalAccessException
-	 * @throws InvocationTargetException
+	 * @throws ArgumentResolutionException
 	 */
+	public List<Object> prepareArguments(MethodTestDescriptor methodTestDescriptor) throws ArgumentResolutionException {
 
-	public List<Object> prepareArguments(MethodTestDescriptor methodTestDescriptor)
-			throws NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
+		try {
+			return this.doPrepareArguments(methodTestDescriptor);
+		}
+		catch (Exception root) {
+			throw new ArgumentResolutionException("problem with argument resolution", root);
+		}
 
+	}
+
+	private List<Object> doPrepareArguments(MethodTestDescriptor methodTestDescriptor)
+			throws NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException {
 		Method testMethod = methodTestDescriptor.getTestMethod();
 
 		List<Object> arguments = new ArrayList<>();