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

Add JpsTests for inheritance (J-K-J, K-J-K)

Browse Source 
Original commit: 1824879dd0
This commit is contained in:
Natalia.Ukhorskaya
2012-12-06 18:50:10 +04:00
parent 99d77e3593
commit 40efae0050
11 changed files with 104 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java
+14 -1
View File
@@ -20,7 +20,6 @@ import com.intellij.openapi.util.io.FileUtil;
import org.jetbrains.jps.model.java.*;
import java.io.File;
import java.io.IOException;
public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase {
private static final String PROJECT_NAME = "kotlinProject";
@@ -49,6 +48,12 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase {
makeAll().assertSuccessful();
}
public void doTestWithRuntime() {
initProject();
addKotlinRuntimeDependency();
makeAll().assertSuccessful();
}
public void testKotlinProject() {
doTest();
}
@@ -69,6 +74,14 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase {
doTest();
}
public void testJKJInheritanceProject() {
doTestWithRuntime();
}
public void testKJKInheritanceProject() {
doTestWithRuntime();
}
public void testTestDependencyLibrary() throws Throwable {
initProject();
addKotlinRuntimeDependency(JpsJavaDependencyScope.TEST);
jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.iml
+13
View File
@@ -0,0 +1,13 @@
<?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="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="kotlinProject" />
<orderEntry type="library" name="KotlinRuntime" level="project" />
</component>
</module>
jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.ipr
+14
View File
@@ -0,0 +1,14 @@
<?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$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
jps/jps-plugin/testData/JKJInheritanceProject/src/java/JFirst.java
+7
View File
@@ -0,0 +1,7 @@
package java;
public class JFirst {
public void foo() {
}
}
jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java
+7
View File
@@ -0,0 +1,7 @@
package java;
public class JSecond extends kotlin.KFirst {
public void bar() {
foo();
}
}
jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt
+5
View File
@@ -0,0 +1,5 @@
package kotlin
open class KFirst(): java.JFirst() {
}
jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.iml
+13
View File
@@ -0,0 +1,13 @@
<?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="jdk" jdkName="IDEA_JDK" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="kotlinProject" />
</component>
</module>
jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.ipr
+14
View File
@@ -0,0 +1,14 @@
<?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$/kotlinProject.iml" filepath="$PROJECT_DIR$/kotlinProject.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA_JDK" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java
+4
View File
@@ -0,0 +1,4 @@
package java;
public class JFirst extends kotlin.KFirst {
}
jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt
+6
View File
@@ -0,0 +1,6 @@
package kotlin
open class KFirst() {
fun foo() {
}
}
jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt
+7
View File
@@ -0,0 +1,7 @@
package kotlin
class KSecond(): java.JFirst() {
fun bar() {
foo()
}
}