From 21900b78711feb072ec883afacefbed67119a2be Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Mon, 15 Oct 2012 19:45:54 +0400 Subject: [PATCH] Move InTextDirectivesUtils from idea module to compiler-tests: change package --- compiler/tests/org/jetbrains/jet/InTextDirectivesUtils.java | 2 +- .../org/jetbrains/jet/completion/ExpectedCompletionUtils.java | 2 +- .../org/jetbrains/jet/completion/JetCompletionTestBase.java | 2 +- .../jetbrains/jet/completion/confidence/JetConfidenceTest.java | 2 +- .../jetbrains/jet/formatter/FormattingSettingsConfigurator.java | 2 +- .../jet/plugin/navigation/ImplementationTestUtils.java | 2 +- .../org/jetbrains/jet/plugin/quickfix/JetQuickFixTest.java | 2 +- idea/tests/org/jetbrains/jet/search/AbstractSearcherTest.java | 2 +- .../org/jetbrains/jet/search/AnnotatedMembersSearchTest.java | 2 +- .../org/jetbrains/jet/search/ClassInheritorsSearchTest.java | 2 +- .../org/jetbrains/jet/search/JUnitMembersSearcherTest.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/compiler/tests/org/jetbrains/jet/InTextDirectivesUtils.java b/compiler/tests/org/jetbrains/jet/InTextDirectivesUtils.java index 8ad25dc386d..becc1caa100 100644 --- a/compiler/tests/org/jetbrains/jet/InTextDirectivesUtils.java +++ b/compiler/tests/org/jetbrains/jet/InTextDirectivesUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.testing; +package org.jetbrains.jet; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ArrayUtil; diff --git a/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java b/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java index ed2df40af7f..47d753c8578 100644 --- a/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java +++ b/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java @@ -25,7 +25,7 @@ import com.intellij.util.ArrayUtil; import junit.framework.Assert; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.testing.InTextDirectivesUtils; +import org.jetbrains.jet.InTextDirectivesUtils; import java.util.ArrayList; import java.util.Collection; diff --git a/idea/tests/org/jetbrains/jet/completion/JetCompletionTestBase.java b/idea/tests/org/jetbrains/jet/completion/JetCompletionTestBase.java index e0f81c6ca34..f722b12a945 100644 --- a/idea/tests/org/jetbrains/jet/completion/JetCompletionTestBase.java +++ b/idea/tests/org/jetbrains/jet/completion/JetCompletionTestBase.java @@ -27,7 +27,7 @@ import com.intellij.openapi.projectRoots.Sdk; import org.apache.commons.lang.SystemUtils; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.testing.ConfigRuntimeUtil; -import org.jetbrains.jet.testing.InTextDirectivesUtils; +import org.jetbrains.jet.InTextDirectivesUtils; import org.jetbrains.jet.utils.ExceptionUtils; /** diff --git a/idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java b/idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java index 466f9bfc92d..ff825d1a8cc 100644 --- a/idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java +++ b/idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java @@ -24,7 +24,7 @@ import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.util.text.StringUtil; import org.apache.commons.lang.SystemUtils; import org.jetbrains.jet.plugin.PluginTestCaseBase; -import org.jetbrains.jet.testing.InTextDirectivesUtils; +import org.jetbrains.jet.InTextDirectivesUtils; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/formatter/FormattingSettingsConfigurator.java b/idea/tests/org/jetbrains/jet/formatter/FormattingSettingsConfigurator.java index aba3758bee4..6b4648db7bb 100644 --- a/idea/tests/org/jetbrains/jet/formatter/FormattingSettingsConfigurator.java +++ b/idea/tests/org/jetbrains/jet/formatter/FormattingSettingsConfigurator.java @@ -20,7 +20,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.jet.plugin.formatter.JetCodeStyleSettings; -import org.jetbrains.jet.testing.InTextDirectivesUtils; +import org.jetbrains.jet.InTextDirectivesUtils; import org.junit.Assert; import java.lang.reflect.Field; diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/ImplementationTestUtils.java b/idea/tests/org/jetbrains/jet/plugin/navigation/ImplementationTestUtils.java index db58cb1738a..427ec683978 100644 --- a/idea/tests/org/jetbrains/jet/plugin/navigation/ImplementationTestUtils.java +++ b/idea/tests/org/jetbrains/jet/plugin/navigation/ImplementationTestUtils.java @@ -27,7 +27,7 @@ import com.intellij.psi.PsiFile; import com.intellij.testFramework.UsefulTestCase; import junit.framework.Assert; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.testing.InTextDirectivesUtils; +import org.jetbrains.jet.InTextDirectivesUtils; import org.jetbrains.jet.testing.ReferenceUtils; import java.util.Arrays; diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/JetQuickFixTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/JetQuickFixTest.java index 15f9166d061..5cffe1ce9db 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/JetQuickFixTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/JetQuickFixTest.java @@ -34,7 +34,7 @@ import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.plugin.highlighter.IdeErrorMessages; import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade; import org.jetbrains.jet.testing.ConfigRuntimeUtil; -import org.jetbrains.jet.testing.InTextDirectivesUtils; +import org.jetbrains.jet.InTextDirectivesUtils; import java.io.File; import java.io.FilenameFilter; diff --git a/idea/tests/org/jetbrains/jet/search/AbstractSearcherTest.java b/idea/tests/org/jetbrains/jet/search/AbstractSearcherTest.java index b9403703b7d..39acd6b1ac1 100644 --- a/idea/tests/org/jetbrains/jet/search/AbstractSearcherTest.java +++ b/idea/tests/org/jetbrains/jet/search/AbstractSearcherTest.java @@ -25,7 +25,7 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import com.intellij.util.Query; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.plugin.JetLightProjectDescriptor; -import org.jetbrains.jet.testing.InTextDirectivesUtils; +import org.jetbrains.jet.InTextDirectivesUtils; import java.io.File; import java.io.IOException; diff --git a/idea/tests/org/jetbrains/jet/search/AnnotatedMembersSearchTest.java b/idea/tests/org/jetbrains/jet/search/AnnotatedMembersSearchTest.java index 9c16360ad04..772b1c86927 100644 --- a/idea/tests/org/jetbrains/jet/search/AnnotatedMembersSearchTest.java +++ b/idea/tests/org/jetbrains/jet/search/AnnotatedMembersSearchTest.java @@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiClass; import com.intellij.psi.search.searches.AnnotatedMembersSearch; import org.jetbrains.jet.plugin.PluginTestCaseBase; -import org.jetbrains.jet.testing.InTextDirectivesUtils; +import org.jetbrains.jet.InTextDirectivesUtils; import java.io.File; import java.io.IOException; diff --git a/idea/tests/org/jetbrains/jet/search/ClassInheritorsSearchTest.java b/idea/tests/org/jetbrains/jet/search/ClassInheritorsSearchTest.java index f8f51342f20..d791657cff8 100644 --- a/idea/tests/org/jetbrains/jet/search/ClassInheritorsSearchTest.java +++ b/idea/tests/org/jetbrains/jet/search/ClassInheritorsSearchTest.java @@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiClass; import com.intellij.psi.search.searches.ClassInheritorsSearch; import org.jetbrains.jet.plugin.PluginTestCaseBase; -import org.jetbrains.jet.testing.InTextDirectivesUtils; +import org.jetbrains.jet.InTextDirectivesUtils; import java.io.File; import java.io.IOException; diff --git a/idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java b/idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java index 5bf8e2e864b..81ebc681b2a 100644 --- a/idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java +++ b/idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java @@ -33,7 +33,7 @@ import com.intellij.psi.search.searches.ClassInheritorsSearch; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.plugin.PluginTestCaseBase; -import org.jetbrains.jet.testing.InTextDirectivesUtils; +import org.jetbrains.jet.InTextDirectivesUtils; import java.io.File; import java.io.IOException;