From 95a1b1bed03a4dfb9ad5d9ffdc531ee598c7d2cb Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Tue, 6 Nov 2018 14:54:00 +0300
Subject: [PATCH] build scripts: use default values of JUnit run configuration
 options if they are missing in xml file (IDEA-201665)

---
 .../build/impl/JUnitRunConfigurationProperties.groovy      | 4 ++--
 .../build/runConfigurations/test_default_options.xml       | 7 +++++++
 .../intellij/build/JUnitRunConfigurationPropertiesTest.kt  | 7 +++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 platform/build-scripts/tests/testResources/org/jetbrains/intellij/build/runConfigurations/test_default_options.xml

diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JUnitRunConfigurationProperties.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JUnitRunConfigurationProperties.groovy
index 73eebfc473e9..49ce10dde91a 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JUnitRunConfigurationProperties.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/JUnitRunConfigurationProperties.groovy
@@ -27,7 +27,7 @@ class JUnitRunConfigurationProperties extends RunConfigurationProperties {
       messages.error("Cannot run configuration from '$file.name': module name is not specified")
     }
     Map<String, String> options = configuration.option?.collectEntries { [it.@name, it.@value] }
-    def testKind = options["TEST_OBJECT"]
+    def testKind = options["TEST_OBJECT"] ?: "class"
     List<String> testClassPatterns
     if (testKind == "class") {
       testClassPatterns = [options["MAIN_CLASS_NAME"]]
@@ -53,7 +53,7 @@ class JUnitRunConfigurationProperties extends RunConfigurationProperties {
             find { it.@name == "BuildArtifacts" && it.@enabled == "true" }?.
             artifact?.collect { it.@name } ?: []
 
-    def vmParameters = options["VM_PARAMETERS"].tokenize()
+    def vmParameters = (options["VM_PARAMETERS"] ?: "-ea").tokenize()
     def envVariables = first(configuration.envs)?.env?.collectEntries { [it.@name, it.@value] } ?: [:]
     return new JUnitRunConfigurationProperties(configuration.@name, moduleName, testClassPatterns, vmParameters, requiredArtifacts, envVariables)
   }
diff --git a/platform/build-scripts/tests/testResources/org/jetbrains/intellij/build/runConfigurations/test_default_options.xml b/platform/build-scripts/tests/testResources/org/jetbrains/intellij/build/runConfigurations/test_default_options.xml
new file mode 100644
index 000000000000..72094f891a90
--- /dev/null
+++ b/platform/build-scripts/tests/testResources/org/jetbrains/intellij/build/runConfigurations/test_default_options.xml
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="test default options" type="JUnit" factoryName="JUnit">
+    <module name="main-module"/>
+    <option name="MAIN_CLASS_NAME" value="com.example.test.MainTest"/>
+    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/bin"/>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/platform/build-scripts/tests/testSrc/org/jetbrains/intellij/build/JUnitRunConfigurationPropertiesTest.kt b/platform/build-scripts/tests/testSrc/org/jetbrains/intellij/build/JUnitRunConfigurationPropertiesTest.kt
index c296348aeb19..df30c5dc42ee 100644
--- a/platform/build-scripts/tests/testSrc/org/jetbrains/intellij/build/JUnitRunConfigurationPropertiesTest.kt
+++ b/platform/build-scripts/tests/testSrc/org/jetbrains/intellij/build/JUnitRunConfigurationPropertiesTest.kt
@@ -46,6 +46,13 @@ class JUnitRunConfigurationPropertiesTest {
     loadRunConfiguration("test_method_fork_mode.xml")
   }
 
+  @Test
+  fun `load default options`() {
+    val properties = loadRunConfiguration("test_default_options.xml")
+    assertEquals(listOf("com.example.test.MainTest"), properties.testClassPatterns)
+    assertEquals(listOf("-ea"), properties.vmParameters)
+  }
+
   private fun loadRunConfiguration(fileName: String): JUnitRunConfigurationProperties {
     val url = JUnitRunConfigurationPropertiesTest::class.java.getResource("runConfigurations/$fileName")
     return JUnitRunConfigurationProperties.loadRunConfiguration(URLUtil.urlToFile(url), MockBuildMessages())