azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix KotlinModuleXmlGeneratorTest

Browse Source 
modules.xml testData was renamed from idea/testData/modules.xml/
This commit is contained in:
Nikita Bobko
2021-12-20 14:44:17 +01:00
parent 735d46efb4
commit 8d2755db4f
5 changed files with 67 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java
+7 -4
View File
@@ -21,12 +21,15 @@ import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType;
import org.jetbrains.kotlin.build.JvmSourceRoot; import org.jetbrains.kotlin.build.JvmSourceRoot;
import org.jetbrains.kotlin.config.IncrementalCompilation; import org.jetbrains.kotlin.config.IncrementalCompilation;
import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.KotlinTestUtils;
import org.jetbrains.kotlin.test.util.KtTestUtil;
import java.io.File; import java.io.File;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
public class KotlinModuleXmlGeneratorTest extends TestCase { public class KotlinModuleXmlGeneratorTest extends TestCase {
private final static String testDataPath = "jps-plugin/testData/modules.xml";
public void testBasic() { public void testBasic() {
String actual = new KotlinModuleXmlBuilder().addModule( String actual = new KotlinModuleXmlBuilder().addModule(
"name", "name",
@@ -42,7 +45,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase {
Collections.emptyList(), Collections.emptyList(),
IncrementalCompilation.isEnabledForJvm() IncrementalCompilation.isEnabledForJvm()
).asText().toString(); ).asText().toString();
KotlinTestUtils.assertEqualsToFile(new File("/basic.xml"), actual); KotlinTestUtils.assertEqualsToFile(new File(testDataPath + "/basic.xml"), actual);
} }
public void testFiltered() { public void testFiltered() {
@@ -60,7 +63,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase {
Collections.emptyList(), Collections.emptyList(),
IncrementalCompilation.isEnabledForJvm() IncrementalCompilation.isEnabledForJvm()
).asText().toString(); ).asText().toString();
KotlinTestUtils.assertEqualsToFile(new File("/filtered.xml"), actual); KotlinTestUtils.assertEqualsToFile(new File(testDataPath + "/filtered.xml"), actual);
} }
public void testMultiple() { public void testMultiple() {
@@ -94,7 +97,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase {
IncrementalCompilation.isEnabledForJvm() IncrementalCompilation.isEnabledForJvm()
); );
String actual = builder.asText().toString(); String actual = builder.asText().toString();
KotlinTestUtils.assertEqualsToFile(new File("/multiple.xml"), actual); KotlinTestUtils.assertEqualsToFile(new File(testDataPath + "/multiple.xml"), actual);
} }
public void testModularJdkRoot() { public void testModularJdkRoot() {
@@ -112,6 +115,6 @@ public class KotlinModuleXmlGeneratorTest extends TestCase {
Collections.emptyList(), Collections.emptyList(),
IncrementalCompilation.isEnabledForJvm() IncrementalCompilation.isEnabledForJvm()
).asText().toString(); ).asText().toString();
KotlinTestUtils.assertEqualsToFile(new File("/modularJdkRoot.xml"), actual); KotlinTestUtils.assertEqualsToFile(new File(testDataPath + "/modularJdkRoot.xml"), actual);
} }
} }
jps/jps-plugin/testData/modules.xml/basic.xml
Vendored
+12
View File
@@ -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>
jps/jps-plugin/testData/modules.xml/filtered.xml
Vendored
+14
View File
@@ -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>
jps/jps-plugin/testData/modules.xml/modularJdkRoot.xml
Vendored
+8
View File
@@ -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>
jps/jps-plugin/testData/modules.xml/multiple.xml
Vendored
+26
View File
@@ -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>