From 1a58636ea951aa6a82f2121b8d70db49db512241 Mon Sep 17 00:00:00 2001
From: Dmitry Petrov <Dmitry.Petrov@jetbrains.com>
Date: Wed, 21 Oct 2015 16:35:23 +0300
Subject: [PATCH] KT-6165, KT-9547: fix testData for JPS plugin. Test contains
 effectively single module (with circular dependencies), and should not have
 conflicting declarations. Rename the package in a library used in this test.

 #KT-9547 Fixed
---
 .../oldModuleLib/src/{ => lib}/module1/JavaClass.java         | 2 +-
 .../oldModuleLib/src/{ => lib}/module1/b.kt                   | 4 ++--
 .../oldModuleLib/src/{ => lib}/module2/KotlinObject.kt        | 2 +-
 .../oldModuleLib/src/{ => lib}/module2/a.kt                   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/{ => lib}/module1/JavaClass.java (76%)
 rename jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/{ => lib}/module1/b.kt (66%)
 rename jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/{ => lib}/module2/KotlinObject.kt (78%)
 rename jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/{ => lib}/module2/a.kt (66%)

diff --git a/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/JavaClass.java b/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/JavaClass.java
similarity index 76%
rename from jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/JavaClass.java
rename to jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/JavaClass.java
index 695f1f369ac..3ee75e14976 100644
--- a/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/JavaClass.java
+++ b/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/JavaClass.java
@@ -1,4 +1,4 @@
-package module1;
+package lib.module1;
 
 public class JavaClass {
     public static void oldJavaMethod() {}
diff --git a/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/b.kt b/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/b.kt
similarity index 66%
rename from jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/b.kt
rename to jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/b.kt
index f849db6dc81..2d7a7f20b33 100644
--- a/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/b.kt
+++ b/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/b.kt
@@ -1,6 +1,6 @@
-package module1
+package lib.module1
 
-import module2.*
+import lib.module2.*
 
 fun foo() {
     JavaClass.oldJavaMethod()
diff --git a/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/KotlinObject.kt b/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/KotlinObject.kt
similarity index 78%
rename from jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/KotlinObject.kt
rename to jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/KotlinObject.kt
index 9abb5fd9320..cb5a7f55c77 100644
--- a/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/KotlinObject.kt
+++ b/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/KotlinObject.kt
@@ -1,4 +1,4 @@
-package module2
+package lib.module2
 
 public object KotlinObject {
     public fun oldKotlinMethod() {
diff --git a/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/a.kt b/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/a.kt
similarity index 66%
rename from jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/a.kt
rename to jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/a.kt
index c595a192cad..ff5c408f39b 100644
--- a/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/a.kt
+++ b/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/a.kt
@@ -1,6 +1,6 @@
-package module2
+package lib.module2
 
-import module1.*
+import lib.module1.*
 
 fun bar() {
     JavaClass.oldJavaMethod()