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

Merge remote-tracking branch 'origin/master' into idea14

Browse Source 
Original commit: 465dd45eae
This commit is contained in:
Nikolay Krasko
2014-07-02 09:21:40 +04:00
parent df9a6b73f5 ac3cbf547c
commit dac7ffbad2
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java
+2 -2
View File
@@ -267,8 +267,8 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase {
// Check that outputs are located properly
File facadeWithA = findFileInOutputDir(findModule("module1"), "test/TestPackage.class");
File facadeWithB = findFileInOutputDir(findModule("module2"), "test/TestPackage.class");
assertSameElements(getMethodsOfClass(facadeWithA), "a", "getA");
assertSameElements(getMethodsOfClass(facadeWithB), "b", "getB", "setB");
assertSameElements(getMethodsOfClass(facadeWithA), "<clinit>", "a", "getA");
assertSameElements(getMethodsOfClass(facadeWithB), "<clinit>", "b", "getB", "setB");
checkWhen(touch("module1/src/a.kt"), null, packageClasses("module1", "module1/src/a.kt", "test.TestPackage"));
checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage"));
jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/src/a.kt
+1 -1
View File
@@ -4,4 +4,4 @@ fun a() {
}
val a = ""
val a = ""
jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module2/src/b.kt
+1 -1
View File
@@ -4,4 +4,4 @@ fun b() {
}
var b = ""
var b = b()