Skip to content

Allow directly running nested tests instead of running from parent level #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FooBarRaz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow directly running nested tests instead of running from parent level #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions junit-runners/src/main/java/com/nitorcreations/junit/runners/NestedRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/
package com.nitorcreations.junit.runners;

import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
Expand Down Expand Up @@ -48,6 +50,9 @@ public NestedRunner(Class<?> testClass) throws InitializationError {

public NestedRunner(Class<?> testClass, NestedRunner parentRunner) throws InitializationError {
super(testClass);
if (parentRunner == null && testClass.getDeclaringClass() != null) {
parentRunner = new NestedRunner(testClass.getEnclosingClass());
}
this.parentRunner = parentRunner;
delegatedRunner = new NestedClassRunner(testClass);
children.addAll(delegatedRunner.giveMeTheDamnChildren());
Expand Down Expand Up @@ -106,17 +111,31 @@ protected void runChild(Object child, RunNotifier notifier) {
}

private Object constructTestClass() throws Exception {
if (getTestClass().getOnlyConstructor().getParameterTypes().length == 1 && parentRunner != null) {
Constructor<?> onlyConstructor = getTestClass().getOnlyConstructor();
if (onlyConstructor.getParameterTypes().length == 1 && parentRunner != null) {
Object parent = parentRunner.constructTestClass();
Object newInstance = getTestClass().getOnlyConstructor().newInstance(parent);
Object newInstance = onlyConstructor.newInstance(parent);
delegatedRunner.currentTestObject = newInstance;
return newInstance;
}
Object newInstance = getTestClass().getOnlyConstructor().newInstance();

Object newInstance = createNewInstance(onlyConstructor);
delegatedRunner.currentTestObject = newInstance;
return newInstance;
}

private Object createNewInstance(Constructor<?> classConstructor) throws InstantiationException, IllegalAccessException, InvocationTargetException {
if (classConstructor.getParameterTypes().length == 0) {
return classConstructor.newInstance();
}
else if (classConstructor.getParameterTypes().length == 1) {
Class<?> aClass = classConstructor.getParameterTypes()[0];
return classConstructor.newInstance(createNewInstance(aClass.getConstructors()[0]));
}

return null;
}

public List<FrameworkMethod> getBefores() {
List<FrameworkMethod> befores = new ArrayList<FrameworkMethod>();
befores.addAll(getTestClass().getAnnotatedMethods(Before.class));
Expand Down