diff --git a/.idea/libraries/junit5_rt.xml b/.idea/libraries/junit5_rt.xml index 489be9b7a6ef..bc110394ca33 100644 --- a/.idea/libraries/junit5_rt.xml +++ b/.idea/libraries/junit5_rt.xml @@ -1,12 +1,12 @@ - - - - - - + + + + + + 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-M2.jar similarity index 87% rename from plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M1.jar rename to plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M2.jar index 0e95c891e5ab..18427e30b541 100644 Binary files a/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M1.jar and b/plugins/junit5_rt/lib/junit-jupiter-engine-5.0.0-M2.jar 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-M2.jar similarity index 72% rename from plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M1.jar rename to plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M2.jar index 46adfc539f53..b1c5a3d25d83 100644 Binary files a/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M1.jar and b/plugins/junit5_rt/lib/junit-platform-commons-1.0.0-M2.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-M2.jar similarity index 66% rename from plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M1.jar rename to plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M2.jar index 4d21cbdf1fac..df0698229f0e 100644 Binary files a/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M1.jar and b/plugins/junit5_rt/lib/junit-platform-engine-1.0.0-M2.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-M2.jar similarity index 65% rename from plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M1.jar rename to plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M2.jar index b60c1a0ce567..2bad6c0e937a 100644 Binary files a/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M1.jar and b/plugins/junit5_rt/lib/junit-platform-launcher-1.0.0-M2.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-M2.jar similarity index 67% rename from plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M1.jar rename to plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M2.jar index a748c977d4ec..a97da797470d 100644 Binary files a/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M1.jar and b/plugins/junit5_rt/lib/junit-platform-runner-1.0.0-M2.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-M2.jar similarity index 89% rename from plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M1.jar rename to plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M2.jar index a081e7bda54e..328ef8785b78 100644 Binary files a/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M1.jar and b/plugins/junit5_rt/lib/junit-vintage-engine-4.12.0-M2.jar differ diff --git a/plugins/junit5_rt/src/com/intellij/junit5/JUnit5TestRunnerUtil.java b/plugins/junit5_rt/src/com/intellij/junit5/JUnit5TestRunnerUtil.java index fb945600ac3b..b2247b57ef0a 100644 --- a/plugins/junit5_rt/src/com/intellij/junit5/JUnit5TestRunnerUtil.java +++ b/plugins/junit5_rt/src/com/intellij/junit5/JUnit5TestRunnerUtil.java @@ -15,9 +15,9 @@ */ package com.intellij.junit5; -import com.intellij.rt.execution.junit.JUnitStarter; +import org.junit.platform.engine.DiscoverySelector; import org.junit.platform.engine.discovery.DiscoverySelectors; -import org.junit.platform.engine.discovery.PackageSelector; +import org.junit.platform.engine.discovery.MethodSelector; import org.junit.platform.launcher.LauncherDiscoveryRequest; import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder; @@ -25,9 +25,7 @@ import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; public class JUnit5TestRunnerUtil { @@ -37,7 +35,6 @@ public class JUnit5TestRunnerUtil { } final LauncherDiscoveryRequestBuilder builder = LauncherDiscoveryRequestBuilder.request(); - final List lines = new ArrayList<>(); if (suiteClassNames.length == 1 && suiteClassNames[0].charAt(0) == '@') { @@ -52,11 +49,12 @@ public class JUnit5TestRunnerUtil { final String categoryName = reader.readLine(); String line; + List selectors = new ArrayList<>(); while ((line = reader.readLine()) != null) { - lines.add(line); + selectors.add(createSelector(line)); } packageNameRef[0] = packageName.length() == 0 ? "" : packageName; - return builder.selectors(DiscoverySelectors.selectPackage(packageName)).build(); + return builder.selectors(selectors).build(); } finally { reader.close(); @@ -68,11 +66,18 @@ public class JUnit5TestRunnerUtil { } } else { - Collections.addAll(lines, suiteClassNames); + return builder.selectors(createSelector(suiteClassNames[0])).build(); } - final List mappedLines = lines.stream().map(line -> line.replaceFirst(",", "#")).collect(Collectors.toList()); - return builder.selectors(DiscoverySelectors.selectNames(mappedLines)).build(); + return null; } + protected static DiscoverySelector createSelector(String line) { + if (line.contains(",")) { + return DiscoverySelectors.selectMethod(line.replaceFirst(",", "#")); + } + else { + return DiscoverySelectors.selectClass(line); + } + } }