update junit 5 to M3

This commit is contained in:
Anna.Kozlova
2016-12-01 10:39:31 +01:00
parent 1732f58088
commit b32e34f953
18 changed files with 16 additions and 16 deletions
+6 -6
View File
@@ -1,12 +1,12 @@
<component name="libraryTable">
<library name="junit5_rt">
<CLASSES>
<root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M2.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M2.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M2.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M2.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M2.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M2.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M3.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M3.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M3.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M3.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M3.jar!/" />
<root url="jar://$PROJECT_DIR$/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -210,7 +210,7 @@ class CommunityRepositoryModules {
withModule("junit5_rt", "junit5-rt.jar")
withProjectLibrary("junit5_rt")
withProjectLibrary("opentest4j")
withModuleLibrary("junit-jupiter-api-5.0.0-M2.jar", "junit5_rt_tests", "")
withModuleLibrary("junit-jupiter-api-5.0.0-M3.jar", "junit5_rt_tests", "")
},
plugin("ByteCodeViewer") {
mainJarName = "byteCodeViewer.jar"
Binary file not shown.
Binary file not shown.
@@ -21,8 +21,8 @@ import com.intellij.rt.execution.junit.ComparisonFailureData;
import com.intellij.rt.execution.junit.MapSerializerUtil;
import org.junit.platform.engine.TestExecutionResult;
import org.junit.platform.engine.reporting.ReportEntry;
import org.junit.platform.engine.support.descriptor.JavaClassSource;
import org.junit.platform.engine.support.descriptor.JavaMethodSource;
import org.junit.platform.engine.support.descriptor.ClassSource;
import org.junit.platform.engine.support.descriptor.MethodSource;
import org.junit.platform.launcher.TestExecutionListener;
import org.junit.platform.launcher.TestIdentifier;
import org.junit.platform.launcher.TestPlan;
@@ -297,11 +297,11 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
static String getClassName(TestIdentifier description) {
return description.getSource().map(source -> {
if (source instanceof JavaMethodSource) {
return ((JavaMethodSource)source).getJavaClass().getName();
if (source instanceof MethodSource) {
return ((MethodSource)source).getClassName();
}
if (source instanceof JavaClassSource) {
return ((JavaClassSource)source).getJavaClass().getName();
if (source instanceof ClassSource) {
return ((ClassSource)source).getClassName();
}
return null;
}).orElse(null);
@@ -309,8 +309,8 @@ public class JUnit5TestExecutionListener implements TestExecutionListener {
static String getMethodName(TestIdentifier testIdentifier) {
return testIdentifier.getSource().map((source) -> {
if (source instanceof JavaMethodSource) {
return ((JavaMethodSource)source).getJavaMethodName();
if (source instanceof MethodSource) {
return ((MethodSource)source).getMethodName();
}
return null;
}).orElse(null);
+1 -1
View File
@@ -10,7 +10,7 @@
<orderEntry type="module-library" scope="TEST">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../junit5_rt/lib/junit-jupiter-api-5.0.0-M2.jar!/" />
<root url="jar://$MODULE_DIR$/../junit5_rt/lib/junit-jupiter-api-5.0.0-M3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />