From 5b36b24426bcae962588c0b504ca7b525e31656f Mon Sep 17 00:00:00 2001 From: anna Date: Tue, 5 Apr 2011 11:44:15 +0200 Subject: [PATCH] do not override user's testng.jar (IDEA-67411) --- .../testng/configuration/TestNGRunnableState.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java index 7e499c6e5824..4ea1d9e62dc7 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java @@ -249,10 +249,7 @@ public class TestNGRunnableState extends JavaCommandLineState { LOG.info("Language level is " + effectiveLanguageLevel.toString()); LOG.info("is15 is " + is15); - // Add plugin jars first... - javaParameters.getClassPath().add(is15 ? PathUtil.getJarPathForClass(AfterClass.class) : //testng-jdk15.jar - new File(PathManager.getPreinstalledPluginsPath(), "testng/lib-jdk14/testng-jdk14.jar") - .getPath());//todo !do not hard code lib name! + // Configure rest of jars JavaParametersUtil.configureConfiguration(javaParameters, config); Sdk jdk = module == null ? ProjectRootManager.getInstance(project).getProjectSdk() : ModuleRootManager.getInstance(module).getSdk(); @@ -280,6 +277,10 @@ public class TestNGRunnableState extends JavaCommandLineState { config.ALTERNATIVE_JRE_PATH_ENABLED ? config.ALTERNATIVE_JRE_PATH : null); } + javaParameters.getClassPath().add(is15 ? PathUtil.getJarPathForClass(AfterClass.class) : //testng-jdk15.jar + new File(PathManager.getPreinstalledPluginsPath(), "testng/lib-jdk14/testng-jdk14.jar") + .getPath());//todo !do not hard code lib name! + try { port = NetUtils.findAvailableSocketPort(); }