From 9db8a630992243fc863db83911898471ad231fbc Mon Sep 17 00:00:00 2001 From: Stepan Koltsov Date: Thu, 14 Jun 2012 14:54:00 +0400 Subject: [PATCH] rename test cli.jvm.compiler to jvm.compiler Tests has nothing to do with CLI TODO: move codegen tests --- .../jet/{cli => }/jvm/compiler/CompileEnvironmentTest.java | 2 +- .../{cli => }/jvm/compiler/CompileJavaAgainstKotlinTest.java | 4 +++- .../jvm/compiler/CompileKotlinAgainstKotlinTest.java | 4 +++- .../{cli => }/jvm/compiler/JavaDescriptorResolverTest.java | 3 ++- .../jet/{cli => }/jvm/compiler/NamespaceComparator.java | 2 +- .../jet/{cli => }/jvm/compiler/ReadJavaBinaryClassTest.java | 3 ++- .../jet/{cli => }/jvm/compiler/ReadKotlinBinaryClassTest.java | 4 +++- .../jet/{cli => }/jvm/compiler/WriteSignatureTest.java | 4 +++- .../jet/{cli => }/jvm/compiler/longTest/LibFromMaven.java | 2 +- .../longTest/ResolveDescriptorsFromExternalLibraries.java | 3 +-- .../lazy/AbstractLazyResolveNamespaceComparingTest.java | 2 +- 11 files changed, 21 insertions(+), 12 deletions(-) rename compiler/tests/org/jetbrains/jet/{cli => }/jvm/compiler/CompileEnvironmentTest.java (98%) rename compiler/tests/org/jetbrains/jet/{cli => }/jvm/compiler/CompileJavaAgainstKotlinTest.java (96%) rename compiler/tests/org/jetbrains/jet/{cli => }/jvm/compiler/CompileKotlinAgainstKotlinTest.java (96%) rename compiler/tests/org/jetbrains/jet/{cli => }/jvm/compiler/JavaDescriptorResolverTest.java (97%) rename compiler/tests/org/jetbrains/jet/{cli => }/jvm/compiler/NamespaceComparator.java (99%) rename compiler/tests/org/jetbrains/jet/{cli => }/jvm/compiler/ReadJavaBinaryClassTest.java (98%) rename compiler/tests/org/jetbrains/jet/{cli => }/jvm/compiler/ReadKotlinBinaryClassTest.java (96%) rename compiler/tests/org/jetbrains/jet/{cli => }/jvm/compiler/WriteSignatureTest.java (98%) rename compiler/tests/org/jetbrains/jet/{cli => }/jvm/compiler/longTest/LibFromMaven.java (96%) rename compiler/tests/org/jetbrains/jet/{cli => }/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java (99%) diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentTest.java rename to compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java index 57ddba262e0..9a709e18d8e 100644 --- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.jet.jvm.compiler; import com.intellij.openapi.util.io.FileUtil; import junit.framework.TestCase; diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileJavaAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTest.java similarity index 96% rename from compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileJavaAgainstKotlinTest.java rename to compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTest.java index 7d9083cf1cf..b230a5e604a 100644 --- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileJavaAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.jet.jvm.compiler; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.io.FileUtil; @@ -26,6 +26,8 @@ import junit.framework.Test; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentUtil; +import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.*; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTest.java similarity index 96% rename from compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileKotlinAgainstKotlinTest.java rename to compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTest.java index afaecdc384b..b9649ee6ffd 100644 --- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/CompileKotlinAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.jet.jvm.compiler; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.io.FileUtil; @@ -27,6 +27,8 @@ import junit.framework.Test; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentUtil; +import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.*; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/JavaDescriptorResolverTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/JavaDescriptorResolverTest.java similarity index 97% rename from compiler/tests/org/jetbrains/jet/cli/jvm/compiler/JavaDescriptorResolverTest.java rename to compiler/tests/org/jetbrains/jet/jvm/compiler/JavaDescriptorResolverTest.java index 05cb66a2d8f..999913aa8fc 100644 --- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/JavaDescriptorResolverTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/JavaDescriptorResolverTest.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.jet.jvm.compiler; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileJdkHeaders; import org.jetbrains.jet.di.InjectorForJavaSemanticServices; import org.jetbrains.jet.lang.descriptors.ClassDescriptor; diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/NamespaceComparator.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java similarity index 99% rename from compiler/tests/org/jetbrains/jet/cli/jvm/compiler/NamespaceComparator.java rename to compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java index 1d4f0fb1fae..1106bcf906d 100644 --- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/NamespaceComparator.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/NamespaceComparator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.jet.jvm.compiler; import com.google.common.base.Predicate; import com.google.common.base.Predicates; diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadJavaBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTest.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadJavaBinaryClassTest.java rename to compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTest.java index 29616f66bf4..087e473a02e 100644 --- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadJavaBinaryClassTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadJavaBinaryClassTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.jet.jvm.compiler; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.CharsetToolkit; @@ -25,6 +25,7 @@ import junit.framework.Test; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.di.InjectorForJavaSemanticServices; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor; import org.jetbrains.jet.lang.psi.JetFile; diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadKotlinBinaryClassTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java similarity index 96% rename from compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadKotlinBinaryClassTest.java rename to compiler/tests/org/jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java index 5347244c4c4..42b41dd942c 100644 --- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/ReadKotlinBinaryClassTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/ReadKotlinBinaryClassTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.jet.jvm.compiler; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.io.FileUtil; @@ -27,6 +27,8 @@ import junit.framework.Test; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentUtil; +import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.ClassFileFactory; import org.jetbrains.jet.codegen.GenerationState; import org.jetbrains.jet.codegen.GenerationUtils; diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/WriteSignatureTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTest.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/cli/jvm/compiler/WriteSignatureTest.java rename to compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTest.java index 6b484c8f44a..94b13dbef1e 100644 --- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/WriteSignatureTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler; +package org.jetbrains.jet.jvm.compiler; import com.google.common.io.Closeables; import com.google.common.io.Files; @@ -29,6 +29,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentUtil; +import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.*; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/LibFromMaven.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/LibFromMaven.java similarity index 96% rename from compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/LibFromMaven.java rename to compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/LibFromMaven.java index d39b3ca3f80..246b6e85252 100644 --- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/LibFromMaven.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/LibFromMaven.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler.longTest; +package org.jetbrains.jet.jvm.compiler.longTest; import org.jetbrains.annotations.NotNull; diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java similarity index 99% rename from compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java rename to compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java index 9b44525f379..6ae5a6cf927 100644 --- a/compiler/tests/org/jetbrains/jet/cli/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.cli.jvm.compiler.longTest; +package org.jetbrains.jet.jvm.compiler.longTest; import com.google.common.collect.Lists; import com.google.common.io.ByteStreams; @@ -36,7 +36,6 @@ import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.resolve.java.CompilerDependencies; import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode; import org.jetbrains.jet.lang.resolve.java.DescriptorSearchRule; -import org.jetbrains.jet.utils.PathUtil; import java.io.File; import java.io.FileInputStream; 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 eec1f17a32a..f33defd44c9 100644 --- a/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java +++ b/compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveNamespaceComparingTest.java @@ -21,7 +21,7 @@ import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.Function; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.cli.jvm.compiler.NamespaceComparator; +import org.jetbrains.jet.jvm.compiler.NamespaceComparator; import org.jetbrains.jet.di.InjectorForTopDownAnalyzerForJvm; import org.jetbrains.jet.lang.descriptors.ModuleDescriptor; import org.jetbrains.jet.lang.descriptors.NamespaceDescriptor;