From 8d2755db4fcc7f16ee7b579933265b83efa4d156 Mon Sep 17 00:00:00 2001
From: Nikita Bobko <nikita.bobko@jetbrains.com>
Date: Mon, 20 Dec 2021 14:44:17 +0100
Subject: [PATCH] Fix KotlinModuleXmlGeneratorTest

modules.xml testData was renamed from idea/testData/modules.xml/
---
 .../modules/KotlinModuleXmlGeneratorTest.java | 11 +++++---
 jps/jps-plugin/testData/modules.xml/basic.xml | 12 +++++++++
 .../testData/modules.xml/filtered.xml         | 14 ++++++++++
 .../testData/modules.xml/modularJdkRoot.xml   |  8 ++++++
 .../testData/modules.xml/multiple.xml         | 26 +++++++++++++++++++
 5 files changed, 67 insertions(+), 4 deletions(-)
 create mode 100644 jps/jps-plugin/testData/modules.xml/basic.xml
 create mode 100644 jps/jps-plugin/testData/modules.xml/filtered.xml
 create mode 100644 jps/jps-plugin/testData/modules.xml/modularJdkRoot.xml
 create mode 100644 jps/jps-plugin/testData/modules.xml/multiple.xml

diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java
index e65a38b48d4..0a228404d7b 100644
--- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java
+++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java
@@ -21,12 +21,15 @@ import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType;
 import org.jetbrains.kotlin.build.JvmSourceRoot;
 import org.jetbrains.kotlin.config.IncrementalCompilation;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
+import org.jetbrains.kotlin.test.util.KtTestUtil;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.Collections;
 
 public class KotlinModuleXmlGeneratorTest extends TestCase {
+    private final static String testDataPath = "jps-plugin/testData/modules.xml";
+
     public void testBasic() {
         String actual = new KotlinModuleXmlBuilder().addModule(
                 "name",
@@ -42,7 +45,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase {
                 Collections.emptyList(),
                 IncrementalCompilation.isEnabledForJvm()
         ).asText().toString();
-        KotlinTestUtils.assertEqualsToFile(new File("/basic.xml"), actual);
+        KotlinTestUtils.assertEqualsToFile(new File(testDataPath + "/basic.xml"), actual);
     }
 
     public void testFiltered() {
@@ -60,7 +63,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase {
                 Collections.emptyList(),
                 IncrementalCompilation.isEnabledForJvm()
         ).asText().toString();
-        KotlinTestUtils.assertEqualsToFile(new File("/filtered.xml"), actual);
+        KotlinTestUtils.assertEqualsToFile(new File(testDataPath + "/filtered.xml"), actual);
     }
 
     public void testMultiple() {
@@ -94,7 +97,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase {
                 IncrementalCompilation.isEnabledForJvm()
         );
         String actual = builder.asText().toString();
-        KotlinTestUtils.assertEqualsToFile(new File("/multiple.xml"), actual);
+        KotlinTestUtils.assertEqualsToFile(new File(testDataPath + "/multiple.xml"), actual);
     }
 
     public void testModularJdkRoot() {
@@ -112,6 +115,6 @@ public class KotlinModuleXmlGeneratorTest extends TestCase {
                 Collections.emptyList(),
                 IncrementalCompilation.isEnabledForJvm()
         ).asText().toString();
-        KotlinTestUtils.assertEqualsToFile(new File("/modularJdkRoot.xml"), actual);
+        KotlinTestUtils.assertEqualsToFile(new File(testDataPath + "/modularJdkRoot.xml"), actual);
     }
 }
diff --git a/jps/jps-plugin/testData/modules.xml/basic.xml b/jps/jps-plugin/testData/modules.xml/basic.xml
new file mode 100644
index 00000000000..a11e90c32c0
--- /dev/null
+++ b/jps/jps-plugin/testData/modules.xml/basic.xml
@@ -0,0 +1,12 @@
+<modules>
+    <!-- Module script for production -->
+    <module name="name" type="java-production" outputDir="output">
+        <sources path="s1"/>
+        <sources path="s2"/>
+        <!-- Java source roots -->
+        <javaSourceRoots path="java"/>
+        <!-- Classpath -->
+        <classpath path="cp1"/>
+        <classpath path="cp2"/>
+    </module>
+</modules>
diff --git a/jps/jps-plugin/testData/modules.xml/filtered.xml b/jps/jps-plugin/testData/modules.xml/filtered.xml
new file mode 100644
index 00000000000..8523409914a
--- /dev/null
+++ b/jps/jps-plugin/testData/modules.xml/filtered.xml
@@ -0,0 +1,14 @@
+<modules>
+    <!-- Module script for production -->
+    <module name="name" type="java-production" outputDir="output">
+        <sources path="s1"/>
+        <sources path="s2"/>
+        <!-- Java source roots -->
+        <!-- Classpath -->
+        <!-- Output directory, commented out -->
+        <!--
+            <classpath path="cp1"/>
+        -->
+        <classpath path="cp2"/>
+    </module>
+</modules>
diff --git a/jps/jps-plugin/testData/modules.xml/modularJdkRoot.xml b/jps/jps-plugin/testData/modules.xml/modularJdkRoot.xml
new file mode 100644
index 00000000000..ca7614f1d16
--- /dev/null
+++ b/jps/jps-plugin/testData/modules.xml/modularJdkRoot.xml
@@ -0,0 +1,8 @@
+<modules>
+    <!-- Module script for production -->
+    <module name="name" type="java-production" outputDir="output">
+        <!-- Java source roots -->
+        <!-- Classpath -->
+        <modularJdkRoot path="/path/to/modular/jdk"/>
+    </module>
+</modules>
diff --git a/jps/jps-plugin/testData/modules.xml/multiple.xml b/jps/jps-plugin/testData/modules.xml/multiple.xml
new file mode 100644
index 00000000000..b864bb030b1
--- /dev/null
+++ b/jps/jps-plugin/testData/modules.xml/multiple.xml
@@ -0,0 +1,26 @@
+<modules>
+    <!-- Module script for production -->
+    <module name="name" type="java-production" outputDir="output">
+        <sources path="s1"/>
+        <sources path="s2"/>
+        <!-- Java source roots -->
+        <!-- Classpath -->
+        <!-- Output directory, commented out -->
+        <!--
+            <classpath path="cp1"/>
+        -->
+        <classpath path="cp2"/>
+    </module>
+    <!-- Module script for tests -->
+    <module name="name2" type="java-test" outputDir="output2">
+        <sources path="s12"/>
+        <sources path="s22"/>
+        <!-- Java source roots -->
+        <!-- Classpath -->
+        <!-- Output directory, commented out -->
+        <!--
+            <classpath path="cp12"/>
+        -->
+        <classpath path="cp22"/>
+    </module>
+</modules>