MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

junit 5: fork mode for methods

Browse Source
This commit is contained in:
Anna Kozlova
2017-05-24 10:11:50 +03:00
parent 0aa303139b
commit a5e1d1faa3
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/junit5_rt/src/com/intellij/junit5/JUnit5IdeaTestRunner.java
+3 -3
View File
@@ -88,9 +88,9 @@ public class JUnit5IdeaTestRunner implements IdeaTestRunner {
public String getStartDescription(Object child) {
final TestIdentifier testIdentifier = (TestIdentifier)child;
final String className = JUnit5TestExecutionListener.getClassName(testIdentifier);
final String methodName = JUnit5TestExecutionListener.getMethodName(testIdentifier);
if (methodName != null) {
return className + "#" + methodName;
final String methodSignature = JUnit5TestExecutionListener.getMethodSignature(testIdentifier);
if (methodSignature != null) {
return className + "," + methodSignature;
}
return className != null ? className : (testIdentifier).getDisplayName();
}
plugins/junit5_rt/src/com/intellij/junit5/JUnit5TestExecutionListener.java
+12 -6
View File
@@ -37,10 +37,7 @@ import java.io.File;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import java.util.*;
public class JUnit5TestExecutionListener implements TestExecutionListener {
private static final String NO_LOCATION_HINT = "";
@@ -99,7 +96,6 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
@Override
public void testPlanExecutionFinished(TestPlan testPlan) {
myTestPlan = null;
}
@Override
@@ -164,7 +160,7 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
myPrintStream.println("\n##teamcity[testFinished name=\'" + JUnit4TestListener.CLASS_CONFIGURATION + "\']");
}
final Set<TestIdentifier> descendants = myTestPlan.getDescendants(testIdentifier);
final Set<TestIdentifier> descendants = myTestPlan != null ? myTestPlan.getDescendants(testIdentifier) : Collections.emptySet();
if (!descendants.isEmpty() && myFinishCount == 0) {
for (TestIdentifier childIdentifier : descendants) {
testStarted(childIdentifier);
@@ -373,4 +369,14 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
return null;
}).orElse(null);
}
static String getMethodSignature(TestIdentifier testIdentifier) {
return testIdentifier.getSource().map((source) -> {
if (source instanceof MethodSource) {
String parameterTypes = ((MethodSource)source).getMethodParameterTypes();
return ((MethodSource)source).getMethodName() + (parameterTypes != null ? "(" + parameterTypes + ")" : "");
}
return null;
}).orElse(null);
}
}