azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add sorted and filter to custom test runner

Browse Source
This commit is contained in:
Nikolay Krasko
2014-09-09 18:43:42 +04:00
parent 55e5241158
commit d32221ff4a
1 changed files with 47 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/JUnit3RunnerWithInners.java
+47 -43
View File
@@ -27,6 +27,7 @@ import org.junit.internal.MethodSorter;
import org.junit.internal.runners.JUnit38ClassRunner; import org.junit.internal.runners.JUnit38ClassRunner;
import org.junit.runner.Description; import org.junit.runner.Description;
import org.junit.runner.Runner; import org.junit.runner.Runner;
import org.junit.runner.manipulation.*;
import org.junit.runner.notification.RunNotifier; import org.junit.runner.notification.RunNotifier;
import java.lang.reflect.Method; import java.lang.reflect.Method;
@@ -37,12 +38,12 @@ import java.util.*;
* This runner runs class with all inners test classes, but monitors situation when those classes are planned to be executed * This runner runs class with all inners test classes, but monitors situation when those classes are planned to be executed
* with IDEA package test runner. * with IDEA package test runner.
*/ */
public class JUnit3RunnerWithInners extends Runner { public class JUnit3RunnerWithInners extends Runner implements Filterable, Sortable {
private static final Set<Class> requestedRunners = new HashSet<Class>(); private static final Set<Class> requestedRunners = new HashSet<Class>();
private Runner delegateRunner; private JUnit38ClassRunner delegateRunner;
private final Class<?> klass; private final Class<?> klass;
private Test test; private boolean isFakeTest = false;
private static class FakeEmptyClassTest implements Test { private static class FakeEmptyClassTest implements Test {
private final Class<?> klass; private final Class<?> klass;
@@ -79,50 +80,61 @@ public class JUnit3RunnerWithInners extends Runner {
@Override @Override
public void run(RunNotifier notifier) { public void run(RunNotifier notifier) {
getDelegateRunner().run(notifier); initialize();
delegateRunner.run(notifier);
} }
@Override @Override
public Description getDescription() { public Description getDescription() {
if (getCollectedTests() instanceof FakeEmptyClassTest) { initialize();
return Description.EMPTY; return isFakeTest ? Description.EMPTY : delegateRunner.getDescription();
}
return getDelegateRunner().getDescription();
} }
private Test getCollectedTests() { @Override
if (test == null) { public void filter(Filter filter) throws NoTestsRemainException {
List<Class> innerClasses = collectDeclaredClasses(klass, false); initialize();
Set<Class> unprocessedInnerClasses = unprocessedClasses(innerClasses); delegateRunner.filter(filter);
}
if (unprocessedInnerClasses.isEmpty()) { @Override
if (!innerClasses.isEmpty() && !hasTestMethods(klass)) { public void sort(Sorter sorter) {
test = new FakeEmptyClassTest(klass); initialize();
} delegateRunner.sort(sorter);
else { }
test = new TestSuite(klass.asSubclass(TestCase.class));
} protected void initialize() {
if (delegateRunner != null) return;
delegateRunner = new JUnit38ClassRunner(getCollectedTests());
}
protected Test getCollectedTests() {
List<Class> innerClasses = collectDeclaredClasses(klass, false);
Set<Class> unprocessedInnerClasses = unprocessedClasses(innerClasses);
if (unprocessedInnerClasses.isEmpty()) {
if (!innerClasses.isEmpty() && !hasTestMethods(klass)) {
isFakeTest = true;
return new FakeEmptyClassTest(klass);
} }
else { else {
List<Class> classes = Lists.newArrayList(); return new TestSuite(klass.asSubclass(TestCase.class));
classes.add(klass);
classes.addAll(unprocessedInnerClasses);
List<Class> filtered = KotlinPackage.filter(classes, new Function1<Class, Boolean>() {
@Override
public Boolean invoke(Class aClass) {
boolean hasInnerClasses = aClass.getDeclaredClasses().length > 0;
return !hasInnerClasses || hasTestMethods(aClass);
}
});
test = new TestSuite(filtered.toArray(new Class[filtered.size()]));
} }
} }
else {
List<Class> classes = Lists.newArrayList();
classes.add(klass);
classes.addAll(unprocessedInnerClasses);
return test; List<Class> filtered = KotlinPackage.filter(classes, new Function1<Class, Boolean>() {
@Override
public Boolean invoke(Class aClass) {
boolean hasInnerClasses = aClass.getDeclaredClasses().length > 0;
return !hasInnerClasses || hasTestMethods(aClass);
}
});
return new TestSuite(filtered.toArray(new Class[filtered.size()]));
}
} }
private static Set<Class> unprocessedClasses(Collection<Class> classes) { private static Set<Class> unprocessedClasses(Collection<Class> classes) {
@@ -136,14 +148,6 @@ public class JUnit3RunnerWithInners extends Runner {
return result; return result;
} }
private Runner getDelegateRunner() {
if (delegateRunner == null) {
delegateRunner = new JUnit38ClassRunner(getCollectedTests());
}
return delegateRunner;
}
private static List<Class> collectDeclaredClasses(Class klass, boolean withItself) { private static List<Class> collectDeclaredClasses(Class klass, boolean withItself) {
List<Class> result = new ArrayList<Class>(); List<Class> result = new ArrayList<Class>();
if (withItself) { if (withItself) {