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

tests fixed

Browse Source 
Original commit: b60621c428
This commit is contained in:
Dmitry Jemerov
2016-01-14 18:45:09 +01:00
parent 7998e7884c
commit 4e8365084f
8 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt
+2 -2
View File
@@ -551,7 +551,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
fun testCircularDependencyWithReferenceToOldVersionLib() { fun testCircularDependencyWithReferenceToOldVersionLib() {
initProject() initProject()
val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false) val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false, false)
AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module1"), findModule("module2")), false, "module-lib", libraryJar) AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module1"), findModule("module2")), false, "module-lib", libraryJar)
@@ -562,7 +562,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
fun testDependencyToOldKotlinLib() { fun testDependencyToOldKotlinLib() {
initProject() initProject()
val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false) val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false, false)
AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "module-lib", libraryJar) AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "module-lib", libraryJar)
jps/jps-plugin/testData/general/JKJProject/src/java/JFirst.java
+1 -1
View File
@@ -2,6 +2,6 @@ package java;
public class JFirst { public class JFirst {
public void foo() { public void foo() {
new kotlin.KFirst().foo(); new myproject.kotlin.KFirst().foo();
} }
} }
jps/jps-plugin/testData/general/JKJProject/src/kotlin/KFirst.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package kotlin package myproject.kotlin
class KFirst() { class KFirst() {
fun foo() { fun foo() {
jps/jps-plugin/testData/general/KJCircularProject/src/java/JFirst.java
+2 -2
View File
@@ -2,10 +2,10 @@ package java;
public class JFirst { public class JFirst {
public void foo() { public void foo() {
new kotlin.KFirst().foo(); new myproject.kotlin.KFirst().foo();
} }
public void bar() { public void bar() {
new kotlin.KFirst().bar(); new myproject.kotlin.KFirst().bar();
} }
} }
jps/jps-plugin/testData/general/KJCircularProject/src/kotlin/KFirst.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package kotlin package myproject.kotlin
class KFirst() { class KFirst() {
fun foo() { fun foo() {
jps/jps-plugin/testData/general/KJKProject/src/java/JFirst.java
+1 -1
View File
@@ -2,6 +2,6 @@ package java;
public class JFirst { public class JFirst {
public void foo() { public void foo() {
new kotlin.KSecond().foo(); new myproject.kotlin.KSecond().foo();
} }
} }
jps/jps-plugin/testData/general/KJKProject/src/kotlin/KFirst.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package kotlin package myproject.kotlin
class KFirst() { class KFirst() {
fun foo() { fun foo() {
jps/jps-plugin/testData/general/KJKProject/src/kotlin/KSecond.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package kotlin package myproject.kotlin
class KSecond() { class KSecond() {
fun foo() { fun foo() {