From 1f628590190329a922c0327de6aa0a3bcfbb6920 Mon Sep 17 00:00:00 2001
From: Dmitry Gridin <dmitry.gridin@jetbrains.com>
Date: Mon, 14 Sep 2020 14:28:17 +0700
Subject: [PATCH] [CHERRY PICKED FROM IJ] [tests] fix
 KotlinModuleXmlGeneratorTest

GitOrigin-RevId: 7a00a761e6294793bff13cc0ea9b84d571fb714a
Original commit: https://github.com/JetBrains/intellij-community/commit/ab3886e11b285975f4e0eb4ea9f67e907de71e3c
---
 .../modules/KotlinModuleXmlGeneratorTest.java | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

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 ede464de4dc..af9b7ff2c75 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
@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.modules;
 import junit.framework.TestCase;
 import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType;
 import org.jetbrains.kotlin.build.JvmSourceRoot;
+import org.jetbrains.kotlin.idea.test.TestUtilsKt;
 import org.jetbrains.kotlin.test.KotlinTestUtils;
 
 import java.io.File;
@@ -26,7 +27,11 @@ import java.util.Arrays;
 import java.util.Collections;
 
 public class KotlinModuleXmlGeneratorTest extends TestCase {
-    public void testBasic() throws Exception {
+    private static String getTestDataPath() {
+        return TestUtilsKt.IDEA_TEST_DATA_DIR.getAbsolutePath() + "/modules.xml";
+    }
+
+    public void testBasic() {
         String actual = new KotlinModuleXmlBuilder().addModule(
                 "name",
                 "output",
@@ -40,10 +45,10 @@ public class KotlinModuleXmlGeneratorTest extends TestCase {
                 Collections.emptySet(),
                 Collections.emptyList()
         ).asText().toString();
-        KotlinTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/basic.xml"), actual);
+        KotlinTestUtils.assertEqualsToFile(new File(getTestDataPath() + "/basic.xml"), actual);
     }
 
-    public void testFiltered() throws Exception {
+    public void testFiltered() {
         String actual = new KotlinModuleXmlBuilder().addModule(
                 "name",
                 "output",
@@ -57,10 +62,10 @@ public class KotlinModuleXmlGeneratorTest extends TestCase {
                 Collections.singleton(new File("cp1")),
                 Collections.emptyList()
         ).asText().toString();
-        KotlinTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/filtered.xml"), actual);
+        KotlinTestUtils.assertEqualsToFile(new File(getTestDataPath() + "/filtered.xml"), actual);
     }
 
-    public void testMultiple() throws Exception {
+    public void testMultiple() {
         KotlinModuleXmlBuilder builder = new KotlinModuleXmlBuilder();
         builder.addModule(
                 "name",
@@ -89,10 +94,10 @@ public class KotlinModuleXmlGeneratorTest extends TestCase {
                 Collections.emptyList()
         );
         String actual = builder.asText().toString();
-        KotlinTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/multiple.xml"), actual);
+        KotlinTestUtils.assertEqualsToFile(new File(getTestDataPath() + "/multiple.xml"), actual);
     }
 
-    public void testModularJdkRoot() throws Exception {
+    public void testModularJdkRoot() {
         String actual = new KotlinModuleXmlBuilder().addModule(
                 "name",
                 "output",
@@ -106,6 +111,6 @@ public class KotlinModuleXmlGeneratorTest extends TestCase {
                 Collections.emptySet(),
                 Collections.emptyList()
         ).asText().toString();
-        KotlinTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/modularJdkRoot.xml"), actual);
+        KotlinTestUtils.assertEqualsToFile(new File(getTestDataPath() + "/modularJdkRoot.xml"), actual);
     }
 }