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

Return tree structure in test view result for running single test

Browse Source
This commit is contained in:
Nikolay Krasko
2014-09-11 15:36:10 +04:00
parent 10fbd4a269
commit 32c00a4623
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/JUnit3RunnerWithInners.java
+21 -15
View File
@@ -16,13 +16,10 @@
package org.jetbrains.jet;
import com.google.common.collect.Lists;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestResult;
import junit.framework.TestSuite;
import kotlin.Function1;
import kotlin.KotlinPackage;
import org.junit.internal.MethodSorter;
import org.junit.internal.runners.JUnit38ClassRunner;
import org.junit.runner.Description;
@@ -121,22 +118,31 @@ public class JUnit3RunnerWithInners extends Runner implements Filterable, Sortab
}
}
else {
List<Class> classes = Lists.newArrayList();
classes.add(klass);
classes.addAll(unprocessedInnerClasses);
assert unprocessedInnerClasses.size() == innerClasses.size() :
String.format("Some inner classes left unprocessed during creating runner for %s: %s",
klass.getCanonicalName(), 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);
}
});
return new TestSuite(filtered.toArray(new Class[filtered.size()]));
return createTreeTestSuite(klass);
}
}
private static Test createTreeTestSuite(Class root) {
Set<Class> classes = new LinkedHashSet<Class>(collectDeclaredClasses(root, true));
Map<Class, TestSuite> classSuites = new HashMap<Class, TestSuite>();
for (Class aClass : classes) {
classSuites.put(aClass, hasTestMethods(aClass) ? new TestSuite(aClass) : new TestSuite(aClass.getCanonicalName()));
}
for (Class aClass : classes) {
if (aClass.getEnclosingClass() != null && classes.contains(aClass.getEnclosingClass())) {
classSuites.get(aClass.getEnclosingClass()).addTest(classSuites.get(aClass));
}
}
return classSuites.get(root);
}
private static Set<Class> unprocessedClasses(Collection<Class> classes) {
Set<Class> result = new LinkedHashSet<Class>();
for (Class aClass : classes) {