diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetMultiFileInspectionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetMultiFileInspectionTest.kt index d584b8f80b3..7eee5da5644 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetMultiFileInspectionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetMultiFileInspectionTest.kt @@ -27,7 +27,7 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.testFramework.IdeaTestUtil import com.intellij.testFramework.InspectionTestUtil import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl -import org.jetbrains.kotlin.idea.refactoring.move.getString +import org.jetbrains.kotlin.idea.jsonUtils.getString import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil import org.jetbrains.kotlin.idea.test.KotlinMultiFileTestCase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractMultiFileIntentionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractMultiFileIntentionTest.kt index 95b3e744e04..cfda30592f9 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractMultiFileIntentionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractMultiFileIntentionTest.kt @@ -29,9 +29,9 @@ import com.intellij.psi.PsiManager import com.intellij.refactoring.BaseRefactoringProcessor import com.intellij.util.PathUtil import junit.framework.TestCase +import org.jetbrains.kotlin.idea.jsonUtils.getNullableString +import org.jetbrains.kotlin.idea.jsonUtils.getString import org.jetbrains.kotlin.idea.refactoring.move.MoveAction -import org.jetbrains.kotlin.idea.refactoring.move.getNullableString -import org.jetbrains.kotlin.idea.refactoring.move.getString import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil import org.jetbrains.kotlin.idea.test.KotlinMultiFileTestCase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/jsonUtils.kt b/idea/tests/org/jetbrains/kotlin/idea/jsonUtils/jsonUtils.kt similarity index 94% rename from idea/tests/org/jetbrains/kotlin/idea/refactoring/move/jsonUtils.kt rename to idea/tests/org/jetbrains/kotlin/idea/jsonUtils/jsonUtils.kt index 8713b66d654..5ced23067f6 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/jsonUtils.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/jsonUtils/jsonUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.idea.refactoring.move +package org.jetbrains.kotlin.idea.jsonUtils import com.google.gson.JsonObject diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt index 605a27c9c49..61cf5d67606 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt @@ -38,6 +38,8 @@ import com.intellij.refactoring.move.moveMembers.MockMoveMembersOptions import com.intellij.refactoring.move.moveMembers.MoveMembersProcessor import com.intellij.util.ActionRunner import org.jetbrains.kotlin.idea.core.refactoring.createKotlinFile +import org.jetbrains.kotlin.idea.jsonUtils.getNullableString +import org.jetbrains.kotlin.idea.jsonUtils.getString import org.jetbrains.kotlin.idea.refactoring.move.changePackage.KotlinChangePackageRefactoring import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.* import org.jetbrains.kotlin.idea.test.KotlinMultiFileTestCase diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt index f07cc408196..0cf8396a1f3 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt @@ -37,8 +37,8 @@ import com.intellij.refactoring.util.CommonRefactoringUtil.RefactoringErrorHintE import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.idea.caches.resolve.analyzeFullyAndGetResult -import org.jetbrains.kotlin.idea.refactoring.move.getNullableString -import org.jetbrains.kotlin.idea.refactoring.move.getString +import org.jetbrains.kotlin.idea.jsonUtils.getNullableString +import org.jetbrains.kotlin.idea.jsonUtils.getString import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.kotlin.idea.test.KotlinMultiFileTestCase import org.jetbrains.kotlin.idea.test.PluginTestCaseBase