From 17169b1244835a87dedb83b228bacb37cc1780c0 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 11 Jul 2012 21:17:33 +0400 Subject: [PATCH] NamespaceComparator moved to test.util --- .../jet/jvm/compiler/AbstractReadJavaBinaryClassTest.java | 1 + .../jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java | 1 + .../lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java | 2 +- .../resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java | 2 +- .../jet/lang/resolve/lazy/LazyResolveBuiltinClassesTest.java | 2 +- .../jet/lang/resolve/lazy/LazyResolveStdlibLoadingTest.java | 2 +- .../jet/{jvm/compiler => test/util}/NamespaceComparator.java | 2 +- 7 files changed, 7 insertions(+), 5 deletions(-) rename compiler/tests/org/jetbrains/jet/{jvm/compiler => test/util}/NamespaceComparator.java (99%) diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractReadJavaBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractReadJavaBinaryClassTest.java index 3abde7bf6ed..3ff75a4a0f8 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractReadJavaBinaryClassTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractReadJavaBinaryClassTest.java @@ -40,6 +40,7 @@ import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.jet.test.generator.SimpleTestClassModel; import org.jetbrains.jet.test.generator.TestGenerator; +import org.jetbrains.jet.test.util.NamespaceComparator; import org.junit.Assert; import javax.tools.*; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java index 45a876812ac..759d4da06b2 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java @@ -44,6 +44,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.jet.test.TestCaseWithTmpdir; +import org.jetbrains.jet.test.util.NamespaceComparator; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java index 5be6dfd47c3..aba91eb3d15 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDiagnosticsTest.java @@ -23,7 +23,7 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.checkers.AbstractJetDiagnosticsTest; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.jvm.compiler.NamespaceComparator; +import org.jetbrains.jet.test.util.NamespaceComparator; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.psi.JetFile; diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java index dcb0e1a78be..d9b9056e03b 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java @@ -23,7 +23,7 @@ import com.intellij.util.Function; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.jvm.compiler.NamespaceComparator; +import org.jetbrains.jet.test.util.NamespaceComparator; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.psi.JetFile; diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveBuiltinClassesTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveBuiltinClassesTest.java index a7f4e6cf6ad..d0a2b80855f 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveBuiltinClassesTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveBuiltinClassesTest.java @@ -25,7 +25,7 @@ import com.intellij.util.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.jvm.compiler.NamespaceComparator; +import org.jetbrains.jet.test.util.NamespaceComparator; import org.jetbrains.jet.lang.DefaultModuleConfiguration; import org.jetbrains.jet.lang.ModuleConfiguration; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; diff --git a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveStdlibLoadingTest.java b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveStdlibLoadingTest.java index 4dd989609a0..0efc0751e39 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveStdlibLoadingTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveStdlibLoadingTest.java @@ -27,7 +27,7 @@ import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.jet.KotlinTestWithEnvironmentManagement; import org.jetbrains.jet.TestJdkKind; import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.jet.jvm.compiler.NamespaceComparator; +import org.jetbrains.jet.test.util.NamespaceComparator; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.psi.JetFile; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java b/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java similarity index 99% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java rename to compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java index e05fcb4be61..f4a46dd362b 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java +++ b/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler; +package org.jetbrains.jet.test.util; import com.google.common.base.Predicate; import com.google.common.base.Predicates;