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 @@
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+