testng: update to latest version, ensure jcommander in user's classpath but user...
authorAnna Kozlova <anna.kozlova@jetbrains.com>
Wed, 24 Jun 2015 17:18:09 +0000 (20:18 +0300)
committerAnna Kozlova <anna.kozlova@jetbrains.com>
Wed, 24 Jun 2015 17:25:25 +0000 (20:25 +0300)
build/scripts/layouts.gant
plugins/testng/lib/jcommander.jar [new file with mode: 0644]
plugins/testng/lib/testng.jar
plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java
plugins/testng_rt/testng_rt.iml

index 6bb65781d3d3b73141826a19c4c7e10e6c6005f4..65e87e5844d5e3450fde9f9c375c6549e14c9405 100644 (file)
@@ -440,6 +440,7 @@ public def layoutCommunityPlugins(String home) {
 
         fileset(dir: "$home/plugins/testng/lib") {
           include(name: "testng.jar")
+          include(name: "jcommander.jar")
         }
       }
     }
diff --git a/plugins/testng/lib/jcommander.jar b/plugins/testng/lib/jcommander.jar
new file mode 100644 (file)
index 0000000..f949090
Binary files /dev/null and b/plugins/testng/lib/jcommander.jar differ
index 505188be0e5dbfb458d749874ec6af9bac86aedb..1d507190bcbcb15b93b89a782028bb54d9aa818c 100644 (file)
Binary files a/plugins/testng/lib/testng.jar and b/plugins/testng/lib/testng.jar differ
index 1e33a1c0e6a8cf7a3000f3763a3c1a717d668117..95a410d72f39253a4d703d6a0f7d6dee9ce14dda 100644 (file)
@@ -16,6 +16,7 @@
 
 package com.theoryinpractice.testng.configuration;
 
+import com.beust.jcommander.JCommander;
 import com.intellij.execution.*;
 import com.intellij.execution.configurations.*;
 import com.intellij.execution.process.*;
@@ -174,7 +175,7 @@ public class TestNGRunnableState extends JavaTestFrameworkRunnableState<TestNGCo
   @Override
   protected void configureClasspath(JavaParameters javaParameters) throws CantRunException {
     javaParameters.getClassPath().add(PathUtil.getJarPathForClass(RemoteTestNGStarter.class));
-    javaParameters.getClassPath().add(PathUtil.getJarPathForClass(AfterClass.class));
+    javaParameters.getClassPath().add(PathUtil.getJarPathForClass(JCommander.class));
 
     super.configureClasspath(javaParameters);
   }
index f347fc89bc27d999c54c8b48813e0ce05fa275ee..4989e8bb5c346c1c4ad39d8c8fd4d85216860a0a 100644 (file)
@@ -9,5 +9,14 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="TestNG" level="project" />
     <orderEntry type="module" module-name="java-runtime" />
+    <orderEntry type="module-library" exported="">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/../testng/lib/jcommander.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>
\ No newline at end of file