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

JPS JS: simplified the code and added tests for the missing meta.js case (e.g. empty sourceroot; fixed by yole in 00ed0248d9a23701dbef52da02259d174a9999e7)

Browse Source
This commit is contained in:
Anton Bannykh
2017-02-17 16:07:14 +03:00
parent 2d9392aad4
commit 6608e97d35
35 changed files with 235 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+6 -2
View File
@@ -371,6 +371,11 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
assertEquals(Collections.EMPTY_SET, contentOfOutputDir(PROJECT_NAME)) assertEquals(Collections.EMPTY_SET, contentOfOutputDir(PROJECT_NAME))
} }
fun testKotlinJavaScriptProjectWithEmptyDependencies() {
initProject(JS_STDLIB)
makeAll().assertSuccessful()
}
fun testKotlinJavaScriptProjectWithTests() { fun testKotlinJavaScriptProjectWithTests() {
initProject(JS_STDLIB) initProject(JS_STDLIB)
makeAll().assertSuccessful() makeAll().assertSuccessful()
@@ -387,9 +392,8 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
buildResult.assertSuccessful() buildResult.assertSuccessful()
val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING) val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING)
assertEquals("Warning about duplicate module definition: $warnings", 2, warnings.size) assertEquals("Warning about duplicate module definition: $warnings", 1, warnings.size)
assertEquals("Module \"srcAndTests\" is defined in more, than one file", warnings[0].messageText) assertEquals("Module \"srcAndTests\" is defined in more, than one file", warnings[0].messageText)
assertEquals("Module \"srcAndTests\" is defined in more, than one file", warnings[1].messageText)
} }
fun testKotlinJavaScriptProjectWithTwoSrcModuleDependency() { fun testKotlinJavaScriptProjectWithTwoSrcModuleDependency() {
jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt
+5 -15
View File
@@ -50,22 +50,12 @@ object JpsJsModuleUtils {
override fun consume(module: JpsModule) { override fun consume(module: JpsModule) {
if (module.moduleType != JpsJavaModuleType.INSTANCE) return if (module.moduleType != JpsJavaModuleType.INSTANCE) return
var yieldProduction = module != target.module || target.isTests if ((module != target.module || target.isTests) && module.sourceRoots.any { it.rootType == JavaSourceRootType.SOURCE}) {
var yieldTests = module != target.module addTarget(module, JavaModuleBuildTargetType.PRODUCTION)
}
module.sourceRoots.forEach { if (module != target.module && target.isTests && module.sourceRoots.any { it.rootType == JavaSourceRootType.TEST_SOURCE}) {
if (it.rootType == JavaSourceRootType.SOURCE) { addTarget(module, JavaModuleBuildTargetType.TEST)
if (yieldProduction) {
addTarget(module, JavaModuleBuildTargetType.PRODUCTION)
yieldProduction = false
}
}
else {
if (yieldTests) {
addTarget(module, JavaModuleBuildTargetType.TEST)
yieldTests = false
}
}
} }
} }
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrc/emptySrc.iml
Vendored
+11
View File
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrc/src/dummy
Vendored
View File
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/emptySrcEmptyTests.iml
Vendored
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />i
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/src/dummy
Vendored
View File
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/test/dummy
Vendored
View File
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcMissingTests/emptySrcMissingTests.iml
Vendored
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />i
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcMissingTests/src/dummy
Vendored
View File
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptyTests/emptyTests.iml
Vendored
+11
View File
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptyTests/test/dummy
Vendored
View File
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/kotlinProject.iml
Vendored
+25
View File
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="emptySrc" />
<orderEntry type="module" module-name="missingSrc" />
<orderEntry type="module" module-name="emptyTests" />
<orderEntry type="module" module-name="missingTests" />
<orderEntry type="module" module-name="srcEmptyTests" />
<orderEntry type="module" module-name="srcMissingTests" />
<orderEntry type="module" module-name="testsEmptySrc" />
<orderEntry type="module" module-name="testsMissingSrc" />
<orderEntry type="module" module-name="emptySrcEmptyTests" />
<orderEntry type="module" module-name="emptySrcMissingTests" />
<orderEntry type="module" module-name="missingSrcEmptyTests" />
<orderEntry type="module" module-name="missingSrcMissingTests" />
<orderEntry type="module" module-name="missingModule" />
</component>
</module>
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/kotlinProject.ipr
Vendored
+27
View File
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
</component>
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/emptySrc/emptySrc.iml" filepath="$PROJECT_DIR$/emptySrc/emptySrc.iml" />
<module fileurl="file://$PROJECT_DIR$/missingSrc/missingSrc.iml" filepath="$PROJECT_DIR$/missingSrc/missingSrc.iml" />
<module fileurl="file://$PROJECT_DIR$/emptyTests/emptyTests.iml" filepath="$PROJECT_DIR$/emptyTests/emptyTests.iml" />
<module fileurl="file://$PROJECT_DIR$/missingTests/missingTests.iml" filepath="$PROJECT_DIR$/missingTests/missingTests.iml" />
<module fileurl="file://$PROJECT_DIR$/srcEmptyTests/srcEmptyTests.iml" filepath="$PROJECT_DIR$/srcEmptyTests/srcEmptyTests.iml" />
<module fileurl="file://$PROJECT_DIR$/srcMissingTests/srcMissingTests.iml" filepath="$PROJECT_DIR$/srcMissingTests/srcMissingTests.iml" />
<module fileurl="file://$PROJECT_DIR$/testsEmptySrc/testsEmptySrc.iml" filepath="$PROJECT_DIR$/testsEmptySrc/testsEmptySrc.iml" />
<module fileurl="file://$PROJECT_DIR$/testsMissingSrc/testsMissingSrc.iml" filepath="$PROJECT_DIR$/testsMissingSrc/testsMissingSrc.iml" />
<module fileurl="file://$PROJECT_DIR$/emptySrcEmptyTests/emptySrcEmptyTests.iml" filepath="$PROJECT_DIR$/emptySrcEmptyTests/emptySrcEmptyTests.iml" />
<module fileurl="file://$PROJECT_DIR$/emptySrcMissingTests/emptySrcMissingTests.iml" filepath="$PROJECT_DIR$/emptySrcMissingTests/emptySrcMissingTests.iml" />
<module fileurl="file://$PROJECT_DIR$/missingSrcEmptyTests/missingSrcEmptyTests.iml" filepath="$PROJECT_DIR$/missingSrcEmptyTests/missingSrcEmptyTests.iml" />
<module fileurl="file://$PROJECT_DIR$/missingSrcMissingTests/missingSrcMissingTests.iml" filepath="$PROJECT_DIR$/missingSrcMissingTests/missingSrcMissingTests.iml" />
<module fileurl="file://$PROJECT_DIR$/missingModule/missingModule.iml" filepath="$PROJECT_DIR$/missingModule/missingModule.iml" />
<module fileurl="file://$PROJECT_DIR$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrc/missingSrc.iml
Vendored
+11
View File
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcEmptyTests/missingSrcEmptyTests.iml
Vendored
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />i
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcEmptyTests/test/dummy
Vendored
View File
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcMissingTests/missingSrcMissingTests.iml
Vendored
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />i
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingTests/missingTests.iml
Vendored
+11
View File
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/src/Main.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
fun main() {
srcEmptyTestsSrc()
srcMissingTestsSrc()
}
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/src/SrcEmptyTests.kt
Vendored
+1
View File
@@ -0,0 +1 @@
fun srcEmptyTestsSrc() {}
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/srcEmptyTests.iml
Vendored
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />i
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/test/dummy
Vendored
View File
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcMissingTests/src/SrcMissingTests.kt
Vendored
+1
View File
@@ -0,0 +1 @@
fun srcMissingTestsSrc() {}
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcMissingTests/srcMissingTests.iml
Vendored
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />i
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/test/MainTest.kt
Vendored
+4
View File
@@ -0,0 +1,4 @@
fun test() {
testsEmptySrcTest()
testsMissingSrcTest()
}
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/src/dummy
Vendored
View File
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/test/TestsEmptySrc.kt
Vendored
+1
View File
@@ -0,0 +1 @@
fun testsEmptySrcTest() {}
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/testsEmptySrc.iml
Vendored
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />i
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsMissingSrc/test/TestsMissingSrc.kt
Vendored
+1
View File
@@ -0,0 +1 @@
fun testsMissingSrcTest() {}
jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsMissingSrc/testsMissingSrc.iml
Vendored
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />i
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/src/Main.kt
Vendored
+4
View File
@@ -1,3 +1,7 @@
import src.*
import test.*
fun main() { fun main() {
srcAndTests() srcAndTests()
ambiguous()
} }
jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/SrcAndTests.kt
Vendored
+4
View File
@@ -1 +1,5 @@
package src
fun srcAndTests() {} fun srcAndTests() {}
fun ambiguous() {}
jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/test.kt
Vendored
+3
View File
@@ -0,0 +1,3 @@
package test
private fun dummy() {}
jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/tests/SrcAndTestsTests.kt
Vendored
+6
View File
@@ -1,3 +1,9 @@
package test
import src.srcAndTests
fun testSrcAndTests() { fun testSrcAndTests() {
srcAndTests() srcAndTests()
} }
fun ambiguous() {}
jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/tests/MainTests.kt
Vendored
+3
View File
@@ -1,3 +1,6 @@
import src.*
import test.*
fun testMain() { fun testMain() {
main() main()
srcAndTests() srcAndTests()