Snapshot idea/138.2210 from git://git.jetbrains.org/idea/community.git

Change-Id: I8f0204d7887ee78cf1fd8c09f936c5afff0edd2f

1 files changed, 11 insertions, 0 deletions

diff --git a/java/java-tests/testSrc/com/intellij/execution/configurations/JavaCommandLineTest.java b/java/java-tests/testSrc/com/intellij/execution/configurations/JavaCommandLineTest.java
index 2708ac91181c..e4d0bc039c5d 100644
--- a/java/java-tests/testSrc/com/intellij/execution/configurations/JavaCommandLineTest.java
+++ b/java/java-tests/testSrc/com/intellij/execution/configurations/JavaCommandLineTest.java
@@ -48,6 +48,14 @@ public class JavaCommandLineTest extends LightIdeaTestCase {
     }
   }
 
+  public void testJarParameter() throws CantRunException {
+    JavaParameters javaParameters = new JavaParameters();
+    javaParameters.setJdk(getProjectJDK());
+    javaParameters.setJarPath("my-jar-file.jar");
+    String commandLineString = CommandLineBuilder.createFromJavaParameters(javaParameters).getCommandLineString();
+    assertTrue(commandLineString, commandLineString.contains("-jar my-jar-file.jar"));
+  }
+
   public void testClasspath() throws CantRunException {
     JavaParameters javaParameters;
     String commandLineString;
@@ -55,12 +63,14 @@ public class JavaCommandLineTest extends LightIdeaTestCase {
     javaParameters = new JavaParameters();
     final Sdk internalJdk = JavaAwareProjectJdkTableImpl.getInstanceEx().getInternalJdk();
     javaParameters.setJdk(internalJdk);
+    javaParameters.getClassPath().add("my-jar-file.jar");
     javaParameters.setMainClass("Main");
     commandLineString = CommandLineBuilder.createFromJavaParameters(javaParameters).getCommandLineString();
     assertTrue(containsClassPath(commandLineString));
 
     javaParameters = new JavaParameters();
     javaParameters.setJdk(internalJdk);
+    javaParameters.getClassPath().add("my-jar-file.jar");
     javaParameters.setMainClass("Main");
     javaParameters.getVMParametersList().add("-cp");
     javaParameters.getVMParametersList().add("..");
@@ -70,6 +80,7 @@ public class JavaCommandLineTest extends LightIdeaTestCase {
 
     javaParameters = new JavaParameters();
     javaParameters.setJdk(internalJdk);
+    javaParameters.getClassPath().add("my-jar-file.jar");
     javaParameters.setMainClass("Main");
     javaParameters.getVMParametersList().add("-classpath");
     javaParameters.getVMParametersList().add("..");