junit compatibility with old IDEA SDKs: ensure current idea_rt.jar is used to run tests

This commit is contained in:
Anna Kozlova
2015-05-12 21:42:58 +02:00
parent 0eef7d3101
commit b5b83f0273
2 changed files with 4 additions and 5 deletions
@@ -109,7 +109,7 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
return null;
}
getJavaParameters().getVMParametersList().addProperty("idea." + getFrameworkId() + ".sm_runner");
getJavaParameters().getClassPath().add(PathUtil.getJarPathForClass(ServiceMessageTypes.class));
getJavaParameters().getClassPath().addFirst(PathUtil.getJarPathForClass(ServiceMessageTypes.class));
final RunnerSettings runnerSettings = getRunnerSettings();
@@ -191,8 +191,7 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
finally {
getConfiguration().setProgramParameters(parameters);
}
JavaSdkUtil.addRtJar(javaParameters.getClassPath());
javaParameters.getClassPath().addFirst(JavaSdkUtil.getIdeaRtJarPath());
configureClasspath(javaParameters);
if (!StringUtil.isEmptyOrSpaces(parameters)) {