diff --git a/.idea/libraries/junit5_rt.xml b/.idea/libraries/junit5_rt.xml index cd50f3b02c68..7a16af51b6e4 100644 --- a/.idea/libraries/junit5_rt.xml +++ b/.idea/libraries/junit5_rt.xml @@ -1,13 +1,21 @@ - - - - - - - + + + + + + + + + + + + + + + diff --git a/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java b/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java index 34ef007f08eb..399c004e1e14 100644 --- a/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java +++ b/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java @@ -42,7 +42,7 @@ public class JUnitUtil { @NonNls private static final String TEST_INTERFACE = "junit.framework.Test"; @NonNls private static final String TESTSUITE_CLASS = "junit.framework.TestSuite"; @NonNls public static final String TEST_ANNOTATION = "org.junit.Test"; - @NonNls public static final String TEST5_ANNOTATION = "org.junit.gen5.api.Test"; + @NonNls public static final String TEST5_ANNOTATION = "org.junit.jupiter.api.Test"; @NonNls public static final String IGNORE_ANNOTATION = "org.junit.Ignore"; @NonNls public static final String RUN_WITH = "org.junit.runner.RunWith"; @NonNls public static final String DATA_POINT = "org.junit.experimental.theories.DataPoint"; @@ -51,16 +51,16 @@ public class JUnitUtil { public static final String BEFORE_ANNOTATION_NAME = "org.junit.Before"; public static final String AFTER_ANNOTATION_NAME = "org.junit.After"; - public static final String BEFORE_EACH_ANNOTATION_NAME = "org.junit.gen5.api.BeforeEach"; - public static final String AFTER_EACH_ANNOTATION_NAME = "org.junit.gen5.api.AfterEach"; + public static final String BEFORE_EACH_ANNOTATION_NAME = "org.junit.jupiter.api.BeforeEach"; + public static final String AFTER_EACH_ANNOTATION_NAME = "org.junit.jupiter.api.AfterEach"; public static final String PARAMETRIZED_PARAMETERS_ANNOTATION_NAME = "org.junit.runners.Parameterized.Parameters"; public static final String AFTER_CLASS_ANNOTATION_NAME = "org.junit.AfterClass"; public static final String BEFORE_CLASS_ANNOTATION_NAME = "org.junit.BeforeClass"; - public static final String BEFORE_ALL_ANNOTATION_NAME = "org.junit.gen5.api.BeforeAll"; - public static final String AFTER_ALL_ANNOTATION_NAME = "org.junit.gen5.api.AfterAll"; + public static final String BEFORE_ALL_ANNOTATION_NAME = "org.junit.jupiter.api.BeforeAll"; + public static final String AFTER_ALL_ANNOTATION_NAME = "org.junit.jupiter.api.AfterAll"; private static final Collection TEST_ANNOTATIONS = Collections.unmodifiableList(Arrays.asList(TEST_ANNOTATION, TEST5_ANNOTATION)); diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java index cd7c4abe4ec5..927033535a9e 100644 --- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java +++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java @@ -66,7 +66,7 @@ import com.intellij.util.PathsList; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.junit.gen5.launcher.TestExecutionListener; +import org.junit.platform.launcher.TestExecutionListener; import java.io.File; import java.io.IOException; diff --git a/plugins/junit5_rt/lib/junit-commons-5.0.0-ALPHA.jar b/plugins/junit5_rt/lib/junit-commons-5.0.0-ALPHA.jar deleted file mode 100644 index 0e941851fd0e..000000000000 Binary files a/plugins/junit5_rt/lib/junit-commons-5.0.0-ALPHA.jar and /dev/null differ diff --git a/plugins/junit5_rt/lib/junit-engine-api-5.0.0-ALPHA.jar b/plugins/junit5_rt/lib/junit-engine-api-5.0.0-ALPHA.jar deleted file mode 100644 index 3346ebab9a16..000000000000 Binary files a/plugins/junit5_rt/lib/junit-engine-api-5.0.0-ALPHA.jar and /dev/null differ diff --git a/plugins/junit5_rt/lib/junit-jupiter-api-5.0.0-M1.jar b/plugins/junit5_rt/lib/junit-jupiter-api-5.0.0-M1.jar new file mode 100644 index 000000000000..38b088c54fee Binary files /dev/null and b/plugins/junit5_rt/lib/junit-jupiter-api-5.0.0-M1.jar differ diff --git a/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M1.jar b/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M1.jar new file mode 100644 index 000000000000..0e95c891e5ab Binary files /dev/null and b/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M1.jar differ diff --git a/plugins/junit5_rt/lib/junit-launcher-5.0.0-ALPHA.jar b/plugins/junit5_rt/lib/junit-launcher-5.0.0-ALPHA.jar deleted file mode 100644 index f881f91ec5bf..000000000000 Binary files a/plugins/junit5_rt/lib/junit-launcher-5.0.0-ALPHA.jar and /dev/null differ diff --git a/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M1.jar b/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M1.jar new file mode 100644 index 000000000000..46adfc539f53 Binary files /dev/null and b/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M1.jar differ diff --git a/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M1.jar b/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M1.jar new file mode 100644 index 000000000000..4d21cbdf1fac Binary files /dev/null and b/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M1.jar differ diff --git a/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M1.jar b/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M1.jar new file mode 100644 index 000000000000..b60c1a0ce567 Binary files /dev/null and b/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M1.jar differ diff --git a/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M1.jar b/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M1.jar new file mode 100644 index 000000000000..a748c977d4ec Binary files /dev/null and b/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M1.jar differ diff --git a/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M1.jar b/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M1.jar new file mode 100644 index 000000000000..a081e7bda54e Binary files /dev/null and b/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M1.jar differ diff --git a/plugins/junit5_rt/lib/junit4-engine-5.0.0-ALPHA.jar b/plugins/junit5_rt/lib/junit4-engine-5.0.0-ALPHA.jar deleted file mode 100644 index 4145054622a5..000000000000 Binary files a/plugins/junit5_rt/lib/junit4-engine-5.0.0-ALPHA.jar and /dev/null differ diff --git a/plugins/junit5_rt/lib/junit4-runner-5.0.0-ALPHA.jar b/plugins/junit5_rt/lib/junit4-runner-5.0.0-ALPHA.jar deleted file mode 100644 index 5f6acbef2f1b..000000000000 Binary files a/plugins/junit5_rt/lib/junit4-runner-5.0.0-ALPHA.jar and /dev/null differ diff --git a/plugins/junit5_rt/lib/junit5-engine-5.0.0-ALPHA.jar b/plugins/junit5_rt/lib/junit5-engine-5.0.0-ALPHA.jar deleted file mode 100644 index 582288aa96ec..000000000000 Binary files a/plugins/junit5_rt/lib/junit5-engine-5.0.0-ALPHA.jar and /dev/null differ diff --git a/plugins/junit5_rt/src/com/intellij/junit5/JUnit5IdeaTestRunner.java b/plugins/junit5_rt/src/com/intellij/junit5/JUnit5IdeaTestRunner.java index 6084caddab43..ec76e0ea958e 100644 --- a/plugins/junit5_rt/src/com/intellij/junit5/JUnit5IdeaTestRunner.java +++ b/plugins/junit5_rt/src/com/intellij/junit5/JUnit5IdeaTestRunner.java @@ -17,11 +17,11 @@ package com.intellij.junit5; import com.intellij.rt.execution.junit.IdeaTestRunner; import com.intellij.rt.execution.junit.segments.OutputObjectRegistry; -import org.junit.gen5.launcher.Launcher; -import org.junit.gen5.launcher.TestDiscoveryRequest; -import org.junit.gen5.launcher.TestIdentifier; -import org.junit.gen5.launcher.TestPlan; -import org.junit.gen5.launcher.main.LauncherFactory; +import org.junit.platform.launcher.Launcher; +import org.junit.platform.launcher.LauncherDiscoveryRequest; +import org.junit.platform.launcher.TestIdentifier; +import org.junit.platform.launcher.TestPlan; +import org.junit.platform.launcher.core.LauncherFactory; import java.util.ArrayList; import java.util.List; @@ -36,7 +36,7 @@ public class JUnit5IdeaTestRunner implements IdeaTestRunner { Launcher launcher = LauncherFactory.create(); launcher.registerTestExecutionListeners(myListener); final String[] packageNameRef = new String[1]; - final TestDiscoveryRequest discoveryRequest = JUnit5TestRunnerUtil.buildRequest(args, packageNameRef); + final LauncherDiscoveryRequest discoveryRequest = JUnit5TestRunnerUtil.buildRequest(args, packageNameRef); myTestPlan = launcher.discover(discoveryRequest); myListener.sendTree(myTestPlan, packageNameRef[0]); launcher.execute(discoveryRequest); @@ -56,9 +56,9 @@ public class JUnit5IdeaTestRunner implements IdeaTestRunner { @Override public Object getTestToStart(String[] args, String name) { - final TestDiscoveryRequest request = JUnit5TestRunnerUtil.buildRequest(args, new String[1]); + final LauncherDiscoveryRequest discoveryRequest = JUnit5TestRunnerUtil.buildRequest(args, new String[1]); Launcher launcher = LauncherFactory.create(); - myTestPlan = launcher.discover(request); + myTestPlan = launcher.discover(discoveryRequest); final Set roots = myTestPlan.getRoots(); return roots.isEmpty() ? null : roots.iterator().next(); diff --git a/plugins/junit5_rt/src/com/intellij/junit5/JUnit5TestExecutionListener.java b/plugins/junit5_rt/src/com/intellij/junit5/JUnit5TestExecutionListener.java index b91a7f6b7167..8540a4dd529a 100644 --- a/plugins/junit5_rt/src/com/intellij/junit5/JUnit5TestExecutionListener.java +++ b/plugins/junit5_rt/src/com/intellij/junit5/JUnit5TestExecutionListener.java @@ -18,11 +18,11 @@ package com.intellij.junit5; import com.intellij.junit4.ExpectedPatterns; import com.intellij.rt.execution.junit.ComparisonFailureData; import com.intellij.rt.execution.junit.MapSerializerUtil; -import org.junit.gen5.engine.TestExecutionResult; -import org.junit.gen5.engine.support.descriptor.JavaSource; -import org.junit.gen5.launcher.TestExecutionListener; -import org.junit.gen5.launcher.TestIdentifier; -import org.junit.gen5.launcher.TestPlan; +import org.junit.platform.engine.TestExecutionResult; +import org.junit.platform.engine.support.descriptor.JavaMethodSource; +import org.junit.platform.launcher.TestExecutionListener; +import org.junit.platform.launcher.TestIdentifier; +import org.junit.platform.launcher.TestPlan; import org.opentest4j.AssertionFailedError; import java.io.PrintStream; @@ -213,19 +213,16 @@ public class JUnit5TestExecutionListener implements TestExecutionListener { } static String getClassName(TestIdentifier description) { - Optional javaSource = getJavaSource(description); - return javaSource.map(source -> { - final Optional> javaClass = source.getJavaClass(); - return javaClass.isPresent() ? javaClass.get().getName() : null; - }).orElse(null); + Optional javaSource = getJavaSource(description); + return javaSource.map(source -> source.getJavaClass().getName()).orElse(null); } static String getMethodName(TestIdentifier testIdentifier) { - return getJavaSource(testIdentifier).map((source) -> source.getJavaMethodName().orElse(null)).orElse(null); + return getJavaSource(testIdentifier).map(JavaMethodSource::getJavaMethodName).orElse(null); } - private static Optional getJavaSource(TestIdentifier testIdentifier) { - return testIdentifier.getSource().filter(JavaSource.class::isInstance).map(JavaSource.class::cast); + private static Optional getJavaSource(TestIdentifier testIdentifier) { + return testIdentifier.getSource().filter(JavaMethodSource.class::isInstance).map(JavaMethodSource.class::cast); } } diff --git a/plugins/junit5_rt/src/com/intellij/junit5/JUnit5TestRunnerUtil.java b/plugins/junit5_rt/src/com/intellij/junit5/JUnit5TestRunnerUtil.java index d0b75d9d3327..56aafe4eb29d 100644 --- a/plugins/junit5_rt/src/com/intellij/junit5/JUnit5TestRunnerUtil.java +++ b/plugins/junit5_rt/src/com/intellij/junit5/JUnit5TestRunnerUtil.java @@ -16,10 +16,10 @@ package com.intellij.junit5; import com.intellij.rt.execution.junit.JUnitStarter; -import org.junit.gen5.engine.discovery.NameBasedSelector; -import org.junit.gen5.engine.discovery.PackageSelector; -import org.junit.gen5.launcher.TestDiscoveryRequest; -import org.junit.gen5.launcher.main.TestDiscoveryRequestBuilder; +import org.junit.platform.engine.discovery.DiscoverySelectors; +import org.junit.platform.engine.discovery.PackageSelector; +import org.junit.platform.launcher.LauncherDiscoveryRequest; +import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder; import java.io.BufferedReader; import java.io.FileReader; @@ -31,12 +31,12 @@ import java.util.stream.Collectors; public class JUnit5TestRunnerUtil { - public static TestDiscoveryRequest buildRequest(String[] suiteClassNames, String[] packageNameRef) { + public static LauncherDiscoveryRequest buildRequest(String[] suiteClassNames, String[] packageNameRef) { if (suiteClassNames.length == 0) { return null; } - final TestDiscoveryRequestBuilder builder = TestDiscoveryRequestBuilder.request(); + final LauncherDiscoveryRequestBuilder builder = LauncherDiscoveryRequestBuilder.request(); final List lines = new ArrayList<>(); @@ -57,8 +57,8 @@ public class JUnit5TestRunnerUtil { } packageNameRef[0] = packageName.length() == 0 ? "" : packageName; if (JUnitStarter.isJUnit5Preferred()) { - final PackageSelector selector = PackageSelector.forPackageName(packageName); - return builder.select(selector).build(); + final PackageSelector selector = DiscoverySelectors.selectPackage(packageName); + return builder.selectors(selector).build(); } } finally { @@ -75,7 +75,7 @@ public class JUnit5TestRunnerUtil { } final List mappedLines = lines.stream().map(line -> line.replaceFirst(",", "#")).collect(Collectors.toList()); - return builder.select(NameBasedSelector.forNames(mappedLines)).build(); + return builder.selectors(DiscoverySelectors.selectNames(mappedLines)).build(); } }