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: adjust vintage engine version to platform version

Browse Source
This commit is contained in:
Anna.Kozlova
2017-12-06 14:54:25 +01:00
parent 557706a1df
commit 07fc70b084
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/junit/src/com/intellij/execution/junit/TestObject.java
+4 -5
View File
@@ -201,12 +201,11 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
public static void appendJUnit5LauncherClasses(JavaParameters javaParameters, Project project, GlobalSearchScope globalSearchScope) throws CantRunException{
final PathsList classPath = javaParameters.getClassPath();
JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project);
PsiClass classFromCommon = DumbService.getInstance(project).computeWithAlternativeResolveEnabled(() -> psiFacade.findClass("org.junit.platform.commons.JUnitException", globalSearchScope));
String launcherVersion = ObjectUtils.notNull(getVersion(classFromCommon), "1.0.0");
if (!hasPackageWithDirectories(psiFacade, "org.junit.platform.launcher", globalSearchScope)) {
PsiClass classFromCommon = DumbService.getInstance(project).computeWithAlternativeResolveEnabled(() -> psiFacade.findClass("org.junit.platform.commons.JUnitException", globalSearchScope));
String version = ObjectUtils.notNull(getVersion(classFromCommon), "1.0.0");
downloadDependenciesWhenRequired(project, classPath,
new RepositoryLibraryProperties("org.junit.platform", "junit-platform-launcher", version));
new RepositoryLibraryProperties("org.junit.platform", "junit-platform-launcher", launcherVersion));
}
//add standard engines only if no engine api is present
@@ -222,7 +221,7 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
if (!hasPackageWithDirectories(psiFacade, "org.junit.vintage", globalSearchScope) &&
hasPackageWithDirectories(psiFacade, "junit.framework", globalSearchScope)) {
String version = "4.12.0"; //todo
String version = "4.12." + StringUtil.getShortName(launcherVersion);
downloadDependenciesWhenRequired(project, classPath,
new RepositoryLibraryProperties("org.junit.vintage", "junit-vintage-engine", version));
}