tests fixed

Original commit: b60621c428

jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt

@@ -551,7 +551,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
     fun testCircularDependencyWithReferenceToOldVersionLib() {
         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)
 
@@ -562,7 +562,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
     fun testDependencyToOldKotlinLib() {
         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)
 

jps/jps-plugin/testData/general/JKJProject/src/java/JFirst.java

@@ -2,6 +2,6 @@ package java;
 
 public class JFirst {
     public void foo() {
-       new kotlin.KFirst().foo();
+       new myproject.kotlin.KFirst().foo();
     }
 }

jps/jps-plugin/testData/general/JKJProject/src/kotlin/KFirst.kt

@@ -1,4 +1,4 @@
-package kotlin
+package myproject.kotlin
 
 class KFirst() {
     fun foo() {

jps/jps-plugin/testData/general/KJCircularProject/src/java/JFirst.java

@@ -2,10 +2,10 @@ package java;
 
 public class JFirst {
     public void foo() {
-        new kotlin.KFirst().foo();
+        new myproject.kotlin.KFirst().foo();
     }
 
     public void bar() {
-        new kotlin.KFirst().bar();
+        new myproject.kotlin.KFirst().bar();
     }
 }

jps/jps-plugin/testData/general/KJCircularProject/src/kotlin/KFirst.kt

@@ -1,4 +1,4 @@
-package kotlin
+package myproject.kotlin
 
 class KFirst() {
     fun foo() {

jps/jps-plugin/testData/general/KJKProject/src/java/JFirst.java

@@ -2,6 +2,6 @@ package java;
 
 public class JFirst {
     public void foo() {
-        new kotlin.KSecond().foo();
+        new myproject.kotlin.KSecond().foo();
     }
 }

jps/jps-plugin/testData/general/KJKProject/src/kotlin/KFirst.kt

@@ -1,4 +1,4 @@
-package kotlin
+package myproject.kotlin
 
 class KFirst() {
     fun foo() {

jps/jps-plugin/testData/general/KJKProject/src/kotlin/KSecond.kt

@@ -1,4 +1,4 @@
-package kotlin
+package myproject.kotlin
 
 class KSecond() {
     fun foo() {