From 3b81d633347797926b2a989a64a8d5314bd10c60 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 12 Jan 2015 00:24:12 +0300 Subject: [PATCH] Rename jet -> kotlin in compiler-tests (except resolve) Move test-related code to org.jetbrains.kotlin.test, also move some tests to packages with better names --- .../tests/CodegenTestsOnAndroidGenerator.java | 4 +- .../error/AddingNullability.java | 2 +- .../error/ConflictingProjectionKind.java | 2 +- .../error/ExplicitFieldGettersAndSetters.java | 2 +- .../error/ExtraUpperBound.java | 2 +- .../error/MissingUpperBound.java | 2 +- .../kotlinSignature/error/NoFieldTypeRef.java | 2 +- .../error/NotVarargReplacedWithVararg.java | 2 +- .../error/RedundantProjectionKind.java | 2 +- .../error/ReturnTypeMissing.java | 2 +- .../kotlinSignature/error/SyntaxError.java | 2 +- .../error/SyntaxErrorInFieldAnnotation.java | 2 +- .../error/VarargReplacedWithNotVararg.java | 2 +- .../error/WrongFieldInitializer.java | 2 +- .../error/WrongFieldMutability.java | 2 +- .../kotlinSignature/error/WrongFieldName.java | 2 +- .../error/WrongMethodName.java | 2 +- .../error/WrongProjectionKind.java | 2 +- .../error/WrongReturnTypeStructure.java | 2 +- .../kotlinSignature/error/WrongTypeName1.java | 2 +- .../kotlinSignature/error/WrongTypeName2.java | 2 +- .../kotlinSignature/error/WrongTypeName3.java | 2 +- .../WrongTypeParameterBoundStructure1.java | 2 +- .../WrongTypeParameterBoundStructure2.java | 2 +- .../error/WrongTypeParametersCount.java | 2 +- .../error/WrongValueParameterStructure1.java | 2 +- .../error/WrongValueParameterStructure2.java | 2 +- .../error/WrongValueParametersCount.java | 2 +- .../parameter/ChangeProjectionKind1.java | 2 +- .../parameter/ChangeProjectionKind2.java | 2 +- .../parameter/InheritMutability.java | 2 +- .../parameter/InheritProjectionKind.java | 2 +- .../parameter/InheritReadOnliness.java | 2 +- .../parameter/MutableToReadOnly.java | 2 +- .../parameter/NotNullToNullable.java | 2 +- .../parameter/NullableToNotNull.java | 2 +- .../NullableToNotNullKotlinSignature.java | 2 +- .../parameter/ReadOnlyToMutable.java | 2 +- .../return/AddNullabilityJavaSubtype.java | 2 +- .../AddNullabilitySameGenericType1.java | 2 +- .../AddNullabilitySameGenericType2.java | 2 +- .../return/AddNullabilitySameJavaType.java | 2 +- .../return/CantMakeImmutableInSubclass.java | 2 +- ...uperclassesConflictingProjectionKinds.java | 2 +- .../typeParameter/InheritMutability.java | 2 +- .../typeParameter/InheritReadOnliness.java | 2 +- .../ArraysInSubtypes.java | 4 +- ...oSuperclassesInconsistentGenericTypes.java | 2 +- .../TwoSuperclassesVarargAndNot.java | 2 +- .../InheritExtensionAndNot/Sub.java | 2 +- .../loadJava/sourceJava/ReturnNotSubtype.java | 4 +- .../tests/org/jetbrains/jet/TimeUtils.java | 24 --------- .../resolve/ExtensibleResolveTestCase.java | 8 +-- .../resolve/JetExpectedResolveDataUtil.java | 20 +++---- .../jet/resolve/ResolveTestGenerated.java | 8 +-- ...stractAnnotationDescriptorResolveTest.java | 16 +++--- .../AbstractAnnotationParameterTest.kt | 4 +- ...DescriptorResolveWithoutAnalyzeBodyTest.kt | 2 +- .../AnnotationParameterTestGenerated.java | 8 +-- .../calls/AbstractResolvedCallsTest.kt | 6 +-- .../calls/ResolvedCallsTestGenerated.java | 8 +-- .../AbstractConstraintSystemTest.kt | 6 +-- .../ConstraintSystemTestData.kt | 2 +- .../ConstraintSystemTestGenerated.java | 8 +-- .../CapturedTypeApproximationTest.kt | 6 +-- ...TestCaseWithTmpdirIndependentFromIdea.java | 42 --------------- .../asJava/AbstractKotlinLightClassTest.java | 2 +- .../asJava/KotlinLightClassTestGenerated.java | 8 +-- .../asJava/LightClassAnnotationsTest.java | 2 +- .../kotlin/cfg/AbstractPseudocodeTest.java | 4 +- .../kotlin/cfg/CFGraphToDotFilePrinter.java | 2 +- .../kotlin/cfg/ControlFlowTestGenerated.java | 8 +-- .../kotlin/cfg/DataFlowTestGenerated.java | 8 +-- .../kotlin/cfg/PseudoValueTestGenerated.java | 8 +-- .../checkers/AbstractJetDiagnosticsTest.java | 10 ++-- .../AbstractJetDiagnosticsTestWithStdLib.java | 6 +-- .../kotlin/checkers/CheckerTestUtilTest.java | 4 +- .../checkers/JetDiagnosticsTestGenerated.java | 8 +-- ...tDiagnosticsTestWithJsStdLibGenerated.java | 8 +-- ...JetDiagnosticsTestWithStdLibGenerated.java | 8 +-- .../KotlinMultiFileTestWithWithJava.java | 8 +-- .../cli/AbstractKotlincExecutableTest.java | 6 +-- .../org/jetbrains/kotlin/cli/CliBaseTest.java | 8 +-- .../cli/KotlincExecutableTestGenerated.java | 8 +-- .../codegen/AbstractBytecodeTextTest.java | 2 +- .../AbstractCheckLocalVariablesTableTest.java | 6 +-- .../codegen/AbstractLineNumberTest.java | 16 +++--- .../codegen/AbstractScriptCodegenTest.java | 4 +- ...AbstractTopLevelMembersInvocationTest.java | 2 +- .../kotlin/codegen/AnnotationGenTest.java | 2 +- .../codegen/BytecodeTextTestGenerated.java | 8 +-- ...CheckLocalVariablesTableTestGenerated.java | 8 +-- .../kotlin/codegen/ClassGenTest.java | 2 +- .../ClassPathInParentClassLoaderTest.java | 6 +-- .../kotlin/codegen/CodegenTestCase.java | 14 ++--- .../kotlin/codegen/CodegenTestFiles.java | 4 +- .../kotlin/codegen/CodegenTestUtil.java | 4 +- .../kotlin/codegen/ControlStructuresTest.java | 2 +- .../jetbrains/kotlin/codegen/EnumGenTest.java | 2 +- .../kotlin/codegen/FunctionGenTest.java | 2 +- .../GenerateNotNullAssertionsTest.java | 6 +-- .../kotlin/codegen/InnerClassInfoGenTest.java | 6 +-- .../kotlin/codegen/JUnitUsageGenTest.java | 6 +-- .../JetValueParameterAnnotationTest.java | 2 +- .../codegen/KotlinClassAnnotationTest.java | 6 +-- .../codegen/KotlinPackageAnnotationTest.java | 10 ++-- .../KotlinSyntheticClassAnnotationTest.java | 4 +- .../codegen/LineNumberTestGenerated.java | 8 +-- .../kotlin/codegen/MethodOrderTest.kt | 2 +- .../kotlin/codegen/OuterClassGenTest.java | 2 +- .../kotlin/codegen/PackageGenTest.java | 2 +- .../kotlin/codegen/PatternMatchingTest.java | 2 +- .../kotlin/codegen/PrimitiveTypesTest.java | 2 +- .../kotlin/codegen/PropertyGenTest.java | 2 +- .../codegen/ScriptCodegenTestGenerated.java | 8 +-- .../kotlin/codegen/ScriptGenTest.java | 6 +-- .../kotlin/codegen/SourceInfoGenTest.java | 2 +- .../jetbrains/kotlin/codegen/StringsTest.java | 2 +- ...eticMethodForAnnotatedPropertyGenTest.java | 4 +- .../jetbrains/kotlin/codegen/TestlibTest.java | 8 +-- ...opLevelMembersInvocationTestGenerated.java | 8 +-- .../jetbrains/kotlin/codegen/VarArgTest.java | 2 +- ...bstractDefaultArgumentsReflectionTest.java | 4 +- ...faultArgumentsReflectionTestGenerated.java | 8 +-- .../codegen/flags/AbstractWriteFlagsTest.java | 10 ++-- .../flags/WriteFlagsTestGenerated.java | 8 +-- .../AbstractBlackBoxCodegenTest.java | 6 +-- ...ackBoxAgainstJavaCodegenTestGenerated.java | 8 +-- .../BlackBoxCodegenTestGenerated.java | 8 +-- .../BlackBoxInlineCodegenTestGenerated.java | 8 +-- ...BlackBoxMultiFileCodegenTestGenerated.java | 8 +-- .../BlackBoxWithJavaCodegenTestGenerated.java | 8 +-- ...lackBoxWithStdlibCodegenTestGenerated.java | 8 +-- .../KotlinIntegrationTestBase.java | 10 ++-- .../AbstractCompileJavaAgainstKotlinTest.java | 8 +-- ...bstractCompileKotlinAgainstKotlinTest.java | 30 +++++------ .../jvm/compiler/AbstractLoadJavaTest.java | 36 ++++++------- .../AbstractSdkAnnotationsValidityTest.java | 20 +++---- .../compiler/AbstractWriteSignatureTest.java | 12 ++--- .../AndroidSdkAnnotationsValidityTest.java | 14 ++--- .../jvm/compiler/CompileEnvironmentTest.java | 12 ++--- ...CompileJavaAgainstKotlinTestGenerated.java | 10 ++-- ...ompileKotlinAgainstCustomBinariesTest.java | 24 ++++----- ...otlinAgainstInlineKotlinTestGenerated.java | 10 ++-- ...mpileKotlinAgainstKotlinTestGenerated.java | 10 ++-- .../DeserializedScopeValidationVisitor.kt | 13 ++--- .../jvm/compiler/ExpectedLoadErrorsUtil.java | 12 ++--- .../IdeaJdkAnnotationsReflectedTest.java | 16 +++--- .../compiler/JdkAnnotationsValidityTest.java | 14 ++--- .../jvm/compiler/KotlinClassFinderTest.kt | 12 ++--- .../jvm/compiler/LoadDescriptorUtil.java | 28 +++++----- .../jvm/compiler/LoadJavaTestGenerated.java | 10 ++-- .../MultiModuleJavaAnalysisCustomTest.kt | 6 +-- .../compiler/WriteSignatureTestGenerated.java | 10 ++-- .../compiler/annotation/ExpectLoadError.java | 4 +- .../jvm/compiler/longTest/LibFromMaven.java | 4 +- ...solveDescriptorsFromExternalLibraries.java | 52 +++++++++++-------- .../xml/AbstractModuleXmlParserTest.java | 6 +-- .../xml/ModuleXmlParserTestGenerated.java | 10 ++-- .../{jet => kotlin/name}/FqNameTest.java | 12 ++--- .../name}/PackageClassNameTest.java | 6 +-- .../parsing/AbstractJetParsingTest.java | 2 +- .../parsing/JetParsingTestGenerated.java | 8 +-- .../lang => kotlin}/psi/JetPsiUtilTest.java | 10 ++-- .../psi/JetSimpleNameExpressionTest.kt | 4 +- .../AbstractDescriptorRendererTest.kt | 4 +- .../DescriptorRendererTestGenerated.java | 8 +-- .../repl/AbstractReplInterpreterTest.kt | 10 ++-- .../repl/ReplInterpreterTestGenerated.java | 10 ++-- .../AbstractEvaluateExpressionTest.kt | 15 ++---- .../EvaluateExpressionTestGenerated.java | 10 ++-- .../lazy/KotlinTestWithEnvironment.java | 2 +- .../runtime}/ProgressionUtilTest.java | 2 +- .../{jet => kotlin/scripts}/ScriptTest.java | 25 +++++---- .../builtins/BuiltInsSerializerTest.kt | 8 +-- .../builtins/LoadBuiltinsTest.java | 16 +++--- .../test}/ConfigurationKind.java | 4 +- .../test}/InTextDirectivesUtils.java | 4 +- .../test/InnerTestClasses.java | 4 +- .../test}/JUnit3RunnerWithInners.java | 4 +- .../{jet => kotlin/test}/JetLiteFixture.java | 5 +- .../test}/JetTestCaseBuilder.java | 4 +- .../{jet => kotlin/test}/JetTestUtils.java | 37 +++++-------- .../KotlinTestWithEnvironmentManagement.java | 4 +- .../{jet => kotlin/test}/MockLibraryUtil.java | 8 +-- .../test/TestCaseWithTmpdir.java | 7 +-- .../{jet => kotlin/test}/TestJdkKind.java | 4 +- .../{jet => kotlin}/test/TestMetadata.java | 4 +- .../{jet => kotlin}/test/Tmpdir.java | 4 +- .../test/util/DescriptorValidator.java | 6 +-- .../util/RecursiveDescriptorComparator.java | 20 +++---- .../util/RecursiveDescriptorProcessor.java | 4 +- .../RecursiveDescriptorProcessorTest.java | 12 ++--- .../test/util/TestExecutedOnlyOnceTest.java | 6 +-- .../{jet => kotlin/test/util}/jetTestUtils.kt | 4 +- .../types/AbstractJetTypeBindingTest.kt | 18 +++---- .../types/BoundsSubstitutorTest.java | 13 +++-- .../JetDefaultModalityModifiersTest.java | 14 ++--- .../types/JetOverloadTest.java | 16 +++--- .../types/JetOverridingTest.java | 16 +++--- .../types/JetTypeBindingTestGenerated.java | 10 ++-- .../types/JetTypeCheckerTest.java | 27 +++++----- .../types/TypeSubstitutorTest.java | 19 ++++--- .../types/TypeUnifierTest.java | 17 +++--- .../kotlin/generators/tests/GenerateTests.kt | 16 +++--- .../tests/generator/SimpleTestClassModel.java | 2 +- .../generator/SimpleTestMethodModel.java | 4 +- .../tests/generator/SingleClassTestModel.java | 2 +- .../tests/generator/TestGenerator.java | 19 +++---- .../evaluate/GenerateOperationsMapTest.kt | 4 +- ...edKotlinInJavaCompletionTestGenerated.java | 8 +-- .../completion/DataFlowValueRenderingTest.kt | 2 +- .../DataFlowValueRenderingTestGenerated.java | 8 +-- .../completion/ExpectedCompletionUtils.java | 2 +- .../JSBasicCompletionTestGenerated.java | 8 +-- .../JvmBasicCompletionTestGenerated.java | 8 +-- .../JvmSmartCompletionTestGenerated.java | 8 +-- ...vmWithLibBasicCompletionTestGenerated.java | 8 +-- .../KeywordCompletionTestGenerated.java | 8 +-- ...inSourceInJavaCompletionTestGenerated.java | 8 +-- ...tiFileJvmBasicCompletionTestGenerated.java | 8 +-- ...MultiFileSmartCompletionTestGenerated.java | 8 +-- .../confidence/JetConfidenceTest.java | 2 +- .../AbstractCompletionHandlerTests.kt | 4 +- .../BasicCompletionHandlerTestGenerated.java | 8 +-- .../CompletionCharFilterTestGenerated.java | 8 +-- ...KeywordCompletionHandlerTestGenerated.java | 8 +-- .../SmartCompletionHandlerTestGenerated.java | 8 +-- .../weighers/AbstractCompletionWeigherTest.kt | 4 +- .../BasicCompletionWeigherTestGenerated.java | 8 +-- .../SmartCompletionWeigherTestGenerated.java | 8 +-- .../AbstractJetQuickDocProviderTest.java | 4 +- .../JetQuickDocProviderTestGenerated.java | 8 +-- .../findUsages/AbstractJetFindUsagesTest.java | 4 +- .../JetFindUsagesTestGenerated.java | 8 +-- .../formatter/AbstractJetFormatterTest.java | 4 +- .../AbstractJetTypingIndentationTestBase.java | 4 +- .../formatter/JetFormatterTestGenerated.java | 8 +-- ...JetTypingIndentationTestBaseGenerated.java | 8 +-- .../AbstractExpressionSelectionTest.java | 2 +- .../plugin/AbstractSmartSelectionTest.java | 2 +- .../jet/plugin/DirectiveBasedActionUtils.java | 2 +- .../ExpressionSelectionTestGenerated.java | 8 +-- .../JdkAndMockLibraryProjectDescriptor.java | 2 +- .../JetLightCodeInsightFixtureTestCase.java | 4 +- .../jet/plugin/KotlinCodeInsightTestCase.java | 3 +- .../jet/plugin/KotlinCompletionTestCase.java | 2 +- .../plugin/KotlinDaemonAnalyzerTestCase.java | 3 +- .../plugin/KotlinHierarchyViewTestBase.java | 3 +- .../plugin/KotlinLightQuickFixTestCase.java | 3 +- .../jet/plugin/PluginTestCaseBase.java | 4 +- .../plugin/SmartSelectionTestGenerated.java | 8 +-- .../HighlightingWithDependentLibrariesTest.kt | 2 +- .../AbstractInsertImportOnPasteTest.java | 2 +- .../codeInsight/AbstractJetInspectionTest.kt | 4 +- .../codeInsight/AbstractLineMarkersTest.java | 2 +- .../AbstractOutOfBlockModificationTest.java | 2 +- .../AbstractOverrideImplementTest.java | 2 +- .../InsertImportOnPasteTestGenerated.java | 8 +-- .../JetInspectionTestGenerated.java | 8 +-- .../codeInsight/LineMarkersTestGenerated.java | 8 +-- .../OutOfBlockModificationTestGenerated.java | 8 +-- .../moveUpDown/AbstractCodeMoverTest.java | 3 +- .../moveUpDown/CodeMoverTestGenerated.java | 8 +-- .../codeInsight/smartEnter/SmartEnterTest.kt | 2 +- .../AbstractSurroundWithTest.java | 2 +- .../SurroundWithTestGenerated.java | 8 +-- .../unwrap/AbstractUnwrapRemoveTest.java | 2 +- .../unwrap/UnwrapRemoveTestGenerated.java | 8 +-- ...actConfigureProjectByChangingFileTest.java | 4 +- ...ureProjectByChangingFileTestGenerated.java | 8 +-- ...otlinCopyPasteConversionTestGenerated.java | 8 +-- .../AbstractKotlinCoverageOutputFilesTest.kt | 2 +- ...otlinCoverageOutputFilesTestGenerated.java | 8 +-- .../debugger/AbstractKotlinSteppingTest.kt | 2 +- .../debugger/AbstractSmartStepIntoTest.kt | 2 +- .../JetPositionManagerTestGenerated.java | 8 +-- .../debugger/KotlinDebuggerTestCase.java | 6 +-- .../debugger/KotlinSteppingTestGenerated.java | 8 +-- .../debugger/SmartStepIntoTestGenerated.java | 8 +-- ...AbstractEditorForEvaluateExpressionTest.kt | 4 +- .../AbstractKotlinEvaluateExpressionTest.kt | 2 +- ...AbstractSelectExpressionForDebuggerTest.kt | 2 +- ...ragmentCompletionHandlerTestGenerated.java | 8 +-- .../CodeFragmentCompletionTestGenerated.java | 8 +-- ...CodeFragmentHighlightingTestGenerated.java | 8 +-- ...KotlinEvaluateExpressionTestGenerated.java | 8 +-- ...ectExpressionForDebuggerTestGenerated.java | 8 +-- .../NavigateToLibrarySourceTest.java | 2 +- .../stubBuilder/AbstractClsStubBuilderTest.kt | 4 +- .../ClsStubBuilderTestGenerated.java | 8 +-- .../ClsStubForWrongAbiVersionTest.kt | 2 +- .../DecompiledTextForWrongAbiVersionTest.kt | 2 +- .../DecompiledTextTestGenerated.java | 8 +-- .../FoldingAfterOptimizeImportsTest.kt | 2 +- .../folding/KotlinFoldingTestGenerated.java | 8 +-- .../hierarchy/HierarchyTestGenerated.java | 8 +-- .../AbstractDiagnosticMessageTest.java | 6 +-- .../highlighter/AbstractHighlightingTest.java | 2 +- .../DiagnosticMessageTestGenerated.java | 8 +-- .../HighlightingTestGenerated.java | 8 +-- .../imports/OptimizeImportsTestGenerated.java | 8 +-- .../intentions/AbstractIntentionTest.java | 4 +- .../intentions/IntentionTestGenerated.java | 8 +-- .../declarations/JoinLinesTestGenerated.java | 8 +-- .../navigation/AbstractGotoSuperTest.java | 2 +- .../navigation/AbstractKotlinGotoTest.java | 4 +- .../navigation/GotoSuperTestGenerated.java | 8 +-- .../navigation/KotlinGotoTestGenerated.java | 8 +-- .../navigation/NavigationTestUtils.java | 2 +- .../FunctionParameterInfoTestGenerated.java | 8 +-- .../AbstractQuickFixMultiFileTest.java | 7 +-- .../plugin/quickfix/AbstractQuickFixTest.java | 4 +- .../QuickFixMultiFileTestGenerated.java | 8 +-- .../quickfix/QuickFixTestGenerated.java | 8 +-- .../inline/AbstractInlineTest.java | 2 +- .../inline/InlineTestGenerated.java | 8 +-- .../AbstractJetExtractionTest.kt | 6 +-- .../JetExtractionTestGenerated.java | 8 +-- .../refactoring/move/AbstractJetMoveTest.kt | 8 +-- .../move/JetMoveTestGenerated.java | 8 +-- .../jet/plugin/refactoring/move}/jsonUtils.kt | 15 +++--- .../nameSuggester/JetNameSuggesterTest.java | 3 +- .../refactoring/rename/AbstractRenameTest.kt | 6 +-- .../rename/RenameTestGenerated.java | 8 +-- .../AbstractKotlinFileStructureTest.kt | 6 +-- .../KotlinFileStructureTestGenerated.java | 8 +-- .../stubs/AbstractResolveByStubTest.java | 4 +- .../plugin/stubs/AbstractStubBuilderTest.java | 2 +- .../jet/plugin/stubs/AstAccessControl.kt | 2 +- .../MultiFileHighlightingTestGenerated.java | 8 +-- .../stubs/ResolveByStubTestGenerated.java | 8 +-- .../stubs/StubBuilderTestGenerated.java | 8 +-- .../psi/injection/StringInjectionHostTest.kt | 4 +- .../AbstractJetPsiUnifierTest.kt | 4 +- .../JetPsiUnifierTestGenerated.java | 8 +-- .../resolve/AbstractPartialBodyResolveTest.kt | 4 +- ...actReferenceResolveInLibrarySourcesTest.kt | 2 +- .../resolve/AbstractReferenceResolveTest.java | 6 +-- ...esolveDescriptorRendererTestGenerated.java | 8 +-- .../PartialBodyResolveTestGenerated.java | 8 +-- .../ReferenceResolveInJavaTestGenerated.java | 8 +-- ...eResolveInLibrarySourcesTestGenerated.java | 8 +-- .../ReferenceResolveTestGenerated.java | 8 +-- .../ReferenceResolveWithLibTestGenerated.java | 8 +-- ...vaWithWrongFileStructureTestGenerated.java | 8 +-- .../JetSafeDeleteTestGenerated.java | 8 +-- .../jet/search/AbstractSearcherTest.java | 2 +- .../search/AnnotatedMembersSearchTest.java | 2 +- .../jet/search/ClassInheritorsSearchTest.java | 2 +- .../jet/search/JUnitMembersSearcherTest.java | 2 +- .../shortenRefs/AbstractShortenRefsTest.kt | 4 +- .../shortenRefs/ShortenRefsTestGenerated.java | 8 +-- .../jetbrains/jet/testing/ReferenceUtils.java | 2 +- .../jet/testing/SettingsConfigurator.java | 2 +- .../checkers/JetJsCheckerTestGenerated.java | 8 +-- .../checkers/JetPsiCheckerTestGenerated.java | 8 +-- .../checkers/KotlinAndJavaCheckerTest.java | 2 +- .../modules/KotlinModuleXmlGeneratorTest.java | 2 +- .../jvm/JavaTypeSubstitutorTestGenerated.java | 8 +-- ...tractJavaToKotlinConverterMultiFileTest.kt | 2 +- ...ractJavaToKotlinConverterSingleFileTest.kt | 4 +- .../j2k/AbstractJavaToKotlinConverterTest.kt | 2 +- ...otlinConverterForWebDemoTestGenerated.java | 8 +-- ...KotlinConverterMultiFileTestGenerated.java | 8 +-- ...otlinConverterSingleFileTestGenerated.java | 8 +-- .../build/IncrementalJpsTestGenerated.java | 8 +-- .../jetbrains/kotlin/js/test/BasicTest.java | 12 ++--- .../test/semantics/BridgeTestGenerated.java | 8 +-- .../test/semantics/DynamicTestGenerated.java | 8 +-- .../semantics/MultiModuleTestGenerated.java | 8 +-- .../semantics/ReservedWordTestGenerated.java | 8 +-- .../js/test/utils/DirectiveTestUtils.java | 2 +- 373 files changed, 1174 insertions(+), 1303 deletions(-) delete mode 100644 compiler/tests/org/jetbrains/jet/TimeUtils.java delete mode 100644 compiler/tests/org/jetbrains/jet/test/TestCaseWithTmpdirIndependentFromIdea.java rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java (85%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java (95%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/AbstractLoadJavaTest.java (94%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/AbstractSdkAnnotationsValidityTest.java (98%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/AbstractWriteSignatureTest.java (97%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/AndroidSdkAnnotationsValidityTest.java (91%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/CompileEnvironmentTest.java (95%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java (99%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java (94%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java (99%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java (96%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/DeserializedScopeValidationVisitor.kt (85%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/ExpectedLoadErrorsUtil.java (97%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java (97%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/JdkAnnotationsValidityTest.java (95%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/KotlinClassFinderTest.kt (88%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/LoadDescriptorUtil.java (95%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/LoadJavaTestGenerated.java (99%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt (98%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/WriteSignatureTestGenerated.java (98%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/annotation/ExpectLoadError.java (90%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/longTest/LibFromMaven.java (93%) rename compiler/tests/org/jetbrains/{jet => kotlin}/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java (88%) rename compiler/tests/org/jetbrains/{jet => kotlin}/modules/xml/AbstractModuleXmlParserTest.java (95%) rename compiler/tests/org/jetbrains/{jet => kotlin}/modules/xml/ModuleXmlParserTestGenerated.java (92%) rename compiler/tests/org/jetbrains/{jet => kotlin/name}/FqNameTest.java (92%) rename compiler/tests/org/jetbrains/{jet => kotlin/name}/PackageClassNameTest.java (93%) rename compiler/tests/org/jetbrains/{jet/lang => kotlin}/psi/JetPsiUtilTest.java (99%) rename compiler/tests/org/jetbrains/{jet/lang => kotlin}/psi/JetSimpleNameExpressionTest.kt (93%) rename compiler/tests/org/jetbrains/{jet => kotlin}/repl/AbstractReplInterpreterTest.kt (93%) rename compiler/tests/org/jetbrains/{jet => kotlin}/repl/ReplInterpreterTestGenerated.java (98%) rename compiler/tests/org/jetbrains/{jet => kotlin/resolve/constants}/evaluate/AbstractEvaluateExpressionTest.kt (91%) rename compiler/tests/org/jetbrains/{jet => kotlin/resolve/constants}/evaluate/EvaluateExpressionTestGenerated.java (97%) rename compiler/tests/org/jetbrains/{jet => kotlin/runtime}/ProgressionUtilTest.java (99%) rename compiler/tests/org/jetbrains/{jet => kotlin/scripts}/ScriptTest.java (95%) rename compiler/tests/org/jetbrains/{jet => kotlin/test}/ConfigurationKind.java (91%) rename compiler/tests/org/jetbrains/{jet => kotlin/test}/InTextDirectivesUtils.java (98%) rename compiler/tests/org/jetbrains/{jet => kotlin}/test/InnerTestClasses.java (92%) rename compiler/tests/org/jetbrains/{jet => kotlin/test}/JUnit3RunnerWithInners.java (98%) rename compiler/tests/org/jetbrains/{jet => kotlin/test}/JetLiteFixture.java (98%) rename compiler/tests/org/jetbrains/{jet => kotlin/test}/JetTestCaseBuilder.java (93%) rename compiler/tests/org/jetbrains/{jet => kotlin/test}/JetTestUtils.java (97%) rename compiler/tests/org/jetbrains/{jet => kotlin/test}/KotlinTestWithEnvironmentManagement.java (94%) rename compiler/tests/org/jetbrains/{jet => kotlin/test}/MockLibraryUtil.java (98%) rename compiler/tests/org/jetbrains/{jet => kotlin}/test/TestCaseWithTmpdir.java (88%) rename compiler/tests/org/jetbrains/{jet => kotlin/test}/TestJdkKind.java (89%) rename compiler/tests/org/jetbrains/{jet => kotlin}/test/TestMetadata.java (92%) rename compiler/tests/org/jetbrains/{jet => kotlin}/test/Tmpdir.java (95%) rename compiler/tests/org/jetbrains/{jet => kotlin}/test/util/DescriptorValidator.java (99%) rename compiler/tests/org/jetbrains/{jet => kotlin}/test/util/RecursiveDescriptorComparator.java (98%) rename compiler/tests/org/jetbrains/{jet => kotlin}/test/util/RecursiveDescriptorProcessor.java (98%) rename compiler/tests/org/jetbrains/{jet => kotlin}/test/util/RecursiveDescriptorProcessorTest.java (98%) rename compiler/tests/org/jetbrains/{jet => kotlin}/test/util/TestExecutedOnlyOnceTest.java (93%) rename compiler/tests/org/jetbrains/{jet => kotlin/test/util}/jetTestUtils.kt (96%) rename compiler/tests/org/jetbrains/{jet => kotlin}/types/AbstractJetTypeBindingTest.kt (87%) rename compiler/tests/org/jetbrains/{jet => kotlin}/types/BoundsSubstitutorTest.java (96%) rename compiler/tests/org/jetbrains/{jet => kotlin}/types/JetDefaultModalityModifiersTest.java (99%) rename compiler/tests/org/jetbrains/{jet => kotlin}/types/JetOverloadTest.java (96%) rename compiler/tests/org/jetbrains/{jet => kotlin}/types/JetOverridingTest.java (96%) rename compiler/tests/org/jetbrains/{jet => kotlin}/types/JetTypeBindingTestGenerated.java (98%) rename compiler/tests/org/jetbrains/{jet => kotlin}/types/JetTypeCheckerTest.java (98%) rename compiler/tests/org/jetbrains/{jet => kotlin}/types/TypeSubstitutorTest.java (98%) rename compiler/tests/org/jetbrains/{jet => kotlin}/types/TypeUnifierTest.java (97%) rename {compiler/tests/org/jetbrains/jet => idea/tests/org/jetbrains/jet/plugin/refactoring/move}/jsonUtils.kt (64%) diff --git a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java index e05665448e7..26d17533a29 100644 --- a/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java +++ b/compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java @@ -22,8 +22,6 @@ import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.openapi.util.text.StringUtil; import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; @@ -33,6 +31,8 @@ import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.generators.tests.generator.TestGeneratorUtil; import org.jetbrains.kotlin.plugin.JetFileType; import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.utils.Printer; import org.junit.Assert; diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.java index beab177628d..784dd036874 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/AddingNullability.java @@ -1,7 +1,7 @@ package test; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class AddingNullability { @ExpectLoadError("Auto type 'kotlin.Int' is not-null, while type in alternative signature is nullable: 'Int?'") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.java index 7070779f0a6..3d1871e54a7 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ConflictingProjectionKind.java @@ -4,7 +4,7 @@ import java.lang.Number; import java.util.*; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class ConflictingProjectionKind { @ExpectLoadError("Projection kind 'in' is conflicting with variance of kotlin.List") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.java index bbbf35217b0..d8dbcf1bb01 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.java @@ -1,7 +1,7 @@ package test; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class ExplicitFieldGettersAndSetters { @ExpectLoadError("Field annotation for shouldn't have getters and setters") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.java index 74f47f07ed5..2caa5179f71 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ExtraUpperBound.java @@ -1,7 +1,7 @@ package test; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class ExtraUpperBound { @ExpectLoadError("Upper bound number mismatch for A. Expected 1, but found 2") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.java index 97aa577cbbe..4b737b3a4bb 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/MissingUpperBound.java @@ -1,7 +1,7 @@ package test; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class MissingUpperBound { @ExpectLoadError("Upper bound number mismatch for A. Expected 2, but found 1") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.java index 5743c0481f5..9a5e1dec546 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NoFieldTypeRef.java @@ -1,7 +1,7 @@ package test; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class NoFieldTypeRef { @ExpectLoadError("Field annotation for shouldn't have type reference") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.java index 7ef352ee0fb..ead465f6435 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/NotVarargReplacedWithVararg.java @@ -3,7 +3,7 @@ package test; import java.util.*; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class NotVarargReplacedWithVararg { @ExpectLoadError("Parameter in method signature is not vararg, but in alternative signature it is vararg") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.java index d1695f6ba02..67fed777826 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/RedundantProjectionKind.java @@ -4,7 +4,7 @@ import java.lang.Number; import java.util.*; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class RedundantProjectionKind { @KotlinSignature("fun foo(list: List)") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.java index acfb261ea2d..7063f7ebf38 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/ReturnTypeMissing.java @@ -1,7 +1,7 @@ package test; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class ReturnTypeMissing { @ExpectLoadError("Return type in alternative signature is missing, while in real signature it is 'kotlin.Int'") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.java index d5a1e660077..ed6024935bf 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxError.java @@ -1,7 +1,7 @@ package test; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class SyntaxError { @ExpectLoadError("Alternative signature has 2 syntax errors, first is at 8: Expecting a parameter declaration") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java index b0e0bec2711..3847d2c8202 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.java @@ -1,7 +1,7 @@ package test; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class SyntaxErrorInFieldAnnotation { @ExpectLoadError("Alternative signature has syntax error at 10: Type expected") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.java index 98a5c5f331a..aa8cd9f4330 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/VarargReplacedWithNotVararg.java @@ -3,7 +3,7 @@ package test; import java.util.*; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class VarargReplacedWithNotVararg { @ExpectLoadError("Parameter in method signature is vararg, but in alternative signature it is not") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.java index fb4f1671e75..7d19cf8ccaf 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldInitializer.java @@ -1,7 +1,7 @@ package test; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class WrongFieldInitializer { @ExpectLoadError("Default value is not expected in annotation for field") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.java index 7d1b4558734..6cc731d511a 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldMutability.java @@ -1,7 +1,7 @@ package test; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class WrongFieldMutability { @ExpectLoadError("Wrong mutability in annotation for field") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.java index 8a4f8639f9b..aacabd3bb9e 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongFieldName.java @@ -1,7 +1,7 @@ package test; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class WrongFieldName { @ExpectLoadError("Field name mismatch, original: foo, alternative: bar") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.java index 8ef49420549..9a7d5d82e8f 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongMethodName.java @@ -1,7 +1,7 @@ package test; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class WrongMethodName { @ExpectLoadError("Function names mismatch, original: foo, alternative: bar") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java index a49501655d5..f94bc4fbcc0 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.java @@ -4,7 +4,7 @@ import java.lang.Number; import java.util.*; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class WrongProjectionKind { //@ExpectLoadError("Projection kind mismatch, actual: out, in alternative signature: ") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java index 058b3ef1ce8..d918f1f5045 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.java @@ -2,7 +2,7 @@ package test; import java.util.*; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class WrongReturnTypeStructure { //@ExpectLoadError("'kotlin.String?' type in method signature has 0 type arguments, while 'String' in alternative signature has 1 of them") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.java index c9f4fe7a0e0..1117f463f03 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName1.java @@ -2,7 +2,7 @@ package test; import java.util.*; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class WrongTypeName1 { @ExpectLoadError("Alternative signature type mismatch, expected: Unit, actual: kotlin.String") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.java index 23beec4842e..2467cf1a766 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName2.java @@ -2,7 +2,7 @@ package test; import java.util.*; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class WrongTypeName2 { @ExpectLoadError("Alternative signature type mismatch, expected: Something.String, actual: kotlin.String") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.java index 74aac67f274..3ff3c2bfa41 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeName3.java @@ -2,7 +2,7 @@ package test; import java.util.*; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class WrongTypeName3 { @ExpectLoadError("Alternative signature type mismatch, expected: List, actual: kotlin.String") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java index f77d89c25bb..540f34c877c 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.java @@ -3,7 +3,7 @@ package test; import java.util.*; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class WrongTypeParameterBoundStructure1 { //@ExpectLoadError("'java.lang.Runnable?' type in method signature has 0 type arguments, while 'Runnable' in alternative signature has 1 of them") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java index cc6c48ef1ea..ba2344ef936 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.java @@ -3,7 +3,7 @@ package test; import java.util.*; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class WrongTypeParameterBoundStructure2 { //@ExpectLoadError("'kotlin.List?' type in method signature has 1 type arguments, while 'List' in alternative signature has 0 of them") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.java index 982c2b113e4..5351458c52c 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParametersCount.java @@ -3,7 +3,7 @@ package test; import java.util.*; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class WrongTypeParametersCount { @ExpectLoadError("Method signature has 2 type parameters, but alternative signature has 3") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java index 7153438ae37..8ac98c1d10f 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.java @@ -2,7 +2,7 @@ package test; import java.util.*; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class WrongValueParameterStructure1 { //@ExpectLoadError("'kotlin.String?' type in method signature has 0 type arguments, while 'String' in alternative signature has 1 of them") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java index c193956f932..dc9e3c46cb8 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure2.java @@ -2,7 +2,7 @@ package test; import java.util.*; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class WrongValueParameterStructure2 { //@ExpectLoadError("'kotlin.Map.Entry' type in method signature has 2 type arguments, while 'Map.Entry' in alternative signature has 1 of them") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.java index 641ce0965b6..b86d7da93f4 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParametersCount.java @@ -1,7 +1,7 @@ package test; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public class WrongValueParametersCount { @ExpectLoadError("Method signature has 0 value parameters, but alternative signature has 1") diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java index 6303537f299..6fec8a0809b 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind1.java @@ -2,7 +2,7 @@ package test; import org.jetbrains.annotations.NotNull; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; import java.util.*; public interface ChangeProjectionKind1 { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java index 05af5864ce0..43e9ef3591e 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ChangeProjectionKind2.java @@ -2,7 +2,7 @@ package test; import org.jetbrains.annotations.NotNull; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; import java.util.*; public interface ChangeProjectionKind2 { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.java index 264382ee8c6..b6cba8076d5 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritMutability.java @@ -2,7 +2,7 @@ package test; import org.jetbrains.annotations.NotNull; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; import java.util.*; public interface InheritMutability { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.java index c31d47c90cc..1ac57effdba 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritProjectionKind.java @@ -3,7 +3,7 @@ package test; import org.jetbrains.annotations.NotNull; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; import java.util.*; public interface InheritProjectionKind { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.java index 3e0382a31af..f6069d468c6 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/InheritReadOnliness.java @@ -2,7 +2,7 @@ package test; import org.jetbrains.annotations.NotNull; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; import java.util.*; public interface InheritReadOnliness { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java index d3f2adcf82f..b07b6a04d63 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/MutableToReadOnly.java @@ -2,7 +2,7 @@ package test; import org.jetbrains.annotations.NotNull; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; import java.util.*; public interface MutableToReadOnly { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.java index 4a568790abe..f5d0d4e744b 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NotNullToNullable.java @@ -2,7 +2,7 @@ package test; import org.jetbrains.annotations.NotNull; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface NotNullToNullable { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.java index 2a01b654f78..f5b1560c4e6 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNull.java @@ -2,7 +2,7 @@ package test; import org.jetbrains.annotations.NotNull; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface NullableToNotNull { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java index 194833fd5ca..65c62daaad8 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.java @@ -2,7 +2,7 @@ package test; import org.jetbrains.annotations.NotNull; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface NullableToNotNullKotlinSignature { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java index 0cda2e005da..c2cd9e3692b 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/parameter/ReadOnlyToMutable.java @@ -2,7 +2,7 @@ package test; import org.jetbrains.annotations.NotNull; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; import java.util.*; public interface ReadOnlyToMutable { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java index ebbce09a2fb..e36c03c9df4 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilityJavaSubtype.java @@ -2,7 +2,7 @@ package test; import org.jetbrains.annotations.NotNull; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface AddNullabilityJavaSubtype { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java index 69d7e0742cb..95e11053de7 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType1.java @@ -3,7 +3,7 @@ package test; import org.jetbrains.annotations.NotNull; import java.util.List; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface AddNullabilitySameGenericType1 { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java index 22dfc680e3a..1440dc58d8d 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameGenericType2.java @@ -3,7 +3,7 @@ package test; import org.jetbrains.annotations.NotNull; import java.util.List; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface AddNullabilitySameGenericType2 { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java index 36b1e0ebd75..edcde127f43 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/AddNullabilitySameJavaType.java @@ -3,7 +3,7 @@ package test; import org.jetbrains.annotations.NotNull; import java.lang.CharSequence; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface AddNullabilitySameJavaType { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java index 07e98d57691..052e235c48a 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/CantMakeImmutableInSubclass.java @@ -4,7 +4,7 @@ import org.jetbrains.annotations.NotNull; import java.util.*; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface CantMakeImmutableInSubclass { diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java index b3d206ed671..9c5094f91d4 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/return/TwoSuperclassesConflictingProjectionKinds.java @@ -2,7 +2,7 @@ package test; import org.jetbrains.annotations.NotNull; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; import java.util.*; diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.java index 4bd96edcdf9..6500612df90 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritMutability.java @@ -2,7 +2,7 @@ package test; import org.jetbrains.annotations.NotNull; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; import java.util.*; import java.util.List; diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.java b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.java index 9e7dd3f9c7c..48d310b6945 100644 --- a/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.java +++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/propagation/typeParameter/InheritReadOnliness.java @@ -2,7 +2,7 @@ package test; import org.jetbrains.annotations.NotNull; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; import java.util.*; public interface InheritReadOnliness { diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java index b5cd1f12840..0b76a7e3a3b 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/ArraysInSubtypes.java @@ -1,7 +1,7 @@ package test; import java.util.List; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface ArraysInSubtypes { interface Super { @@ -18,4 +18,4 @@ public interface ArraysInSubtypes { T[] objArray(); } -} \ No newline at end of file +} diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java index 910beee9409..677ac31dd35 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesInconsistentGenericTypes.java @@ -4,7 +4,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface TwoSuperclassesInconsistentGenericTypes { @KotlinSignature("fun foo(): MutableList") diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.java b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.java index 0ccd2e00a6b..8a85874bfa4 100644 --- a/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.java +++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/TwoSuperclassesVarargAndNot.java @@ -6,7 +6,7 @@ import java.lang.String; import java.util.List; import jet.runtime.typeinfo.KotlinSignature; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface TwoSuperclassesVarargAndNot { public interface Super1 { diff --git a/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot/Sub.java b/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot/Sub.java index f3b24148631..519563402d6 100644 --- a/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot/Sub.java +++ b/compiler/testData/loadJava/javaAgainstKotlin/signaturePropagation/InheritExtensionAndNot/Sub.java @@ -1,6 +1,6 @@ package test; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface Sub extends Super1, Super2 { @ExpectLoadError("Incompatible super methods: some are extension functions, some are not") diff --git a/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.java b/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.java index 361471e845b..fd3f8ca441d 100644 --- a/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.java +++ b/compiler/testData/loadJava/sourceJava/ReturnNotSubtype.java @@ -1,7 +1,7 @@ package test; import java.util.List; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; public interface ReturnNotSubtype { interface Super { @@ -29,4 +29,4 @@ public interface ReturnNotSubtype { Void[] array(); } -} \ No newline at end of file +} diff --git a/compiler/tests/org/jetbrains/jet/TimeUtils.java b/compiler/tests/org/jetbrains/jet/TimeUtils.java deleted file mode 100644 index bb0c3075c65..00000000000 --- a/compiler/tests/org/jetbrains/jet/TimeUtils.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2010-2013 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet; - -public class TimeUtils { - - public static String millisecondsToSecondsString(long millis) { - return millis / 1000 + "." + String.format("%03d", millis % 1000); - } -} diff --git a/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java b/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java index e4e646e5ee2..5f449887b64 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ExtensibleResolveTestCase.java @@ -18,11 +18,11 @@ package org.jetbrains.jet.resolve; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetLiteFixture; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetLiteFixture; +import org.jetbrains.kotlin.test.JetTestUtils; import java.io.File; import java.util.List; diff --git a/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java b/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java index 6dc6abf91e1..2413555b5b0 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java +++ b/compiler/tests/org/jetbrains/jet/resolve/JetExpectedResolveDataUtil.java @@ -19,27 +19,27 @@ package org.jetbrains.jet.resolve; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.kotlin.resolve.BindingTraceContext; -import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; -import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; -import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; +import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolver; +import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolverUtil; +import org.jetbrains.kotlin.di.InjectorForTests; import org.jetbrains.kotlin.load.java.structure.JavaClass; import org.jetbrains.kotlin.load.java.structure.impl.JavaClassImpl; import org.jetbrains.kotlin.name.ClassId; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.resolve.BindingTraceContext; +import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; +import org.jetbrains.kotlin.resolve.calls.results.OverloadResolutionResults; +import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValue; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.TypeUtils; import org.jetbrains.kotlin.types.expressions.ExpressionTypingContext; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; -import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolver; -import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolverUtil; -import org.jetbrains.kotlin.di.InjectorForTests; import org.junit.Assert; import java.util.Arrays; diff --git a/compiler/tests/org/jetbrains/jet/resolve/ResolveTestGenerated.java b/compiler/tests/org/jetbrains/jet/resolve/ResolveTestGenerated.java index b49ecd96e0c..94f8cd0ef85 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/ResolveTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/resolve/ResolveTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.resolve; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java index b8a0220ebda..5f8484338f7 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java +++ b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationDescriptorResolveTest.java @@ -21,23 +21,23 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetLiteFixture; -import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.analyzer.AnalysisResult; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor; -import org.jetbrains.kotlin.psi.JetAnnotationEntry; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.resolve.scopes.JetScope; -import org.jetbrains.kotlin.types.TypeProjection; +import org.jetbrains.kotlin.psi.JetAnnotationEntry; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; -import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.test.JetLiteFixture; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.types.TypeProjection; import java.io.File; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationParameterTest.kt b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationParameterTest.kt index bb7f269ecb5..d3bc5c505fa 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationParameterTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/annotation/AbstractAnnotationParameterTest.kt @@ -17,9 +17,9 @@ package org.jetbrains.jet.resolve.annotation import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.jet.InTextDirectivesUtils +import org.jetbrains.kotlin.test.InTextDirectivesUtils import java.io.File -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils public abstract class AbstractAnnotationParameterTest : AbstractAnnotationDescriptorResolveTest() { fun doTest(path: String) { diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveWithoutAnalyzeBodyTest.kt b/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveWithoutAnalyzeBodyTest.kt index 1679e76effd..9266920cfa0 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveWithoutAnalyzeBodyTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationDescriptorResolveWithoutAnalyzeBodyTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.resolve.annotation import org.jetbrains.kotlin.analyzer.AnalysisResult import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils class AnnotationDescriptorResolveWithoutAnalyzeBodyTest : AnnotationDescriptorResolveTest() { diff --git a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationParameterTestGenerated.java b/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationParameterTestGenerated.java index 9a0caead3b0..48e1a99e47c 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationParameterTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/resolve/annotation/AnnotationParameterTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.resolve.annotation; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt index 68d1965b1fc..a62414b184f 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/calls/AbstractResolvedCallsTest.kt @@ -16,9 +16,9 @@ package org.jetbrains.jet.resolve.calls -import org.jetbrains.jet.ConfigurationKind -import org.jetbrains.jet.JetLiteFixture -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.ConfigurationKind +import org.jetbrains.kotlin.test.JetLiteFixture +import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver diff --git a/compiler/tests/org/jetbrains/jet/resolve/calls/ResolvedCallsTestGenerated.java b/compiler/tests/org/jetbrains/jet/resolve/calls/ResolvedCallsTestGenerated.java index eb250dd9b3a..d95f4e577b1 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/calls/ResolvedCallsTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/resolve/calls/ResolvedCallsTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.resolve.calls; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt index 10ff77c41c6..293e1a42816 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/AbstractConstraintSystemTest.kt @@ -16,9 +16,9 @@ package org.jetbrains.jet.resolve.constraintSystem -import org.jetbrains.jet.ConfigurationKind -import org.jetbrains.jet.JetLiteFixture -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.ConfigurationKind +import org.jetbrains.kotlin.test.JetLiteFixture +import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.kotlin.di.InjectorForTests import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor diff --git a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt index 4529e71f19c..1e11cbfde66 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestData.kt @@ -16,7 +16,7 @@ package org.jetbrains.jet.resolve.constraintSystem -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.psi.* diff --git a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestGenerated.java b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestGenerated.java index 1aa3219b1fa..50e4f1e5f99 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/resolve/constraintSystem/ConstraintSystemTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.resolve.constraintSystem; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt b/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt index 242d3bf36a4..5c096babc4c 100644 --- a/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt +++ b/compiler/tests/org/jetbrains/jet/resolve/typeApproximation/CapturedTypeApproximationTest.kt @@ -16,9 +16,9 @@ package org.jetbrains.jet.resolve.typeApproximation -import org.jetbrains.jet.JetLiteFixture +import org.jetbrains.kotlin.test.JetLiteFixture import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment -import org.jetbrains.jet.ConfigurationKind +import org.jetbrains.kotlin.test.ConfigurationKind import java.io.File import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil import org.jetbrains.kotlin.resolve.BindingContext @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.types.TypeProjectionImpl import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.types.Variance.* import org.jetbrains.kotlin.types.typesApproximation.approximateCapturedTypes -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.resolve.calls.inference.createCapturedType import org.jetbrains.kotlin.diagnostics.Severity diff --git a/compiler/tests/org/jetbrains/jet/test/TestCaseWithTmpdirIndependentFromIdea.java b/compiler/tests/org/jetbrains/jet/test/TestCaseWithTmpdirIndependentFromIdea.java deleted file mode 100644 index 5afcec6da52..00000000000 --- a/compiler/tests/org/jetbrains/jet/test/TestCaseWithTmpdirIndependentFromIdea.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2010-2013 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.test; - -import com.intellij.openapi.util.io.FileUtil; -import org.jetbrains.jet.JetTestUtils; -import org.junit.After; -import org.junit.Before; - -import java.io.File; - -public abstract class TestCaseWithTmpdirIndependentFromIdea { - protected File tmpdir; - - @Before - public void before() throws Exception { - tmpdir = JetTestUtils.tmpDir(this.getClass().getName()); - } - - @After - public void after() { - if (tmpdir != null) { - FileUtil.delete(tmpdir); - } - } - - -} diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java index 2011b8e8e2a..dfbf17d0b73 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/AbstractKotlinLightClassTest.java @@ -21,9 +21,9 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.impl.compiled.ClsElementImpl; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.checkers.KotlinMultiFileTestWithWithJava; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.test.JetTestUtils; import java.io.File; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java index 24e07a4be82..414b8f59608 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.asJava; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java index 9aaf378c576..fbd2c387de0 100644 --- a/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java @@ -21,9 +21,9 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.PsiModifierList; import com.intellij.psi.search.GlobalSearchScope; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.test.JetTestUtils; import java.io.File; import java.util.Collections; diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java index 143dedd8f39..7739f85a44e 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/AbstractPseudocodeTest.java @@ -21,8 +21,6 @@ import com.intellij.openapi.util.text.StringUtil; import kotlin.Function3; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode; import org.jetbrains.kotlin.cfg.pseudocode.PseudocodeImpl; @@ -34,6 +32,8 @@ import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestUtils; import java.io.File; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/CFGraphToDotFilePrinter.java b/compiler/tests/org/jetbrains/kotlin/cfg/CFGraphToDotFilePrinter.java index c4d3c08e372..9fe82dc5d5e 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/CFGraphToDotFilePrinter.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/CFGraphToDotFilePrinter.java @@ -19,7 +19,6 @@ package org.jetbrains.kotlin.cfg; import com.google.common.collect.Sets; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.cfg.pseudocode.Pseudocode; import org.jetbrains.kotlin.cfg.pseudocode.instructions.Instruction; import org.jetbrains.kotlin.cfg.pseudocode.instructions.InstructionVisitor; @@ -33,6 +32,7 @@ import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineExitIn import org.jetbrains.kotlin.cfg.pseudocode.instructions.special.SubroutineSinkInstruction; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetNamedDeclaration; +import org.jetbrains.kotlin.test.JetTestUtils; import java.io.File; import java.io.FileNotFoundException; diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java index 2d0c81ee100..644b330e0b9 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.cfg; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/DataFlowTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cfg/DataFlowTestGenerated.java index 55e2b31626a..b4a8ef21f6d 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/DataFlowTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/DataFlowTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.cfg; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java index 762e034b4f9..96b2456adc9 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.cfg; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java index 4e3d687c2d5..2b089d5c5b4 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTest.java @@ -27,9 +27,6 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.util.DescriptorValidator; -import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; import org.jetbrains.kotlin.context.GlobalContext; @@ -54,14 +51,17 @@ import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.storage.ExceptionTracker; import org.jetbrains.kotlin.storage.LockBasedStorageManager; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.util.DescriptorValidator; +import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator; import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.File; import java.util.*; -import static org.jetbrains.jet.test.util.RecursiveDescriptorComparator.RECURSIVE; -import static org.jetbrains.jet.test.util.RecursiveDescriptorComparator.RECURSIVE_ALL; import static org.jetbrains.kotlin.diagnostics.Errors.*; +import static org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.RECURSIVE; +import static org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.RECURSIVE_ALL; public abstract class AbstractJetDiagnosticsTest extends BaseDiagnosticsTest { diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithStdLib.java b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithStdLib.java index bd3e8167b88..aba44657a3a 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithStdLib.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/AbstractJetDiagnosticsTestWithStdLib.java @@ -16,11 +16,11 @@ package org.jetbrains.kotlin.checkers; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.TestJdkKind; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestJdkKind; import java.io.File; import java.util.Arrays; diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.java b/compiler/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.java index b50f00d2e3e..d4e9e3b496e 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/CheckerTestUtilTest.java @@ -21,14 +21,14 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiFile; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetLiteFixture; import org.jetbrains.kotlin.checkers.CheckerTestUtil.DiagnosedRange; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetLiteFixture; import java.io.File; import java.util.Collections; diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java index d05ca8d4094..0d68588a63e 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java index 9a813da57a4..ef1809a6b98 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithJsStdLibGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java index 3668cc7b48c..1227e882445 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestWithStdLibGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithWithJava.java b/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithWithJava.java index 24f7e58ec51..c0365c8de27 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithWithJava.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/KotlinMultiFileTestWithWithJava.java @@ -21,14 +21,14 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetLiteFixture; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.TestJdkKind; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.config.CommonConfigurationKeys; import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetLiteFixture; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestJdkKind; import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/cli/AbstractKotlincExecutableTest.java b/compiler/tests/org/jetbrains/kotlin/cli/AbstractKotlincExecutableTest.java index 66383ce8269..e29bd2b562c 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/AbstractKotlincExecutableTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/AbstractKotlincExecutableTest.java @@ -20,10 +20,10 @@ import com.intellij.execution.process.ProcessOutput; import com.intellij.execution.util.ExecUtil; import com.intellij.openapi.util.SystemInfo; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.TestCaseWithTmpdir; -import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.kotlin.cli.common.ExitCode; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestCaseWithTmpdir; +import org.jetbrains.kotlin.utils.PathUtil; import java.io.File; import java.util.List; diff --git a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java index 0f5903da238..f48fc17826f 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/CliBaseTest.java @@ -22,14 +22,14 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.kotlin.load.java.JvmAbi; -import org.jetbrains.jet.test.Tmpdir; -import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.cli.common.CLICompiler; import org.jetbrains.kotlin.cli.common.ExitCode; import org.jetbrains.kotlin.cli.js.K2JSCompiler; import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.Tmpdir; +import org.jetbrains.kotlin.utils.UtilsPackage; import org.junit.Rule; import org.junit.rules.TestName; diff --git a/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java index 602fea7aa3b..3ea1ef7ea5e 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/KotlincExecutableTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.cli; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java index d6974b80c22..42a6b8713fe 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractBytecodeTextTest.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.codegen; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java index 00e393775c8..876fac505cc 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractCheckLocalVariablesTableTest.java @@ -23,12 +23,12 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestCaseWithTmpdir; import org.jetbrains.org.objectweb.asm.*; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java index 8dfb0c7c68e..5de0e8093e0 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractLineNumberTest.java @@ -21,21 +21,17 @@ import com.google.common.collect.Maps; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestCaseBuilder; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.kotlin.codegen.state.GenerationState; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.test.TestCaseWithTmpdir; -import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.codegen.state.GenerationState; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.test.*; +import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.org.objectweb.asm.*; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java index 1dfde0f3c49..f8505bb11b2 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractScriptCodegenTest.java @@ -18,9 +18,9 @@ package org.jetbrains.kotlin.codegen; import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.kotlin.resolve.ScriptNameUtil; import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.resolve.ScriptNameUtil; +import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.kotlin.utils.UtilsPackage; import java.lang.reflect.Constructor; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java index b2c8ddf2e0e..85662f29670 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AbstractTopLevelMembersInvocationTest.java @@ -20,9 +20,9 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.*; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.test.*; import java.io.File; import java.util.ArrayList; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java index 2df47bfc4f9..07f2c28345a 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/AnnotationGenTest.java @@ -18,9 +18,9 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.test.ConfigurationKind; import java.lang.annotation.*; import java.lang.reflect.*; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java index 3926a2f8aeb..3285eb8349e 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BytecodeTextTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java index ec30529ba8e..58ee372bc03 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CheckLocalVariablesTableTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java index 47181e41611..e3520ff8e5a 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ClassGenTest.java @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.codegen; -import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.test.ConfigurationKind; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ClassPathInParentClassLoaderTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ClassPathInParentClassLoaderTest.java index 80cf601200d..e081698623a 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ClassPathInParentClassLoaderTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ClassPathInParentClassLoaderTest.java @@ -17,11 +17,11 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.TestJdkKind; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestJdkKind; import java.io.File; import java.net.URLClassLoader; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java index 4eb1010d3fe..f568f7a8528 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestCase.java @@ -21,16 +21,16 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.testFramework.TestDataFile; import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestCaseBuilder; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; -import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.tree.ClassNode; import org.jetbrains.org.objectweb.asm.tree.MethodNode; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java index 44a16dfeedc..9ec3d401d6e 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestFiles.java @@ -21,8 +21,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import com.intellij.psi.PsiErrorElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestCaseBuilder; -import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.checkers.CheckerTestUtil; import org.jetbrains.kotlin.name.Name; @@ -31,6 +29,8 @@ import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; import org.jetbrains.kotlin.resolve.AnalyzingUtils; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.types.JetType; import org.jetbrains.kotlin.types.Variance; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java index 958bfe07e8d..fd34023fc4c 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/CodegenTestUtil.java @@ -22,8 +22,6 @@ import com.intellij.psi.PsiFile; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetTestCaseBuilder; -import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; @@ -34,6 +32,8 @@ import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.resolve.AnalyzingUtils; import org.jetbrains.kotlin.resolve.BindingTraceContext; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ControlStructuresTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ControlStructuresTest.java index c013bd45f2d..354d877d0a1 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ControlStructuresTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ControlStructuresTest.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.kotlin.test.ConfigurationKind; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/EnumGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/EnumGenTest.java index 301ce810804..14d5d805e8e 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/EnumGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/EnumGenTest.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.codegen; -import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.kotlin.test.ConfigurationKind; import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/FunctionGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/FunctionGenTest.java index 7510813f82b..1457f131e73 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/FunctionGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/FunctionGenTest.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.codegen; -import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.kotlin.test.ConfigurationKind; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java index 59b31977214..ce5fdc9980c 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/GenerateNotNullAssertionsTest.java @@ -19,9 +19,6 @@ package org.jetbrains.kotlin.codegen; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.TestJdkKind; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; @@ -31,6 +28,9 @@ import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestJdkKind; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.MethodVisitor; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java index 64ac3942f6c..01edc261dc8 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/InnerClassInfoGenTest.java @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.kotlin.load.java.JvmAbi; -import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.backend.common.output.OutputFile; +import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.Opcodes; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/JUnitUsageGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/JUnitUsageGenTest.java index 01af0fe0f80..3a154197518 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/JUnitUsageGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/JUnitUsageGenTest.java @@ -16,11 +16,11 @@ package org.jetbrains.kotlin.codegen; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.TestJdkKind; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestJdkKind; import org.junit.Test; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/JetValueParameterAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/JetValueParameterAnnotationTest.java index e223ecc6375..79b3910ff28 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/JetValueParameterAnnotationTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/JetValueParameterAnnotationTest.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.kotlin.test.ConfigurationKind; import java.lang.annotation.Annotation; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java index a0d0a17cc6b..c589c7a2a90 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinClassAnnotationTest.java @@ -16,12 +16,12 @@ package org.jetbrains.kotlin.codegen; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.kotlin.serialization.ClassData; -import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil; import org.jetbrains.kotlin.load.java.JvmAnnotationNames; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqNameUnsafe; +import org.jetbrains.kotlin.serialization.ClassData; +import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil; +import org.jetbrains.kotlin.test.ConfigurationKind; import java.lang.annotation.Annotation; import java.util.Arrays; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java index 4f478c78e0e..0c8ae032fb1 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinPackageAnnotationTest.java @@ -17,14 +17,14 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil; -import org.jetbrains.kotlin.serialization.deserialization.NameResolver; -import org.jetbrains.kotlin.serialization.PackageData; -import org.jetbrains.kotlin.serialization.ProtoBuf; import org.jetbrains.kotlin.load.java.JvmAnnotationNames; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.serialization.PackageData; +import org.jetbrains.kotlin.serialization.ProtoBuf; +import org.jetbrains.kotlin.serialization.deserialization.NameResolver; +import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil; +import org.jetbrains.kotlin.test.ConfigurationKind; import java.lang.annotation.Annotation; import java.util.Arrays; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java index 659cd7b332f..334aa7220a5 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/KotlinSyntheticClassAnnotationTest.java @@ -19,11 +19,11 @@ package org.jetbrains.kotlin.codegen; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.load.java.AbiVersionUtil; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.backend.common.output.OutputFile; +import org.jetbrains.kotlin.test.ConfigurationKind; import java.lang.annotation.Annotation; import java.util.Collection; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/LineNumberTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/LineNumberTestGenerated.java index 7c1c2957205..87c7015f458 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/LineNumberTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/LineNumberTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt index 029ad274c36..2a6774c007b 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.codegen -import org.jetbrains.jet.ConfigurationKind +import org.jetbrains.kotlin.test.ConfigurationKind import org.jetbrains.asm4.ClassReader import org.jetbrains.asm4.ClassVisitor import org.jetbrains.asm4.Opcodes diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java index b4031bd0bbc..8e722d01aea 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/OuterClassGenTest.java @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.codegen; import com.intellij.util.lang.UrlClassLoader; import org.intellij.lang.annotations.Language; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; +import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.Opcodes; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/PackageGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/PackageGenTest.java index 57db960d90a..a82019c6c5f 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/PackageGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/PackageGenTest.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.codegen; import com.intellij.util.ArrayUtil; -import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.kotlin.test.ConfigurationKind; import java.awt.*; import java.lang.reflect.InvocationTargetException; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/PatternMatchingTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/PatternMatchingTest.java index 6c982b8525d..7825e5f50ad 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/PatternMatchingTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/PatternMatchingTest.java @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.kotlin.test.ConfigurationKind; import java.lang.reflect.Method; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/PrimitiveTypesTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/PrimitiveTypesTest.java index bddb5f40edc..fa3fa8fc369 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/PrimitiveTypesTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/PrimitiveTypesTest.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.codegen; -import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.kotlin.test.ConfigurationKind; import java.lang.reflect.Method; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/PropertyGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/PropertyGenTest.java index 3d60b95bd63..adbfe1835ad 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/PropertyGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/PropertyGenTest.java @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.kotlin.load.java.JvmAbi; +import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.org.objectweb.asm.Opcodes; import java.lang.reflect.*; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java index 5a88ae7890e..6487d18173b 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java index 1ecb45f49f5..f05b0a54c41 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/ScriptGenTest.java @@ -16,12 +16,12 @@ package org.jetbrains.kotlin.codegen; -import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.parsing.JetScriptDefinition; import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; -import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.org.objectweb.asm.Opcodes; import java.lang.reflect.Constructor; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/SourceInfoGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/SourceInfoGenTest.java index 28726c2f35d..d1316b2a7d8 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/SourceInfoGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/SourceInfoGenTest.java @@ -15,8 +15,8 @@ */ package org.jetbrains.kotlin.codegen; -import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.kotlin.backend.common.output.OutputFile; +import org.jetbrains.kotlin.test.ConfigurationKind; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.Opcodes; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/StringsTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/StringsTest.java index 11f61d06118..f2541634090 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/StringsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/StringsTest.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.codegen; -import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.kotlin.test.ConfigurationKind; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java index b21718766ac..c2eb6d98c4f 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/SyntheticMethodForAnnotatedPropertyGenTest.java @@ -17,12 +17,12 @@ package org.jetbrains.kotlin.codegen; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.backend.common.output.OutputFile; +import org.jetbrains.kotlin.test.ConfigurationKind; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java index 4e46f19ad30..a0effcb48e8 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/TestlibTest.java @@ -21,10 +21,6 @@ import junit.extensions.TestSetup; import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestCaseBuilder; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.TestJdkKind; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; import org.jetbrains.kotlin.cli.common.messages.MessageCollectorPlainTextToStream; import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; @@ -42,6 +38,10 @@ import org.jetbrains.kotlin.psi.JetDeclaration; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContextUtils; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestJdkKind; import org.jetbrains.kotlin.types.JetType; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/TopLevelMembersInvocationTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/TopLevelMembersInvocationTestGenerated.java index 78008a328a1..85b57c25d56 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/TopLevelMembersInvocationTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/TopLevelMembersInvocationTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.codegen; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/VarArgTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/VarArgTest.java index a8e9057816e..b56c1b5d4af 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/VarArgTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/VarArgTest.java @@ -16,7 +16,7 @@ package org.jetbrains.kotlin.codegen; -import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.kotlin.test.ConfigurationKind; import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java index a4bf0153305..a4fe7b1b929 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/AbstractDefaultArgumentsReflectionTest.java @@ -17,15 +17,15 @@ package org.jetbrains.kotlin.codegen.defaultConstructor; import com.intellij.openapi.util.io.FileUtil; -import org.jetbrains.jet.ConfigurationKind; import org.jetbrains.kotlin.codegen.CodegenTestCase; +import org.jetbrains.kotlin.test.ConfigurationKind; import java.io.File; import java.io.IOException; import java.lang.reflect.Constructor; import java.util.List; -import static org.jetbrains.jet.InTextDirectivesUtils.findListWithPrefixes; +import static org.jetbrains.kotlin.test.InTextDirectivesUtils.findListWithPrefixes; public abstract class AbstractDefaultArgumentsReflectionTest extends CodegenTestCase { diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java index c03415de9a0..3cd4e946024 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/defaultConstructor/DefaultArgumentsReflectionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.codegen.defaultConstructor; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java index e3c4fe80607..7377c62495e 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.codegen.flags; import com.intellij.openapi.util.io.FileUtil; import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.codegen.GenerationUtils; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.org.objectweb.asm.*; import java.io.File; @@ -33,8 +33,8 @@ import java.lang.reflect.Field; import java.util.ArrayList; import java.util.List; -import static org.jetbrains.jet.InTextDirectivesUtils.findListWithPrefixes; -import static org.jetbrains.jet.InTextDirectivesUtils.findStringWithPrefixes; +import static org.jetbrains.kotlin.test.InTextDirectivesUtils.findListWithPrefixes; +import static org.jetbrains.kotlin.test.InTextDirectivesUtils.findStringWithPrefixes; /* * Test correctness of written flags in class file diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java index a3845f983c6..48af33b87ac 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/flags/WriteFlagsTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.codegen.flags; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java index 01b2e43f43c..0043108f239 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/AbstractBlackBoxCodegenTest.java @@ -21,9 +21,6 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.Processor; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.TestJdkKind; import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; @@ -33,6 +30,9 @@ import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.codegen.InlineTestUtil; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestJdkKind; import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java index 6e3e3ecbfb5..0ba4850f845 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java index a6b3a5bd8fd..e6c2a55eb5a 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java index cae92a79d1e..07b0b036ff7 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxInlineCodegenTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java index b01853f71f4..6a38459f69c 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxMultiFileCodegenTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java index 38141812870..f262a15cb0b 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java index 69a68ea59e3..fc065c8e328 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.codegen.generated; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java b/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java index 009ec61c26c..722a1017a72 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java +++ b/compiler/tests/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java @@ -30,12 +30,12 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.intellij.lang.annotations.Language; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestCaseBuilder; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; -import org.jetbrains.jet.test.Tmpdir; -import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.kotlin.cli.common.KotlinVersion; +import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.Tmpdir; +import org.jetbrains.kotlin.utils.PathUtil; import org.junit.ComparisonFailure; import org.junit.Rule; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java similarity index 85% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java index 6642c428176..0590681714e 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler; +package org.jetbrains.kotlin.jvm.compiler; -import org.jetbrains.jet.test.TestCaseWithTmpdir; +import org.jetbrains.kotlin.test.TestCaseWithTmpdir; import org.junit.Assert; import java.io.File; import java.io.IOException; import java.util.Collections; -import static org.jetbrains.jet.JetTestUtils.compileKotlinWithJava; +import static org.jetbrains.kotlin.test.JetTestUtils.compileKotlinWithJava; @SuppressWarnings({"JUnitTestCaseWithNonTrivialConstructors", "JUnitTestCaseWithNoTests"}) public abstract class AbstractCompileJavaAgainstKotlinTest extends TestCaseWithTmpdir { diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java similarity index 95% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java index 0f5003c265c..f014f47921b 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstKotlinTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,31 +14,31 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler; +package org.jetbrains.kotlin.jvm.compiler; import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.kotlin.codegen.ClassFileFactory; -import org.jetbrains.kotlin.codegen.GenerationUtils; -import org.jetbrains.kotlin.codegen.InlineTestUtil; -import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; -import org.jetbrains.kotlin.config.CompilerConfiguration; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.jet.test.TestCaseWithTmpdir; -import org.jetbrains.kotlin.utils.UtilsPackage; import org.jetbrains.kotlin.backend.common.output.OutputFile; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.codegen.ClassFileFactory; +import org.jetbrains.kotlin.codegen.GenerationUtils; +import org.jetbrains.kotlin.codegen.InlineTestUtil; +import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; +import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestCaseWithTmpdir; +import org.jetbrains.kotlin.test.TestJdkKind; +import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.File; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java similarity index 94% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java index 85e64fb0f78..e171ae20b88 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadJavaTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler; +package org.jetbrains.kotlin.jvm.compiler; import com.google.common.base.Predicates; import com.intellij.openapi.util.Pair; @@ -22,13 +22,13 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiFile; import junit.framework.ComparisonFailure; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.TestJdkKind; import org.jetbrains.kotlin.analyzer.AnalysisResult; +import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.config.CommonConfigurationKeys; import org.jetbrains.kotlin.config.CompilerConfiguration; -import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; @@ -40,15 +40,15 @@ import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.TopDownAnalysisParameters; import org.jetbrains.kotlin.resolve.jvm.TopDownAnalyzerFacadeForJVM; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; +import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedClassDescriptor; import org.jetbrains.kotlin.storage.ExceptionTracker; import org.jetbrains.kotlin.storage.LockBasedStorageManager; -import org.jetbrains.jet.test.TestCaseWithTmpdir; -import org.jetbrains.jet.test.util.DescriptorValidator; -import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; -import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; -import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; -import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestCaseWithTmpdir; +import org.jetbrains.kotlin.test.TestJdkKind; +import org.jetbrains.kotlin.test.util.DescriptorValidator; +import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator; import org.junit.Assert; import java.io.File; @@ -60,11 +60,11 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; -import static org.jetbrains.jet.JetTestUtils.*; -import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.*; -import static org.jetbrains.jet.test.util.DescriptorValidator.ValidationVisitor.errorTypesAllowed; -import static org.jetbrains.jet.test.util.DescriptorValidator.ValidationVisitor.errorTypesForbidden; -import static org.jetbrains.jet.test.util.RecursiveDescriptorComparator.*; +import static org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil.*; +import static org.jetbrains.kotlin.test.JetTestUtils.*; +import static org.jetbrains.kotlin.test.util.DescriptorValidator.ValidationVisitor.errorTypesAllowed; +import static org.jetbrains.kotlin.test.util.DescriptorValidator.ValidationVisitor.errorTypesForbidden; +import static org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.*; /* The generated test compares package descriptors loaded from kotlin sources and read from compiled java. diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java index c44e8df198f..a5287ef8b71 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractSdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractSdkAnnotationsValidityTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,29 +14,29 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler; +package org.jetbrains.kotlin.jvm.compiler; import com.google.common.collect.Maps; import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies; +import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolver; +import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolverUtil; +import org.jetbrains.kotlin.load.java.JavaBindingContext; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.platform.JavaToKotlinClassMap; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.resolve.ResolvePackage; -import org.jetbrains.kotlin.load.java.JavaBindingContext; import org.jetbrains.kotlin.resolve.jvm.kotlinSignature.TypeTransformingVisitor; -import org.jetbrains.kotlin.platform.JavaToKotlinClassMap; -import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.resolve.scopes.JetScope; -import org.jetbrains.kotlin.renderer.DescriptorRenderer; -import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; -import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolver; -import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolverUtil; import java.io.IOException; import java.util.List; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.java similarity index 97% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.java index 737bdfb028d..4945be3bd36 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractWriteSignatureTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler; +package org.jetbrains.kotlin.jvm.compiler; import com.google.common.io.Closeables; import com.google.common.io.Files; @@ -22,13 +22,13 @@ import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.kotlin.codegen.GenerationUtils; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.codegen.GenerationUtils; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestCaseWithTmpdir; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.MethodVisitor; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/AndroidSdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AndroidSdkAnnotationsValidityTest.java similarity index 91% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/AndroidSdkAnnotationsValidityTest.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/AndroidSdkAnnotationsValidityTest.java index dab24aa8a48..0b1dfef8bc6 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/AndroidSdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/AndroidSdkAnnotationsValidityTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler; +package org.jetbrains.kotlin.jvm.compiler; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.intellij.openapi.Disposable; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.kotlin.config.CompilerConfiguration; -import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestJdkKind; import java.io.IOException; import java.util.Enumeration; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java similarity index 95% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java index a58b6ec027a..5512ebd7617 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileEnvironmentTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler; +package org.jetbrains.kotlin.jvm.compiler; import com.intellij.openapi.util.io.FileUtil; import junit.framework.TestCase; -import org.jetbrains.jet.JetTestCaseBuilder; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.cli.common.ExitCode; +import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.cli.common.ExitCode; -import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.JetTestUtils; import org.junit.Assert; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java similarity index 99% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java index c9979e86b18..15f939e5399 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileJavaAgainstKotlinTestGenerated.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler; +package org.jetbrains.kotlin.jvm.compiler; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java similarity index 94% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index 4121bf61cfa..eac50d74a78 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,31 +14,27 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler; +package org.jetbrains.kotlin.jvm.compiler; import com.google.common.collect.Iterables; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.MockLibraryUtil; -import org.jetbrains.jet.TestJdkKind; import org.jetbrains.kotlin.analyzer.AnalysisResult; +import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport; +import org.jetbrains.kotlin.cli.common.messages.MessageCollectorPlainTextToStream; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; -import org.jetbrains.jet.test.TestCaseWithTmpdir; -import org.jetbrains.jet.test.util.DescriptorValidator; -import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; +import org.jetbrains.kotlin.test.*; +import org.jetbrains.kotlin.test.util.DescriptorValidator; +import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator; import org.jetbrains.kotlin.utils.UtilsPackage; -import org.jetbrains.kotlin.cli.common.messages.AnalyzerWithCompilerReport; -import org.jetbrains.kotlin.cli.common.messages.MessageCollectorPlainTextToStream; -import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.BufferedOutputStream; import java.io.File; @@ -50,7 +46,7 @@ import java.util.jar.JarFile; import java.util.zip.ZipOutputStream; import static org.jetbrains.kotlin.resolve.DescriptorUtils.isObject; -import static org.jetbrains.jet.test.util.RecursiveDescriptorComparator.validateAndCompareDescriptorWithFile; +import static org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.validateAndCompareDescriptorWithFile; public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { public static final String TEST_DATA_PATH = "compiler/testData/compileKotlinAgainstCustomBinaries/"; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java similarity index 99% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java index ad2f6fdd933..29140fab91e 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstInlineKotlinTestGenerated.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler; +package org.jetbrains.kotlin.jvm.compiler; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java similarity index 96% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java index 4b2279a10f1..90773ac50f9 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstKotlinTestGenerated.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler; +package org.jetbrains.kotlin.jvm.compiler; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt similarity index 85% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt index d22404f0c5e..7a6318bd108 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/DeserializedScopeValidationVisitor.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/DeserializedScopeValidationVisitor.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,23 +14,20 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler +package org.jetbrains.kotlin.jvm.compiler import org.jetbrains.kotlin.resolve.scopes.JetScope import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedMemberScope import org.jetbrains.kotlin.descriptors.DeclarationDescriptor -import java.util.Collections -import org.jetbrains.kotlin.serialization.DescriptorSerializer import com.intellij.testFramework.UsefulTestCase -import java.util.ArrayList import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor -import org.jetbrains.jet.test.util.DescriptorValidator -import org.jetbrains.jet.test.util.DescriptorValidator.ValidationVisitor +import org.jetbrains.kotlin.test.util.DescriptorValidator +import org.jetbrains.kotlin.test.util.DescriptorValidator.ValidationVisitor import org.jetbrains.kotlin.descriptors.PackageViewDescriptor import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.resolve.MemberComparator -class DeserializedScopeValidationVisitor : DescriptorValidator.ValidationVisitor() { +class DeserializedScopeValidationVisitor : ValidationVisitor() { override fun validateScope(scope: JetScope, collector: DescriptorValidator.DiagnosticCollector) { super.validateScope(scope, collector) validateDeserializedScope(scope) diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java similarity index 97% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java index e1d5956d0e2..10627ade633 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/ExpectedLoadErrorsUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler; +package org.jetbrains.kotlin.jvm.compiler; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.jvm.compiler.annotation.ExpectLoadError; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor; import org.jetbrains.kotlin.descriptors.impl.DeclarationDescriptorVisitorEmptyBodies; -import org.jetbrains.kotlin.resolve.BindingContext; -import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.jvm.compiler.annotation.ExpectLoadError; import org.jetbrains.kotlin.load.java.JavaBindingContext; import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.resolve.BindingContext; +import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; +import org.jetbrains.kotlin.resolve.scopes.JetScope; import java.util.*; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java similarity index 97% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java index 9154c525b6b..27b846c63f2 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler; +package org.jetbrains.kotlin.jvm.compiler; import com.google.common.collect.Sets; import com.intellij.codeInsight.AnnotationUtil; @@ -25,14 +25,14 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiFormatUtil; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.kotlin.load.java.JvmAnnotationNames; -import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; -import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.cli.jvm.compiler.CoreExternalAnnotationsManager; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.load.java.JvmAnnotationNames; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestJdkKind; import java.util.Set; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JdkAnnotationsValidityTest.java similarity index 95% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/JdkAnnotationsValidityTest.java index a8411316152..ca49638a1c7 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/JdkAnnotationsValidityTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler; +package org.jetbrains.kotlin.jvm.compiler; import com.google.common.collect.Lists; import com.google.common.collect.Sets; @@ -27,14 +27,14 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; import com.intellij.openapi.vfs.VirtualFileVisitor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.kotlin.config.CompilerConfiguration; -import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestJdkKind; import java.io.File; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/KotlinClassFinderTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt similarity index 88% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/KotlinClassFinderTest.kt rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt index 6f20399d37d..aa0106292c0 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/KotlinClassFinderTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/KotlinClassFinderTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler +package org.jetbrains.kotlin.jvm.compiler -import org.jetbrains.jet.KotlinTestWithEnvironmentManagement -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestWithEnvironmentManagement +import org.jetbrains.kotlin.test.JetTestUtils import java.io.File import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment -import org.jetbrains.jet.ConfigurationKind -import org.jetbrains.jet.TestJdkKind +import org.jetbrains.kotlin.test.ConfigurationKind +import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.load.kotlin.VirtualFileFinder import com.intellij.psi.JavaPsiFacade import com.intellij.psi.search.GlobalSearchScope diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java similarity index 95% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java index 9df479e0d62..5648a883fda 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadDescriptorUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadDescriptorUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler; +package org.jetbrains.kotlin.jvm.compiler; import com.google.common.base.Predicates; import com.intellij.openapi.Disposable; @@ -24,28 +24,28 @@ import com.intellij.psi.PsiFile; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.TestJdkKind; import org.jetbrains.kotlin.analyzer.AnalysisResult; +import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.codegen.GenerationUtils; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; +import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolver; +import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolverUtil; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; -import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; -import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolver; -import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolverUtil; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestJdkKind; import java.io.File; import java.io.IOException; @@ -53,7 +53,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import static org.jetbrains.jet.JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations; +import static org.jetbrains.kotlin.test.JetTestUtils.createEnvironmentWithMockJdkAndIdeaAnnotations; public final class LoadDescriptorUtil { diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java similarity index 99% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java index b3d0295eb8f..65869eb01b4 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/LoadJavaTestGenerated.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler; +package org.jetbrains.kotlin.jvm.compiler; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt similarity index 98% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt index 260ebc92688..da2cc9316c2 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/MultiModuleJavaAnalysisCustomTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler +package org.jetbrains.kotlin.jvm.compiler import org.jetbrains.kotlin.resolve.jvm.JvmAnalyzerFacade import org.jetbrains.kotlin.context.GlobalContext -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils import com.intellij.testFramework.UsefulTestCase import org.jetbrains.kotlin.resolve.jvm.JvmPlatformParameters import org.jetbrains.kotlin.psi.JetFile diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java index 88cb22c71c8..2c674f20c38 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/WriteSignatureTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/WriteSignatureTestGenerated.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler; +package org.jetbrains.kotlin.jvm.compiler; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/annotation/ExpectLoadError.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/annotation/ExpectLoadError.java similarity index 90% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/annotation/ExpectLoadError.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/annotation/ExpectLoadError.java index ca6b14c2a2f..260eff3be4a 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/annotation/ExpectLoadError.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/annotation/ExpectLoadError.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler.annotation; +package org.jetbrains.kotlin.jvm.compiler.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/LibFromMaven.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/LibFromMaven.java similarity index 93% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/LibFromMaven.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/LibFromMaven.java index 79803ed28de..da64aff335c 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/LibFromMaven.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/LibFromMaven.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler.longTest; +package org.jetbrains.kotlin.jvm.compiler.longTest; import org.jetbrains.annotations.NotNull; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java similarity index 88% rename from compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java rename to compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java index 270accd7bd4..0b0846777b4 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/longTest/ResolveDescriptorsFromExternalLibraries.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.jvm.compiler.longTest; +package org.jetbrains.kotlin.jvm.compiler.longTest; import com.google.common.collect.Lists; import com.google.common.io.ByteStreams; @@ -26,21 +26,20 @@ import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.params.HttpMethodParams; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.TestJdkKind; -import org.jetbrains.jet.TimeUtils; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; -import org.jetbrains.kotlin.resolve.BindingTraceContext; -import org.jetbrains.kotlin.resolve.ResolvePackage; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.utils.PathUtil; -import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolver; import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolverUtil; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.resolve.BindingTraceContext; +import org.jetbrains.kotlin.resolve.ResolvePackage; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestJdkKind; +import org.jetbrains.kotlin.utils.PathUtil; import java.io.*; import java.util.Arrays; @@ -49,10 +48,8 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; public class ResolveDescriptorsFromExternalLibraries { - - public static void main(String[] args) throws Exception { - boolean hasErrors = new ResolveDescriptorsFromExternalLibraries().run(); + boolean hasErrors = run(); System.out.println("$"); if (hasErrors) { System.exit(1); @@ -78,7 +75,7 @@ public class ResolveDescriptorsFromExternalLibraries { return r; } - private boolean run() throws Exception { + private static boolean run() throws Exception { boolean hasErrors = false; hasErrors |= testLibrary("org.scala-lang", "scala-library", "2.9.2", 1); @@ -96,18 +93,18 @@ public class ResolveDescriptorsFromExternalLibraries { return hasErrors; } - private boolean testLibraryFromUrl(@NotNull String urlJar, int classesPerChunk) throws Exception { + private static boolean testLibraryFromUrl(@NotNull String urlJar, int classesPerChunk) throws Exception { return testLibraryFile(getLibraryFromUrl(urlJar), urlJar, classesPerChunk); } - private boolean testLibrary(@NotNull String org, @NotNull String module, @NotNull String rev, int classesPerChunk) throws Exception { + private static boolean testLibrary(@NotNull String org, @NotNull String module, @NotNull String rev, int classesPerChunk) throws Exception { LibFromMaven lib = new LibFromMaven(org, module, rev); File jar = getLibraryFromMaven(lib); return testLibraryFile(jar, lib.toString(), classesPerChunk); } - private boolean testLibraryFile(@Nullable File jar, @NotNull String libDescription, int classesPerChunk) throws IOException { + private static boolean testLibraryFile(@Nullable File jar, @NotNull String libDescription, int classesPerChunk) throws IOException { System.out.println("Testing library " + libDescription + "..."); if (jar != null) { System.out.println("Using file " + jar); @@ -133,11 +130,20 @@ public class ResolveDescriptorsFromExternalLibraries { } catch (Throwable e) {} } - System.out.println("Testing library " + libDescription + " done in " + TimeUtils.millisecondsToSecondsString(System.currentTimeMillis() - start) + "s " + (hasErrors ? "with" : "without") + " errors"); + System.out.println( + "Testing library " + libDescription + " done in " + + millisecondsToSecondsString(System.currentTimeMillis() - start) + "s " + + (hasErrors ? "with" : "without") + " errors" + ); return hasErrors; } + @NotNull + private static String millisecondsToSecondsString(long millis) { + return millis / 1000 + "." + String.format("%03d", millis % 1000); + } + @NotNull private static File findRtJar() { List roots = PathUtil.getJdkClassesRoots(); @@ -149,7 +155,7 @@ public class ResolveDescriptorsFromExternalLibraries { throw new IllegalArgumentException("No rt.jar/classes.jar found under " + System.getProperty("java.home")); } - private boolean parseLibraryFileChunk(File jar, String libDescription, ZipInputStream zip, int classesPerChunk) throws IOException { + private static boolean parseLibraryFileChunk(File jar, String libDescription, ZipInputStream zip, int classesPerChunk) throws IOException { Disposable junk = new Disposable() { @Override public void dispose() { } @@ -229,7 +235,7 @@ public class ResolveDescriptorsFromExternalLibraries { } @NotNull - private File getLibraryFromUrl(@NotNull String url) throws Exception { + private static File getLibraryFromUrl(@NotNull String url) throws Exception { String fileName = url .replaceAll("^http://", "") @@ -243,7 +249,7 @@ public class ResolveDescriptorsFromExternalLibraries { } @NotNull - private File getLibraryFromMaven(@NotNull LibFromMaven lib) throws Exception { + private static File getLibraryFromMaven(@NotNull LibFromMaven lib) throws Exception { String fileName = lib.getModule() + "-" + lib.getRev() + ".jar"; File dir = new File(userHome(), ".kotlin-project/resolve-libraries/" + lib.getOrg() + "/" + lib.getModule()); diff --git a/compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java b/compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java similarity index 95% rename from compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java rename to compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java index 8506e61c168..18226ea37be 100644 --- a/compiler/tests/org/jetbrains/jet/modules/xml/AbstractModuleXmlParserTest.java +++ b/compiler/tests/org/jetbrains/kotlin/modules/xml/AbstractModuleXmlParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.jetbrains.jet.modules.xml; +package org.jetbrains.kotlin.modules.xml; import com.intellij.openapi.util.io.FileUtil; import junit.framework.TestCase; import kotlin.modules.Module; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation; import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.kotlin.cli.common.messages.MessageCollector; import org.jetbrains.kotlin.cli.common.messages.MessageRenderer; import org.jetbrains.kotlin.cli.common.modules.ModuleScriptData; import org.jetbrains.kotlin.cli.common.modules.ModuleXmlParser; +import org.jetbrains.kotlin.test.JetTestUtils; import java.io.File; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/jet/modules/xml/ModuleXmlParserTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/modules/xml/ModuleXmlParserTestGenerated.java similarity index 92% rename from compiler/tests/org/jetbrains/jet/modules/xml/ModuleXmlParserTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/modules/xml/ModuleXmlParserTestGenerated.java index 4da1ae56271..0a856e71be8 100644 --- a/compiler/tests/org/jetbrains/jet/modules/xml/ModuleXmlParserTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/modules/xml/ModuleXmlParserTestGenerated.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.modules.xml; +package org.jetbrains.kotlin.modules.xml; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/FqNameTest.java b/compiler/tests/org/jetbrains/kotlin/name/FqNameTest.java similarity index 92% rename from compiler/tests/org/jetbrains/jet/FqNameTest.java rename to compiler/tests/org/jetbrains/kotlin/name/FqNameTest.java index 638a73fdb5c..3013d3d9429 100644 --- a/compiler/tests/org/jetbrains/jet/FqNameTest.java +++ b/compiler/tests/org/jetbrains/kotlin/name/FqNameTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,8 @@ * limitations under the License. */ -package org.jetbrains.jet; +package org.jetbrains.kotlin.name; -import com.google.common.collect.Lists; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.name.FqNameUnsafe; -import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.name.NamePackage; import org.junit.Assert; import org.junit.Test; @@ -29,7 +24,6 @@ import java.util.Arrays; import java.util.List; public class FqNameTest { - @Test public void pathRoot() { List path = new FqName("").path(); @@ -78,7 +72,7 @@ public class FqNameTest { @Test public void pathSegments() { - Assert.assertEquals(Lists.newArrayList(), new FqName("").pathSegments()); + Assert.assertEquals(new ArrayList(), new FqName("").pathSegments()); for (String name : new String[] { "org", "org.jetbrains", "org.jetbrains.kotlin" }) { List segments = new FqName(name).pathSegments(); diff --git a/compiler/tests/org/jetbrains/jet/PackageClassNameTest.java b/compiler/tests/org/jetbrains/kotlin/name/PackageClassNameTest.java similarity index 93% rename from compiler/tests/org/jetbrains/jet/PackageClassNameTest.java rename to compiler/tests/org/jetbrains/kotlin/name/PackageClassNameTest.java index dc9ab63948d..995544a6f46 100644 --- a/compiler/tests/org/jetbrains/jet/PackageClassNameTest.java +++ b/compiler/tests/org/jetbrains/kotlin/name/PackageClassNameTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,12 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet; +package org.jetbrains.kotlin.name; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.name.Name; import org.junit.Test; import static org.jetbrains.kotlin.load.kotlin.PackageClassUtils.getPackageClassName; diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java index 2b3dbe6ee79..eed751aa098 100644 --- a/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java +++ b/compiler/tests/org/jetbrains/kotlin/parsing/AbstractJetParsingTest.java @@ -24,12 +24,12 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.testFramework.ParsingTestCase; import com.intellij.util.PathUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.kotlin.JetNodeTypes; import org.jetbrains.kotlin.psi.IfNotParsed; import org.jetbrains.kotlin.psi.JetElement; import org.jetbrains.kotlin.psi.JetPsiFactory; import org.jetbrains.kotlin.psi.JetVisitorVoid; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; import java.lang.annotation.Annotation; import java.lang.reflect.Method; diff --git a/compiler/tests/org/jetbrains/kotlin/parsing/JetParsingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/parsing/JetParsingTestGenerated.java index a9305527fa3..3ea708f19d1 100644 --- a/compiler/tests/org/jetbrains/kotlin/parsing/JetParsingTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/parsing/JetParsingTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.parsing; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java b/compiler/tests/org/jetbrains/kotlin/psi/JetPsiUtilTest.java similarity index 99% rename from compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java rename to compiler/tests/org/jetbrains/kotlin/psi/JetPsiUtilTest.java index 9b256bd73b5..92d13c9ba62 100644 --- a/compiler/tests/org/jetbrains/jet/lang/psi/JetPsiUtilTest.java +++ b/compiler/tests/org/jetbrains/kotlin/psi/JetPsiUtilTest.java @@ -18,13 +18,13 @@ package org.jetbrains.kotlin.psi; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.util.PsiTreeUtil; -import org.jetbrains.jet.JetLiteFixture; -import org.jetbrains.kotlin.config.CompilerConfiguration; -import org.jetbrains.kotlin.resolve.ImportPath; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.resolve.ImportPath; +import org.jetbrains.kotlin.test.JetLiteFixture; import org.junit.Assert; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/lang/psi/JetSimpleNameExpressionTest.kt b/compiler/tests/org/jetbrains/kotlin/psi/JetSimpleNameExpressionTest.kt similarity index 93% rename from compiler/tests/org/jetbrains/jet/lang/psi/JetSimpleNameExpressionTest.kt rename to compiler/tests/org/jetbrains/kotlin/psi/JetSimpleNameExpressionTest.kt index c33a81acf4f..06cc93027d5 100644 --- a/compiler/tests/org/jetbrains/jet/lang/psi/JetSimpleNameExpressionTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/psi/JetSimpleNameExpressionTest.kt @@ -17,13 +17,13 @@ package org.jetbrains.kotlin.psi import org.junit.Assert -import org.jetbrains.jet.JetLiteFixture +import org.jetbrains.kotlin.test.JetLiteFixture import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment import org.jetbrains.kotlin.config.CompilerConfiguration import org.jetbrains.kotlin.psi.psiUtil.getReceiverExpression import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles -public class JetSimpleNameExpressionTest() : JetLiteFixture() { +public class JetSimpleNameExpressionTest : JetLiteFixture() { public fun testGetReceiverExpressionIdentifier() { // Binary Expressions assertReceiver("1 + 2", "1") diff --git a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt index 3f3f3feccac..79ae8665461 100644 --- a/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/renderer/AbstractDescriptorRendererTest.kt @@ -20,10 +20,10 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.descriptors.ClassDescriptor import com.intellij.openapi.editor.impl.DocumentImpl -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils import java.util.ArrayList import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment -import org.jetbrains.jet.ConfigurationKind +import org.jetbrains.kotlin.test.ConfigurationKind import com.intellij.testFramework.UsefulTestCase import java.io.File import org.jetbrains.kotlin.resolve.lazy.ResolveSession diff --git a/compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java index 709cd15f9cd..ffb698c0710 100644 --- a/compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/renderer/DescriptorRendererTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.renderer; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/repl/AbstractReplInterpreterTest.kt b/compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt similarity index 93% rename from compiler/tests/org/jetbrains/jet/repl/AbstractReplInterpreterTest.kt rename to compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt index c0e54d1712d..f9e78ab4e3f 100644 --- a/compiler/tests/org/jetbrains/jet/repl/AbstractReplInterpreterTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/repl/AbstractReplInterpreterTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.repl +package org.jetbrains.kotlin.repl import com.intellij.openapi.util.text.StringUtil import com.intellij.testFramework.UsefulTestCase -import org.jetbrains.jet.ConfigurationKind -import org.jetbrains.jet.JetTestUtils -import org.jetbrains.jet.TestJdkKind +import org.jetbrains.kotlin.test.ConfigurationKind +import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.TestJdkKind import org.jetbrains.kotlin.cli.jvm.repl.ReplInterpreter import java.io.File import java.util.ArrayDeque diff --git a/compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/repl/ReplInterpreterTestGenerated.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/repl/ReplInterpreterTestGenerated.java index b76d45303c6..4a86ede6205 100644 --- a/compiler/tests/org/jetbrains/jet/repl/ReplInterpreterTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/repl/ReplInterpreterTestGenerated.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.repl; +package org.jetbrains.kotlin.repl; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt similarity index 91% rename from compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt rename to compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt index 87b07607dec..67942be81d9 100644 --- a/compiler/tests/org/jetbrains/jet/evaluate/AbstractEvaluateExpressionTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/AbstractEvaluateExpressionTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,24 +14,19 @@ * limitations under the License. */ -package org.jetbrains.jet.evaluate +package org.jetbrains.kotlin.resolve.constants.evaluate -import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.jet.resolve.annotation.AbstractAnnotationDescriptorResolveTest +import org.jetbrains.kotlin.resolve.BindingContext import java.io.File import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.jet.InTextDirectivesUtils +import org.jetbrains.kotlin.test.InTextDirectivesUtils import kotlin.test.assertNotNull import java.util.regex.Pattern -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.resolve.constants.StringValue import org.jetbrains.kotlin.descriptors.VariableDescriptor import org.jetbrains.kotlin.resolve.constants.IntegerValueConstant -import java.util.HashMap -import org.jetbrains.kotlin.psi.JetPsiFactory -import org.jetbrains.kotlin.resolve.constants.evaluate.ConstantExpressionEvaluator -import org.jetbrains.kotlin.resolve.DelegatingBindingTrace -import org.jetbrains.kotlin.types.TypeUtils public abstract class AbstractEvaluateExpressionTest : AbstractAnnotationDescriptorResolveTest() { diff --git a/compiler/tests/org/jetbrains/jet/evaluate/EvaluateExpressionTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/EvaluateExpressionTestGenerated.java similarity index 97% rename from compiler/tests/org/jetbrains/jet/evaluate/EvaluateExpressionTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/EvaluateExpressionTestGenerated.java index 538688f523c..7eb9edff6cd 100644 --- a/compiler/tests/org/jetbrains/jet/evaluate/EvaluateExpressionTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/constants/evaluate/EvaluateExpressionTestGenerated.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.evaluate; +package org.jetbrains.kotlin.resolve.constants.evaluate; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/KotlinTestWithEnvironment.java b/compiler/tests/org/jetbrains/kotlin/resolve/lazy/KotlinTestWithEnvironment.java index 9310c639e5d..a7c7e785a78 100644 --- a/compiler/tests/org/jetbrains/kotlin/resolve/lazy/KotlinTestWithEnvironment.java +++ b/compiler/tests/org/jetbrains/kotlin/resolve/lazy/KotlinTestWithEnvironment.java @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.resolve.lazy; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.KotlinTestWithEnvironmentManagement; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.test.KotlinTestWithEnvironmentManagement; public abstract class KotlinTestWithEnvironment extends KotlinTestWithEnvironmentManagement { private JetCoreEnvironment environment; diff --git a/compiler/tests/org/jetbrains/jet/ProgressionUtilTest.java b/compiler/tests/org/jetbrains/kotlin/runtime/ProgressionUtilTest.java similarity index 99% rename from compiler/tests/org/jetbrains/jet/ProgressionUtilTest.java rename to compiler/tests/org/jetbrains/kotlin/runtime/ProgressionUtilTest.java index 0acb488b8db..fe2b55e816c 100644 --- a/compiler/tests/org/jetbrains/jet/ProgressionUtilTest.java +++ b/compiler/tests/org/jetbrains/kotlin/runtime/ProgressionUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet; +package org.jetbrains.kotlin.runtime; import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; diff --git a/compiler/tests/org/jetbrains/jet/ScriptTest.java b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java similarity index 95% rename from compiler/tests/org/jetbrains/jet/ScriptTest.java rename to compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java index 311e8616729..20ef9f8a883 100644 --- a/compiler/tests/org/jetbrains/jet/ScriptTest.java +++ b/compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,28 +14,31 @@ * limitations under the License. */ -package org.jetbrains.jet; +package org.jetbrains.kotlin.scripts; import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.codegen.CompilationException; -import org.jetbrains.kotlin.config.CommonConfigurationKeys; -import org.jetbrains.kotlin.config.CompilerConfiguration; -import org.jetbrains.kotlin.parsing.JetScriptDefinition; -import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; -import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; -import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.utils.KotlinPaths; -import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys; import org.jetbrains.kotlin.cli.common.messages.*; import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.cli.jvm.compiler.KotlinToJVMBytecodeCompiler; +import org.jetbrains.kotlin.codegen.CompilationException; +import org.jetbrains.kotlin.config.CommonConfigurationKeys; +import org.jetbrains.kotlin.config.CompilerConfiguration; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.parsing.JetScriptDefinition; +import org.jetbrains.kotlin.parsing.JetScriptDefinitionProvider; +import org.jetbrains.kotlin.resolve.AnalyzerScriptParameter; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestJdkKind; +import org.jetbrains.kotlin.utils.KotlinPaths; +import org.jetbrains.kotlin.utils.PathUtil; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt index 32d4211fc50..fb91bd39456 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/BuiltInsSerializerTest.kt @@ -16,16 +16,16 @@ package org.jetbrains.kotlin.serialization.builtins -import org.jetbrains.jet.test.TestCaseWithTmpdir +import org.jetbrains.kotlin.test.TestCaseWithTmpdir import java.io.File import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.storage.LockBasedStorageManager import java.io.FileInputStream import org.jetbrains.kotlin.builtins.BuiltinsPackageFragment import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.jet.test.util.RecursiveDescriptorComparator -import org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.TEST_PACKAGE_FQNAME +import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator +import org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil.TEST_PACKAGE_FQNAME public class BuiltInsSerializerTest : TestCaseWithTmpdir() { private fun doTest(fileName: String) { diff --git a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java index 5d9317b89e7..eda45065872 100644 --- a/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java +++ b/compiler/tests/org/jetbrains/kotlin/serialization/builtins/LoadBuiltinsTest.java @@ -19,20 +19,20 @@ package org.jetbrains.kotlin.serialization.builtins; import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.TestJdkKind; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor; import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; +import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyPackageDescriptor; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.renderer.DescriptorRenderer; -import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; -import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; -import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestJdkKind; +import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator; import java.io.File; import java.util.List; diff --git a/compiler/tests/org/jetbrains/jet/ConfigurationKind.java b/compiler/tests/org/jetbrains/kotlin/test/ConfigurationKind.java similarity index 91% rename from compiler/tests/org/jetbrains/jet/ConfigurationKind.java rename to compiler/tests/org/jetbrains/kotlin/test/ConfigurationKind.java index 951a1db58ae..1c55cc415b1 100644 --- a/compiler/tests/org/jetbrains/jet/ConfigurationKind.java +++ b/compiler/tests/org/jetbrains/kotlin/test/ConfigurationKind.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet; +package org.jetbrains.kotlin.test; public enum ConfigurationKind { JDK_ONLY, // Java runtime classes diff --git a/compiler/tests/org/jetbrains/jet/InTextDirectivesUtils.java b/compiler/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/InTextDirectivesUtils.java rename to compiler/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java index 94c9f1b5554..03c8b366aa0 100644 --- a/compiler/tests/org/jetbrains/jet/InTextDirectivesUtils.java +++ b/compiler/tests/org/jetbrains/kotlin/test/InTextDirectivesUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet; +package org.jetbrains.kotlin.test; import com.google.common.collect.Lists; import com.google.common.collect.Sets; diff --git a/compiler/tests/org/jetbrains/jet/test/InnerTestClasses.java b/compiler/tests/org/jetbrains/kotlin/test/InnerTestClasses.java similarity index 92% rename from compiler/tests/org/jetbrains/jet/test/InnerTestClasses.java rename to compiler/tests/org/jetbrains/kotlin/test/InnerTestClasses.java index afa36848f3e..8886c495500 100644 --- a/compiler/tests/org/jetbrains/jet/test/InnerTestClasses.java +++ b/compiler/tests/org/jetbrains/kotlin/test/InnerTestClasses.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.test; +package org.jetbrains.kotlin.test; import junit.framework.TestCase; diff --git a/compiler/tests/org/jetbrains/jet/JUnit3RunnerWithInners.java b/compiler/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInners.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/JUnit3RunnerWithInners.java rename to compiler/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInners.java index 1c44df7d4f2..9bed3c4cb61 100644 --- a/compiler/tests/org/jetbrains/jet/JUnit3RunnerWithInners.java +++ b/compiler/tests/org/jetbrains/kotlin/test/JUnit3RunnerWithInners.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet; +package org.jetbrains.kotlin.test; import junit.framework.Test; import junit.framework.TestCase; diff --git a/compiler/tests/org/jetbrains/jet/JetLiteFixture.java b/compiler/tests/org/jetbrains/kotlin/test/JetLiteFixture.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/JetLiteFixture.java rename to compiler/tests/org/jetbrains/kotlin/test/JetLiteFixture.java index 563fb807688..a13349a2819 100644 --- a/compiler/tests/org/jetbrains/jet/JetLiteFixture.java +++ b/compiler/tests/org/jetbrains/kotlin/test/JetLiteFixture.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet; +package org.jetbrains.kotlin.test; import com.intellij.openapi.fileEditor.impl.LoadTextUtil; import com.intellij.psi.PsiElement; @@ -35,7 +35,6 @@ public abstract class JetLiteFixture extends KotlinTestWithEnvironment { protected final String myFullDataPath; private JetFile myFile; - public JetLiteFixture(@NonNls String dataPath) { myFullDataPath = getTestDataPath() + "/" + dataPath; } diff --git a/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java b/compiler/tests/org/jetbrains/kotlin/test/JetTestCaseBuilder.java similarity index 93% rename from compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java rename to compiler/tests/org/jetbrains/kotlin/test/JetTestCaseBuilder.java index e52f3e97979..07686d27976 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestCaseBuilder.java +++ b/compiler/tests/org/jetbrains/kotlin/test/JetTestCaseBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet; +package org.jetbrains.kotlin.test; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java similarity index 97% rename from compiler/tests/org/jetbrains/jet/JetTestUtils.java rename to compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java index 018dc693437..76c15813738 100644 --- a/compiler/tests/org/jetbrains/jet/JetTestUtils.java +++ b/compiler/tests/org/jetbrains/kotlin/test/JetTestUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet; +package org.jetbrains.kotlin.test; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableMap; @@ -48,15 +48,20 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; import org.jetbrains.kotlin.analyzer.AnalysisResult; +import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.config.CommonConfigurationKeys; import org.jetbrains.kotlin.config.CompilerConfiguration; -import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Errors; import org.jetbrains.kotlin.diagnostics.Severity; import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; +import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.platform.PlatformToKotlinClassMap; +import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; @@ -64,19 +69,12 @@ import org.jetbrains.kotlin.resolve.ImportPath; import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics; import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; -import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.lexer.JetTokens; -import org.jetbrains.kotlin.plugin.JetLanguage; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; -import org.jetbrains.jet.test.util.UtilPackage; +import org.jetbrains.kotlin.test.util.UtilPackage; import org.jetbrains.kotlin.util.slicedMap.ReadOnlySlice; import org.jetbrains.kotlin.util.slicedMap.SlicedMap; import org.jetbrains.kotlin.util.slicedMap.WritableSlice; import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.kotlin.utils.UtilsPackage; -import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; -import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.junit.Assert; import javax.tools.*; @@ -89,18 +87,17 @@ import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; -import static org.jetbrains.jet.ConfigurationKind.ALL; -import static org.jetbrains.jet.ConfigurationKind.JDK_AND_ANNOTATIONS; -import static org.jetbrains.jet.jvm.compiler.LoadDescriptorUtil.compileKotlinToDirAndGetAnalysisResult; -import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; import static org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys.ANNOTATIONS_PATH_KEY; import static org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys.CLASSPATH_KEY; +import static org.jetbrains.kotlin.jvm.compiler.LoadDescriptorUtil.compileKotlinToDirAndGetAnalysisResult; +import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; +import static org.jetbrains.kotlin.test.ConfigurationKind.ALL; +import static org.jetbrains.kotlin.test.ConfigurationKind.JDK_AND_ANNOTATIONS; public class JetTestUtils { public static final String TEST_GENERATOR_NAME = "org.jetbrains.kotlin.generators.tests.TestsPackage"; public static final String PLEASE_REGENERATE_TESTS = "Please regenerate tests (GenerateTests.kt)"; - private static final Pattern KT_FILES = Pattern.compile(".*?.kt"); private static final List filesToDelete = new ArrayList(); /** @@ -428,6 +425,7 @@ public class JetTestUtils { jetFiles.add(loadJetFile(environment.getProject(), file)); } else { + //noinspection ConstantConditions for (File childFile : file.listFiles()) { if (childFile.getName().endsWith(".kt")) { jetFiles.add(loadJetFile(environment.getProject(), childFile)); @@ -438,13 +436,6 @@ public class JetTestUtils { LazyResolveTestUtil.resolve(jetFiles, environment); } - @NotNull - public static List collectKtFiles(@NotNull File root) { - List files = Lists.newArrayList(); - FileUtil.collectMatchedFiles(root, KT_FILES, files); - return files; - } - public static void assertEqualsToFile(@NotNull File expectedFile, @NotNull String actual) { assertEqualsToFile(expectedFile, actual, new Function1() { @Override diff --git a/compiler/tests/org/jetbrains/jet/KotlinTestWithEnvironmentManagement.java b/compiler/tests/org/jetbrains/kotlin/test/KotlinTestWithEnvironmentManagement.java similarity index 94% rename from compiler/tests/org/jetbrains/jet/KotlinTestWithEnvironmentManagement.java rename to compiler/tests/org/jetbrains/kotlin/test/KotlinTestWithEnvironmentManagement.java index 57d7d1a1aea..a5cb3b6ed7a 100644 --- a/compiler/tests/org/jetbrains/jet/KotlinTestWithEnvironmentManagement.java +++ b/compiler/tests/org/jetbrains/kotlin/test/KotlinTestWithEnvironmentManagement.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet; +package org.jetbrains.kotlin.test; import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; diff --git a/compiler/tests/org/jetbrains/jet/MockLibraryUtil.java b/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/MockLibraryUtil.java rename to compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java index 3fa6ab3290b..fa5715a8880 100644 --- a/compiler/tests/org/jetbrains/jet/MockLibraryUtil.java +++ b/compiler/tests/org/jetbrains/kotlin/test/MockLibraryUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.jetbrains.jet; +package org.jetbrains.kotlin.test; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.io.ZipUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.cli.common.ExitCode; +import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.kotlin.utils.UtilsPackage; -import org.jetbrains.kotlin.cli.common.ExitCode; -import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler; import java.io.*; import java.lang.reflect.Method; diff --git a/compiler/tests/org/jetbrains/jet/test/TestCaseWithTmpdir.java b/compiler/tests/org/jetbrains/kotlin/test/TestCaseWithTmpdir.java similarity index 88% rename from compiler/tests/org/jetbrains/jet/test/TestCaseWithTmpdir.java rename to compiler/tests/org/jetbrains/kotlin/test/TestCaseWithTmpdir.java index 978fe8b9ee7..d879e1caddd 100644 --- a/compiler/tests/org/jetbrains/jet/test/TestCaseWithTmpdir.java +++ b/compiler/tests/org/jetbrains/kotlin/test/TestCaseWithTmpdir.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,15 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.test; +package org.jetbrains.kotlin.test; import com.intellij.testFramework.UsefulTestCase; -import org.jetbrains.jet.JetTestUtils; import java.io.File; public abstract class TestCaseWithTmpdir extends UsefulTestCase { - protected File tmpdir; @Override @@ -30,5 +28,4 @@ public abstract class TestCaseWithTmpdir extends UsefulTestCase { super.setUp(); tmpdir = JetTestUtils.tmpDirForTest(this); } - } diff --git a/compiler/tests/org/jetbrains/jet/TestJdkKind.java b/compiler/tests/org/jetbrains/kotlin/test/TestJdkKind.java similarity index 89% rename from compiler/tests/org/jetbrains/jet/TestJdkKind.java rename to compiler/tests/org/jetbrains/kotlin/test/TestJdkKind.java index f2997a1c925..bb8d89a0529 100644 --- a/compiler/tests/org/jetbrains/jet/TestJdkKind.java +++ b/compiler/tests/org/jetbrains/kotlin/test/TestJdkKind.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet; +package org.jetbrains.kotlin.test; public enum TestJdkKind { MOCK_JDK, diff --git a/compiler/tests/org/jetbrains/jet/test/TestMetadata.java b/compiler/tests/org/jetbrains/kotlin/test/TestMetadata.java similarity index 92% rename from compiler/tests/org/jetbrains/jet/test/TestMetadata.java rename to compiler/tests/org/jetbrains/kotlin/test/TestMetadata.java index 0fde06b122f..6cbfee575f7 100644 --- a/compiler/tests/org/jetbrains/jet/test/TestMetadata.java +++ b/compiler/tests/org/jetbrains/kotlin/test/TestMetadata.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.test; +package org.jetbrains.kotlin.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/tests/org/jetbrains/jet/test/Tmpdir.java b/compiler/tests/org/jetbrains/kotlin/test/Tmpdir.java similarity index 95% rename from compiler/tests/org/jetbrains/jet/test/Tmpdir.java rename to compiler/tests/org/jetbrains/kotlin/test/Tmpdir.java index 41d38501985..d00962a5270 100644 --- a/compiler/tests/org/jetbrains/jet/test/Tmpdir.java +++ b/compiler/tests/org/jetbrains/kotlin/test/Tmpdir.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.test; +package org.jetbrains.kotlin.test; import com.google.common.io.Files; import com.intellij.openapi.util.io.FileUtil; diff --git a/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java b/compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java similarity index 99% rename from compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java rename to compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java index 1aa02230712..19d84ede213 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/DescriptorValidator.java +++ b/compiler/tests/org/jetbrains/kotlin/test/util/DescriptorValidator.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.jetbrains.jet.test.util; +package org.jetbrains.kotlin.test.util; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Lists; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.junit.Assert; import java.io.PrintStream; diff --git a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java rename to compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java index b5990d26b9e..ed8489e7c05 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorComparator.java +++ b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorComparator.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.test.util; +package org.jetbrains.kotlin.test.util; import com.google.common.base.Predicate; import com.google.common.base.Predicates; @@ -23,16 +23,16 @@ import com.google.common.collect.Lists; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.jvm.compiler.ExpectedLoadErrorsUtil; -import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.kotlin.resolve.DescriptorUtils; -import org.jetbrains.kotlin.resolve.MemberComparator; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.jvm.compiler.ExpectedLoadErrorsUtil; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder; +import org.jetbrains.kotlin.resolve.DescriptorUtils; +import org.jetbrains.kotlin.resolve.MemberComparator; +import org.jetbrains.kotlin.resolve.scopes.JetScope; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.utils.Printer; import org.junit.Assert; @@ -43,7 +43,7 @@ import java.util.Collections; import java.util.List; import static org.jetbrains.kotlin.resolve.DescriptorUtils.isEnumEntry; -import static org.jetbrains.jet.test.util.DescriptorValidator.ValidationVisitor.errorTypesForbidden; +import static org.jetbrains.kotlin.test.util.DescriptorValidator.ValidationVisitor.errorTypesForbidden; public class RecursiveDescriptorComparator { private static final DescriptorRenderer DEFAULT_RENDERER = new DescriptorRendererBuilder() diff --git a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessor.java b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessor.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessor.java rename to compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessor.java index 8927f659efd..3ea88dfef6f 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessor.java +++ b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.test.util; +package org.jetbrains.kotlin.test.util; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessorTest.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java rename to compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessorTest.java index 8db59473dc3..6333ad61c35 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/RecursiveDescriptorProcessorTest.java +++ b/compiler/tests/org/jetbrains/kotlin/test/util/RecursiveDescriptorProcessorTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.jetbrains.jet.test.util; +package org.jetbrains.kotlin.test.util; import com.google.common.collect.Lists; import com.intellij.openapi.util.io.FileUtil; -import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.analyzer.AnalysisResult; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.descriptors.*; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.kotlin.resolve.lazy.LazyEntity; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.name.Name; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.utils.Printer; -import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import java.io.File; import java.util.Collections; diff --git a/compiler/tests/org/jetbrains/jet/test/util/TestExecutedOnlyOnceTest.java b/compiler/tests/org/jetbrains/kotlin/test/util/TestExecutedOnlyOnceTest.java similarity index 93% rename from compiler/tests/org/jetbrains/jet/test/util/TestExecutedOnlyOnceTest.java rename to compiler/tests/org/jetbrains/kotlin/test/util/TestExecutedOnlyOnceTest.java index fc314d564c6..fe967eb17af 100644 --- a/compiler/tests/org/jetbrains/jet/test/util/TestExecutedOnlyOnceTest.java +++ b/compiler/tests/org/jetbrains/kotlin/test/util/TestExecutedOnlyOnceTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.test.util; +package org.jetbrains.kotlin.test.util; import junit.framework.TestCase; -import org.jetbrains.jet.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.junit.runner.RunWith; @SuppressWarnings("ALL") diff --git a/compiler/tests/org/jetbrains/jet/jetTestUtils.kt b/compiler/tests/org/jetbrains/kotlin/test/util/jetTestUtils.kt similarity index 96% rename from compiler/tests/org/jetbrains/jet/jetTestUtils.kt rename to compiler/tests/org/jetbrains/kotlin/test/util/jetTestUtils.kt index 9579e55884e..d5085c30013 100644 --- a/compiler/tests/org/jetbrains/jet/jetTestUtils.kt +++ b/compiler/tests/org/jetbrains/kotlin/test/util/jetTestUtils.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.test.util +package org.jetbrains.kotlin.test.util import com.intellij.testFramework.fixtures.CodeInsightTestFixture import com.intellij.openapi.util.io.FileUtil diff --git a/compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt b/compiler/tests/org/jetbrains/kotlin/types/AbstractJetTypeBindingTest.kt similarity index 87% rename from compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt rename to compiler/tests/org/jetbrains/kotlin/types/AbstractJetTypeBindingTest.kt index 021aa7d822d..86db8b85fae 100644 --- a/compiler/tests/org/jetbrains/jet/types/AbstractJetTypeBindingTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/types/AbstractJetTypeBindingTest.kt @@ -14,32 +14,26 @@ * limitations under the License. */ -package org.jetbrains.jet.types +package org.jetbrains.kotlin.types -import org.jetbrains.jet.JetLiteFixture -import org.jetbrains.jet.ConfigurationKind -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetLiteFixture +import org.jetbrains.kotlin.test.ConfigurationKind import java.io.File -import org.junit.Assert.* -import org.jetbrains.kotlin.resolve.BindingTraceContext import org.jetbrains.kotlin.resolve.typeBinding.* -import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil import org.jetbrains.kotlin.psi.JetCallableDeclaration import org.jetbrains.kotlin.utils.Printer -import org.jetbrains.jet.test.util.trimIndent import org.jetbrains.kotlin.psi.JetFile -import org.jetbrains.jet.JetTestUtils.* -import org.jetbrains.kotlin.psi.JetVariableDeclaration +import org.jetbrains.kotlin.test.JetTestUtils.* abstract class AbstractJetTypeBindingTest : JetLiteFixture() { override fun createEnvironment() = createEnvironmentWithMockJdk(ConfigurationKind.ALL) protected fun doTest(path: String) { val testFile = File(path) - val testKtFile = JetTestUtils.loadJetFile(getProject(), testFile) + val testKtFile = loadJetFile(getProject(), testFile) val analyzeResult = JvmResolveUtil.analyzeFilesWithJavaIntegration(getProject(), listOf(testKtFile), { true }) @@ -47,7 +41,7 @@ abstract class AbstractJetTypeBindingTest : JetLiteFixture() { val typeBinding = testDeclaration.createTypeBindingForReturnType(analyzeResult.bindingContext) - JetTestUtils.assertEqualsToFile( + assertEqualsToFile( testFile, StringBuilder { append(removeLastComment(testKtFile)) diff --git a/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java b/compiler/tests/org/jetbrains/kotlin/types/BoundsSubstitutorTest.java similarity index 96% rename from compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java rename to compiler/tests/org/jetbrains/kotlin/types/BoundsSubstitutorTest.java index 5fa15020913..a738498254e 100644 --- a/compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/BoundsSubstitutorTest.java @@ -14,20 +14,19 @@ * limitations under the License. */ -package org.jetbrains.jet.types; +package org.jetbrains.kotlin.types; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.jet.ConfigurationKind; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; -import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; -import org.jetbrains.kotlin.types.BoundsSubstitutor; +import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.renderer.DescriptorRenderer; -import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; +import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; +import org.jetbrains.kotlin.test.ConfigurationKind; import java.util.Collection; import java.util.Collections; diff --git a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java b/compiler/tests/org/jetbrains/kotlin/types/JetDefaultModalityModifiersTest.java similarity index 99% rename from compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java rename to compiler/tests/org/jetbrains/kotlin/types/JetDefaultModalityModifiersTest.java index 324a0a7b1e4..2bd304c3a12 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetDefaultModalityModifiersTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/JetDefaultModalityModifiersTest.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.jetbrains.jet.types; +package org.jetbrains.kotlin.types; import com.google.common.base.Predicates; import com.intellij.psi.PsiFile; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetLiteFixture; -import org.jetbrains.jet.JetTestUtils; import org.jetbrains.kotlin.analyzer.AnalysisResult; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl; import org.jetbrains.kotlin.descriptors.impl.MutableClassDescriptor; +import org.jetbrains.kotlin.di.InjectorForTests; import org.jetbrains.kotlin.psi.*; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorResolver; @@ -35,11 +35,11 @@ import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.resolve.scopes.RedeclarationHandler; import org.jetbrains.kotlin.resolve.scopes.WritableScope; import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.storage.ExceptionTracker; import org.jetbrains.kotlin.storage.LockBasedStorageManager; -import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.kotlin.di.InjectorForTests; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetLiteFixture; +import org.jetbrains.kotlin.test.JetTestUtils; import java.util.List; diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java b/compiler/tests/org/jetbrains/kotlin/types/JetOverloadTest.java similarity index 96% rename from compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java rename to compiler/tests/org/jetbrains/kotlin/types/JetOverloadTest.java index 20538362ccc..db99c589fb6 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverloadTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/JetOverloadTest.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.jetbrains.jet.types; +package org.jetbrains.kotlin.types; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetLiteFixture; -import org.jetbrains.jet.JetTestCaseBuilder; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.di.InjectorForTests; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.resolve.DescriptorResolver; import org.jetbrains.kotlin.resolve.OverloadUtil; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.kotlin.di.InjectorForTests; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetLiteFixture; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.JetTestUtils; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; diff --git a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java b/compiler/tests/org/jetbrains/kotlin/types/JetOverridingTest.java similarity index 96% rename from compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java rename to compiler/tests/org/jetbrains/kotlin/types/JetOverridingTest.java index dd13ae519b6..66850c19395 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetOverridingTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/JetOverridingTest.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.jetbrains.jet.types; +package org.jetbrains.kotlin.types; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetLiteFixture; -import org.jetbrains.jet.JetTestCaseBuilder; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.descriptors.FunctionDescriptor; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; +import org.jetbrains.kotlin.di.InjectorForTests; import org.jetbrains.kotlin.psi.JetNamedFunction; import org.jetbrains.kotlin.resolve.DescriptorResolver; import org.jetbrains.kotlin.resolve.OverridingUtil; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.kotlin.di.InjectorForTests; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetLiteFixture; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.JetTestUtils; import static org.jetbrains.kotlin.psi.PsiPackage.JetPsiFactory; diff --git a/compiler/tests/org/jetbrains/jet/types/JetTypeBindingTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/types/JetTypeBindingTestGenerated.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/types/JetTypeBindingTestGenerated.java rename to compiler/tests/org/jetbrains/kotlin/types/JetTypeBindingTestGenerated.java index 8dcf7637c8a..f4e14d1a491 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetTypeBindingTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/types/JetTypeBindingTestGenerated.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.jetbrains.jet.types; +package org.jetbrains.kotlin.types; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java b/compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java rename to compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java index ae999727b57..5832311b56a 100644 --- a/compiler/tests/org/jetbrains/jet/types/JetTypeCheckerTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/JetTypeCheckerTest.java @@ -14,40 +14,37 @@ * limitations under the License. */ -package org.jetbrains.jet.types; +package org.jetbrains.kotlin.types; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetLiteFixture; -import org.jetbrains.jet.JetTestCaseBuilder; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.descriptors.PackageViewDescriptor; import org.jetbrains.kotlin.descriptors.ReceiverParameterDescriptor; import org.jetbrains.kotlin.descriptors.impl.ReceiverParameterDescriptorImpl; +import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolver; +import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolverUtil; +import org.jetbrains.kotlin.di.InjectorForTests; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.resolve.BindingTraceContext; import org.jetbrains.kotlin.resolve.ImportPath; import org.jetbrains.kotlin.resolve.TypeResolver; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; -import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.resolve.scopes.*; import org.jetbrains.kotlin.resolve.scopes.receivers.ExpressionReceiver; -import org.jetbrains.kotlin.types.CommonSupertypes; -import org.jetbrains.kotlin.types.JetType; -import org.jetbrains.kotlin.types.TypeUtils; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetLiteFixture; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.types.checker.JetTypeChecker; import org.jetbrains.kotlin.types.expressions.ExpressionTypingServices; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.cli.jvm.compiler.CliLightClassGenerationSupport; -import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolver; -import org.jetbrains.kotlin.di.InjectorForJavaDescriptorResolverUtil; -import org.jetbrains.kotlin.di.InjectorForTests; import java.io.File; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java b/compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java similarity index 98% rename from compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java rename to compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java index 71d7a7eb909..cd51bf1bfa4 100644 --- a/compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/TypeSubstitutorTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.types; +package org.jetbrains.kotlin.types; import com.google.common.collect.Maps; import com.intellij.openapi.util.Pair; @@ -23,29 +23,28 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Function; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.ClassifierDescriptor; import org.jetbrains.kotlin.descriptors.ModuleDescriptor; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; +import org.jetbrains.kotlin.di.InjectorForTests; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.JetTypeReference; +import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.AnalyzingUtils; import org.jetbrains.kotlin.resolve.BindingTrace; import org.jetbrains.kotlin.resolve.BindingTraceContext; import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; import org.jetbrains.kotlin.resolve.lazy.LazyResolveTestUtil; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.scopes.*; -import org.jetbrains.kotlin.types.*; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.renderer.DescriptorRenderer; -import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.kotlin.di.InjectorForTests; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetTestUtils; import java.io.File; import java.io.IOException; diff --git a/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java b/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java similarity index 97% rename from compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java rename to compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java index a452fc471b9..f621189aefb 100644 --- a/compiler/tests/org/jetbrains/jet/types/TypeUnifierTest.java +++ b/compiler/tests/org/jetbrains/kotlin/types/TypeUnifierTest.java @@ -14,31 +14,30 @@ * limitations under the License. */ -package org.jetbrains.jet.types; +package org.jetbrains.kotlin.types; import com.google.common.base.Predicate; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetLiteFixture; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.builtins.KotlinBuiltIns; +import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.descriptors.annotations.Annotations; import org.jetbrains.kotlin.descriptors.impl.TypeParameterDescriptorImpl; +import org.jetbrains.kotlin.di.InjectorForTests; +import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.JetTypeProjection; import org.jetbrains.kotlin.psi.JetTypeReference; import org.jetbrains.kotlin.resolve.TypeResolver; -import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.resolve.scopes.RedeclarationHandler; import org.jetbrains.kotlin.resolve.scopes.WritableScope; import org.jetbrains.kotlin.resolve.scopes.WritableScopeImpl; -import org.jetbrains.kotlin.types.*; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; -import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; -import org.jetbrains.kotlin.di.InjectorForTests; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetLiteFixture; +import org.jetbrains.kotlin.test.JetTestUtils; import java.util.Map; import java.util.Set; diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index e790455aab9..6ad32391a28 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -32,13 +32,13 @@ import org.jetbrains.kotlin.codegen.AbstractTopLevelMembersInvocationTest import org.jetbrains.kotlin.codegen.AbstractCheckLocalVariablesTableTest import org.jetbrains.kotlin.codegen.flags.AbstractWriteFlagsTest import org.jetbrains.kotlin.codegen.defaultConstructor.AbstractDefaultArgumentsReflectionTest -import org.jetbrains.jet.jvm.compiler.AbstractLoadJavaTest -import org.jetbrains.jet.jvm.compiler.AbstractCompileJavaAgainstKotlinTest -import org.jetbrains.jet.jvm.compiler.AbstractCompileKotlinAgainstKotlinTest -import org.jetbrains.jet.modules.xml.AbstractModuleXmlParserTest -import org.jetbrains.jet.jvm.compiler.AbstractWriteSignatureTest +import org.jetbrains.kotlin.jvm.compiler.AbstractLoadJavaTest +import org.jetbrains.kotlin.jvm.compiler.AbstractCompileJavaAgainstKotlinTest +import org.jetbrains.kotlin.jvm.compiler.AbstractCompileKotlinAgainstKotlinTest +import org.jetbrains.kotlin.modules.xml.AbstractModuleXmlParserTest +import org.jetbrains.kotlin.jvm.compiler.AbstractWriteSignatureTest import org.jetbrains.kotlin.cli.AbstractKotlincExecutableTest -import org.jetbrains.jet.repl.AbstractReplInterpreterTest +import org.jetbrains.kotlin.repl.AbstractReplInterpreterTest import org.jetbrains.kotlin.cfg.AbstractControlFlowTest import org.jetbrains.kotlin.checkers.AbstractJetPsiCheckerTest import org.jetbrains.kotlin.checkers.AbstractJetJsCheckerTest @@ -70,7 +70,7 @@ import org.jetbrains.jet.plugin.highlighter.AbstractDiagnosticMessageTest import org.jetbrains.jet.plugin.codeInsight.AbstractOutOfBlockModificationTest import org.jetbrains.jet.completion.AbstractDataFlowValueRenderingTest import org.jetbrains.jet.resolve.annotation.AbstractAnnotationParameterTest -import org.jetbrains.jet.evaluate.AbstractEvaluateExpressionTest +import org.jetbrains.kotlin.resolve.constants.evaluate.AbstractEvaluateExpressionTest import org.jetbrains.jet.resolve.calls.AbstractResolvedCallsTest import org.jetbrains.jet.plugin.refactoring.rename.AbstractRenameTest import org.jetbrains.kotlin.generators.tests.generator.SingleClassTestModel @@ -131,7 +131,7 @@ import org.jetbrains.jet.completion.handlers.AbstractCompletionCharFilterTest import org.jetbrains.jet.resolve.AbstractPartialBodyResolveTest import org.jetbrains.kotlin.checkers.AbstractJetDiagnosticsTestWithJsStdLib import org.jetbrains.kotlin.renderer.AbstractDescriptorRendererTest -import org.jetbrains.jet.types.AbstractJetTypeBindingTest +import org.jetbrains.kotlin.types.AbstractJetTypeBindingTest import org.jetbrains.jet.plugin.debugger.evaluate.AbstractCodeFragmentCompletionHandlerTest import org.jetbrains.jet.plugin.coverage.AbstractKotlinCoverageOutputFilesTest import org.jetbrains.kotlin.js.test.semantics.AbstractDynamicTest diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java index 533b3f91972..a477bb3a353 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestClassModel.java @@ -22,7 +22,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.utils.Printer; import java.io.File; diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java index 8b6318efb8d..874269c1739 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SimpleTestMethodModel.java @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.generators.tests.generator; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.InTextDirectivesUtils; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.utils.Printer; import java.io.File; diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generator/SingleClassTestModel.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SingleClassTestModel.java index ff1ee253e69..b2c2c696d18 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generator/SingleClassTestModel.java +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/SingleClassTestModel.java @@ -23,7 +23,7 @@ import com.intellij.util.Processor; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.utils.Printer; import java.io.File; diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java index 76966e4625c..8745d3e033e 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generator/TestGenerator.java @@ -22,10 +22,13 @@ import com.intellij.util.containers.ContainerUtil; import junit.framework.TestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.kotlin.utils.Printer; import org.jetbrains.kotlin.generators.di.GeneratorsFileUtil; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; +import org.jetbrains.kotlin.utils.Printer; +import org.junit.runner.RunWith; import java.io.File; import java.io.IOException; @@ -42,8 +45,6 @@ public class TestGenerator { JS } - public static final String NAVIGATION_METADATA = "navigationMetadata"; - private static final Set GENERATED_FILES = ContainerUtil.newHashSet(); private static final Class RUNNER = JUnit3RunnerWithInners.class; @@ -80,11 +81,11 @@ public class TestGenerator { p.println("package ", suiteClassPackage, ";"); p.println(); p.println("import com.intellij.testFramework.TestDataPath;"); + p.println("import " + InnerTestClasses.class.getCanonicalName() + ";"); p.println("import ", RUNNER.getCanonicalName(), ";"); - p.println("import org.jetbrains.jet.JetTestUtils;"); - p.println("import org.jetbrains.jet.test.InnerTestClasses;"); - p.println("import org.jetbrains.jet.test.TestMetadata;"); - p.println("import org.junit.runner.RunWith;"); + p.println("import " + JetTestUtils.class.getCanonicalName() + ";"); + p.println("import " + TestMetadata.class.getCanonicalName() + ";"); + p.println("import " + RunWith.class.getCanonicalName() + ";"); p.println(); p.println("import java.io.File;"); p.println("import java.util.regex.Pattern;"); diff --git a/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt b/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt index 8f8de683971..52cec282960 100644 --- a/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt +++ b/generators/tests/org/jetbrains/kotlin/generators/evaluate/GenerateOperationsMapTest.kt @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.generators.test.evaluate import com.intellij.testFramework.UsefulTestCase -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.generators.evaluate -public class GenerateOperationsMapTest() : UsefulTestCase() { +public class GenerateOperationsMapTest : UsefulTestCase() { public fun testGeneratedDataIsUpToDate(): Unit { val text = evaluate.generate() JetTestUtils.assertEqualsToFile(evaluate.DEST_FILE, text) diff --git a/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java index 540323f6d42..b1e81c429ac 100644 --- a/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/CompiledKotlinInJavaCompletionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt b/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt index bc44cb7d22d..027aac4bcbc 100644 --- a/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt +++ b/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTest.kt @@ -20,7 +20,7 @@ import org.jetbrains.jet.plugin.PluginTestCaseBase import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.jet.plugin.completion.renderDataFlowValue -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils import com.intellij.openapi.util.io.FileUtil import java.io.File import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase diff --git a/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTestGenerated.java index b7fb885b439..6c89cd86729 100644 --- a/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/DataFlowValueRenderingTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java b/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java index ab8b030d0f1..de6bdaf1e0d 100644 --- a/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java +++ b/idea/tests/org/jetbrains/jet/completion/ExpectedCompletionUtils.java @@ -31,7 +31,7 @@ import com.intellij.ui.JBColor; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.jet.plugin.project.TargetPlatform; import org.jetbrains.jet.plugin.stubs.AstAccessControl; import org.junit.Assert; diff --git a/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java index 61a084d0f12..556ebb63eb7 100644 --- a/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/JSBasicCompletionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java index f4389499006..f422fec0aa9 100644 --- a/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/JvmBasicCompletionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java index 658495bde51..dc7b2046def 100644 --- a/idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/JvmSmartCompletionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/completion/JvmWithLibBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/JvmWithLibBasicCompletionTestGenerated.java index b8d1eb1f7bf..42ad3313847 100644 --- a/idea/tests/org/jetbrains/jet/completion/JvmWithLibBasicCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/JvmWithLibBasicCompletionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java index 3dec0edc6f2..f533ee986f9 100644 --- a/idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/KeywordCompletionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java index 104e13a8e83..28107511928 100644 --- a/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/KotlinSourceInJavaCompletionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java index ce415b08634..89b10cb3a82 100644 --- a/idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/MultiFileJvmBasicCompletionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/completion/MultiFileSmartCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/MultiFileSmartCompletionTestGenerated.java index d6e021e570f..20127fdee2d 100644 --- a/idea/tests/org/jetbrains/jet/completion/MultiFileSmartCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/MultiFileSmartCompletionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.completion; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java b/idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java index e84f7aa0938..9436ffddd0e 100644 --- a/idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java +++ b/idea/tests/org/jetbrains/jet/completion/confidence/JetConfidenceTest.java @@ -25,8 +25,8 @@ import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.util.text.StringUtil; import org.apache.commons.lang.SystemUtils; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.InTextDirectivesUtils; import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/AbstractCompletionHandlerTests.kt b/idea/tests/org/jetbrains/jet/completion/handlers/AbstractCompletionHandlerTests.kt index acb5ce147d8..864d1b6db09 100644 --- a/idea/tests/org/jetbrains/jet/completion/handlers/AbstractCompletionHandlerTests.kt +++ b/idea/tests/org/jetbrains/jet/completion/handlers/AbstractCompletionHandlerTests.kt @@ -17,11 +17,11 @@ package org.jetbrains.jet.completion.handlers import com.intellij.codeInsight.completion.CompletionType -import org.jetbrains.jet.InTextDirectivesUtils +import org.jetbrains.kotlin.test.InTextDirectivesUtils import com.intellij.openapi.util.io.FileUtil import java.io.File -public abstract class AbstractCompletionHandlerTest() : CompletionHandlerTestBase() { +public abstract class AbstractCompletionHandlerTest : CompletionHandlerTestBase() { private val INVOCATION_COUNT_PREFIX = "INVOCATION_COUNT:" private val LOOKUP_STRING_PREFIX = "ELEMENT:" private val ELEMENT_TEXT_PREFIX = "ELEMENT_TEXT:" diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTestGenerated.java index c3104f1d8b8..1620974319f 100644 --- a/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/handlers/BasicCompletionHandlerTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.completion.handlers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionCharFilterTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/handlers/CompletionCharFilterTestGenerated.java index 8cf5b87df89..750d017e6f1 100644 --- a/idea/tests/org/jetbrains/jet/completion/handlers/CompletionCharFilterTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/handlers/CompletionCharFilterTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.completion.handlers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/KeywordCompletionHandlerTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/handlers/KeywordCompletionHandlerTestGenerated.java index 8ee43c291cd..f1d40fe9817 100644 --- a/idea/tests/org/jetbrains/jet/completion/handlers/KeywordCompletionHandlerTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/handlers/KeywordCompletionHandlerTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.completion.handlers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java index 7951fc62bf6..8631581c3a1 100644 --- a/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/handlers/SmartCompletionHandlerTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.completion.handlers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/completion/weighers/AbstractCompletionWeigherTest.kt b/idea/tests/org/jetbrains/jet/completion/weighers/AbstractCompletionWeigherTest.kt index 287a3bda597..7a3d79e4a21 100644 --- a/idea/tests/org/jetbrains/jet/completion/weighers/AbstractCompletionWeigherTest.kt +++ b/idea/tests/org/jetbrains/jet/completion/weighers/AbstractCompletionWeigherTest.kt @@ -17,11 +17,11 @@ package org.jetbrains.jet.completion.weighers import com.intellij.codeInsight.completion.CompletionType -import org.jetbrains.jet.InTextDirectivesUtils +import org.jetbrains.kotlin.test.InTextDirectivesUtils import java.io.File import org.jetbrains.jet.plugin.PluginTestCaseBase import org.testng.Assert -import org.jetbrains.jet.test.util.configureWithExtraFile +import org.jetbrains.kotlin.test.util.configureWithExtraFile import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor diff --git a/idea/tests/org/jetbrains/jet/completion/weighers/BasicCompletionWeigherTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/weighers/BasicCompletionWeigherTestGenerated.java index 3b6b8f68323..206725f308c 100644 --- a/idea/tests/org/jetbrains/jet/completion/weighers/BasicCompletionWeigherTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/weighers/BasicCompletionWeigherTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.completion.weighers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/completion/weighers/SmartCompletionWeigherTestGenerated.java b/idea/tests/org/jetbrains/jet/completion/weighers/SmartCompletionWeigherTestGenerated.java index 8c29fd8b2f6..5a44b38e88a 100644 --- a/idea/tests/org/jetbrains/jet/completion/weighers/SmartCompletionWeigherTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/completion/weighers/SmartCompletionWeigherTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.completion.weighers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/editor/quickDoc/AbstractJetQuickDocProviderTest.java b/idea/tests/org/jetbrains/jet/editor/quickDoc/AbstractJetQuickDocProviderTest.java index 62a539e4a16..ddd198e2a04 100644 --- a/idea/tests/org/jetbrains/jet/editor/quickDoc/AbstractJetQuickDocProviderTest.java +++ b/idea/tests/org/jetbrains/jet/editor/quickDoc/AbstractJetQuickDocProviderTest.java @@ -24,10 +24,10 @@ import com.intellij.psi.PsiElement; import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.ProjectDescriptorWithStdlibSources; -import org.jetbrains.jet.test.util.UtilPackage; +import org.jetbrains.kotlin.test.util.UtilPackage; import org.junit.Assert; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/editor/quickDoc/JetQuickDocProviderTestGenerated.java b/idea/tests/org/jetbrains/jet/editor/quickDoc/JetQuickDocProviderTestGenerated.java index 4d02f227186..54d02cbfaec 100644 --- a/idea/tests/org/jetbrains/jet/editor/quickDoc/JetQuickDocProviderTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/editor/quickDoc/JetQuickDocProviderTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.editor.quickDoc; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java b/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java index 0e6eedda08d..f349eca2e62 100644 --- a/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java +++ b/idea/tests/org/jetbrains/jet/findUsages/AbstractJetFindUsagesTest.java @@ -48,8 +48,8 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.InTextDirectivesUtils; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.psi.*; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; diff --git a/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java b/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java index 36b224fddbf..25ab487e72c 100644 --- a/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/findUsages/JetFindUsagesTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.findUsages; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/formatter/AbstractJetFormatterTest.java b/idea/tests/org/jetbrains/jet/formatter/AbstractJetFormatterTest.java index ce9e2d71667..ec0b12a0b19 100644 --- a/idea/tests/org/jetbrains/jet/formatter/AbstractJetFormatterTest.java +++ b/idea/tests/org/jetbrains/jet/formatter/AbstractJetFormatterTest.java @@ -32,8 +32,8 @@ import com.intellij.testFramework.LightIdeaTestCase; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.InTextDirectivesUtils; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.plugin.JetLanguage; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.testing.SettingsConfigurator; diff --git a/idea/tests/org/jetbrains/jet/formatter/AbstractJetTypingIndentationTestBase.java b/idea/tests/org/jetbrains/jet/formatter/AbstractJetTypingIndentationTestBase.java index cc6d9f54911..bb28de55f43 100644 --- a/idea/tests/org/jetbrains/jet/formatter/AbstractJetTypingIndentationTestBase.java +++ b/idea/tests/org/jetbrains/jet/formatter/AbstractJetTypingIndentationTestBase.java @@ -18,14 +18,12 @@ package org.jetbrains.jet.formatter; import com.intellij.openapi.editor.CaretModel; import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.testFramework.EditorTestUtil; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.plugin.PluginTestCaseBase; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.jet.testing.SettingsConfigurator; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java index a3134b27ea6..9b11997a4a2 100644 --- a/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/formatter/JetFormatterTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.formatter; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java b/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java index 718b2856457..c8e8dbb3867 100644 --- a/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java +++ b/idea/tests/org/jetbrains/jet/formatter/JetTypingIndentationTestBaseGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.formatter; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/AbstractExpressionSelectionTest.java b/idea/tests/org/jetbrains/jet/plugin/AbstractExpressionSelectionTest.java index 76eacc116be..b6974c492ac 100644 --- a/idea/tests/org/jetbrains/jet/plugin/AbstractExpressionSelectionTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/AbstractExpressionSelectionTest.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil; diff --git a/idea/tests/org/jetbrains/jet/plugin/AbstractSmartSelectionTest.java b/idea/tests/org/jetbrains/jet/plugin/AbstractSmartSelectionTest.java index 2d90301eea7..807e070a750 100644 --- a/idea/tests/org/jetbrains/jet/plugin/AbstractSmartSelectionTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/AbstractSmartSelectionTest.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin; import com.intellij.openapi.util.text.StringUtil; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil; diff --git a/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java b/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java index 0c30d62d3ba..d8822866206 100644 --- a/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java +++ b/idea/tests/org/jetbrains/jet/plugin/DirectiveBasedActionUtils.java @@ -25,7 +25,7 @@ import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.Severity; import org.jetbrains.kotlin.psi.JetFile; diff --git a/idea/tests/org/jetbrains/jet/plugin/ExpressionSelectionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/ExpressionSelectionTestGenerated.java index 8bcad9a35bc..e83a5784d82 100644 --- a/idea/tests/org/jetbrains/jet/plugin/ExpressionSelectionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/ExpressionSelectionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/JdkAndMockLibraryProjectDescriptor.java b/idea/tests/org/jetbrains/jet/plugin/JdkAndMockLibraryProjectDescriptor.java index be64dc1776f..bebaf8f7b8e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/JdkAndMockLibraryProjectDescriptor.java +++ b/idea/tests/org/jetbrains/jet/plugin/JdkAndMockLibraryProjectDescriptor.java @@ -22,7 +22,7 @@ import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.util.io.FileUtilRt; -import org.jetbrains.jet.MockLibraryUtil; +import org.jetbrains.kotlin.test.MockLibraryUtil; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java b/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java index b8d16c0b56e..2820ff2a844 100644 --- a/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java @@ -31,8 +31,8 @@ import com.intellij.psi.impl.file.impl.FileManager; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.InTextDirectivesUtils; -import org.jetbrains.jet.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.actions.internal.KotlinInternalMode; import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver; diff --git a/idea/tests/org/jetbrains/jet/plugin/KotlinCodeInsightTestCase.java b/idea/tests/org/jetbrains/jet/plugin/KotlinCodeInsightTestCase.java index d63eee634f4..d56bc6eafa0 100644 --- a/idea/tests/org/jetbrains/jet/plugin/KotlinCodeInsightTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/KotlinCodeInsightTestCase.java @@ -18,8 +18,7 @@ package org.jetbrains.jet.plugin; import com.intellij.codeInsight.CodeInsightTestCase; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; -import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl; -import org.jetbrains.jet.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; public abstract class KotlinCodeInsightTestCase extends CodeInsightTestCase { @Override diff --git a/idea/tests/org/jetbrains/jet/plugin/KotlinCompletionTestCase.java b/idea/tests/org/jetbrains/jet/plugin/KotlinCompletionTestCase.java index ad966d21496..075bbdc4840 100644 --- a/idea/tests/org/jetbrains/jet/plugin/KotlinCompletionTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/KotlinCompletionTestCase.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin; import com.intellij.codeInsight.completion.CompletionTestCase; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; -import org.jetbrains.jet.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; abstract public class KotlinCompletionTestCase extends CompletionTestCase { @Override diff --git a/idea/tests/org/jetbrains/jet/plugin/KotlinDaemonAnalyzerTestCase.java b/idea/tests/org/jetbrains/jet/plugin/KotlinDaemonAnalyzerTestCase.java index e8d22e64ad2..0b531df1c28 100644 --- a/idea/tests/org/jetbrains/jet/plugin/KotlinDaemonAnalyzerTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/KotlinDaemonAnalyzerTestCase.java @@ -18,8 +18,7 @@ package org.jetbrains.jet.plugin; import com.intellij.codeInsight.daemon.DaemonAnalyzerTestCase; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; -import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl; -import org.jetbrains.jet.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; abstract public class KotlinDaemonAnalyzerTestCase extends DaemonAnalyzerTestCase { @Override diff --git a/idea/tests/org/jetbrains/jet/plugin/KotlinHierarchyViewTestBase.java b/idea/tests/org/jetbrains/jet/plugin/KotlinHierarchyViewTestBase.java index ee96f1cf479..0bcbdc3a6b6 100644 --- a/idea/tests/org/jetbrains/jet/plugin/KotlinHierarchyViewTestBase.java +++ b/idea/tests/org/jetbrains/jet/plugin/KotlinHierarchyViewTestBase.java @@ -17,9 +17,8 @@ package org.jetbrains.jet.plugin; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; -import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl; import com.intellij.testFramework.codeInsight.hierarchy.HierarchyViewTestBase; -import org.jetbrains.jet.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; public abstract class KotlinHierarchyViewTestBase extends HierarchyViewTestBase { @Override diff --git a/idea/tests/org/jetbrains/jet/plugin/KotlinLightQuickFixTestCase.java b/idea/tests/org/jetbrains/jet/plugin/KotlinLightQuickFixTestCase.java index 9e8809eb7c2..6d694de01b6 100644 --- a/idea/tests/org/jetbrains/jet/plugin/KotlinLightQuickFixTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/KotlinLightQuickFixTestCase.java @@ -18,8 +18,7 @@ package org.jetbrains.jet.plugin; import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase; import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess; -import com.intellij.openapi.vfs.newvfs.impl.VirtualDirectoryImpl; -import org.jetbrains.jet.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; abstract public class KotlinLightQuickFixTestCase extends LightQuickFixTestCase { @Override diff --git a/idea/tests/org/jetbrains/jet/plugin/PluginTestCaseBase.java b/idea/tests/org/jetbrains/jet/plugin/PluginTestCaseBase.java index 1ec64aa84a8..23fdbcfb60f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/PluginTestCaseBase.java +++ b/idea/tests/org/jetbrains/jet/plugin/PluginTestCaseBase.java @@ -25,8 +25,8 @@ import com.intellij.openapi.vfs.JarFileSystem; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestCaseBuilder; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.JetTestUtils; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/SmartSelectionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/SmartSelectionTestGenerated.java index f5d915cf150..ed829a38fee 100644 --- a/idea/tests/org/jetbrains/jet/plugin/SmartSelectionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/SmartSelectionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/caches/resolve/HighlightingWithDependentLibrariesTest.kt b/idea/tests/org/jetbrains/jet/plugin/caches/resolve/HighlightingWithDependentLibrariesTest.kt index df4777a9e3b..061116f4837 100644 --- a/idea/tests/org/jetbrains/jet/plugin/caches/resolve/HighlightingWithDependentLibrariesTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/caches/resolve/HighlightingWithDependentLibrariesTest.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.caches.resolve import org.jetbrains.jet.plugin.PluginTestCaseBase -import org.jetbrains.jet.MockLibraryUtil +import org.jetbrains.kotlin.test.MockLibraryUtil import com.intellij.openapi.roots.libraries.Library import com.intellij.openapi.command.WriteCommandAction import java.io.File diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java index 670a8d409d3..81397ea777e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractInsertImportOnPasteTest.java @@ -21,7 +21,7 @@ import com.intellij.openapi.actionSystem.IdeActions; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.checkers.DebugInfoUtil; import org.jetbrains.kotlin.diagnostics.Diagnostic; import org.jetbrains.kotlin.diagnostics.DiagnosticUtils; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractJetInspectionTest.kt b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractJetInspectionTest.kt index 71d613b3c7e..417b1a7b9d9 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractJetInspectionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractJetInspectionTest.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.codeInsight import java.io.File -import org.jetbrains.jet.InTextDirectivesUtils +import org.jetbrains.kotlin.test.InTextDirectivesUtils import com.intellij.openapi.util.io.FileUtil import com.intellij.codeInspection.LocalInspectionTool import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase @@ -29,7 +29,7 @@ import com.intellij.codeInspection.ex.InspectionManagerEx import com.intellij.testFramework.InspectionTestUtil import com.intellij.codeInspection.InspectionManager import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl -import org.jetbrains.jet.JetTestCaseBuilder +import org.jetbrains.kotlin.test.JetTestCaseBuilder import org.jetbrains.jet.testing.ConfigLibraryUtil import com.intellij.testFramework.IdeaTestUtil import com.intellij.openapi.projectRoots.JavaSdk diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractLineMarkersTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractLineMarkersTest.java index a49a55b7cab..7ae5de306e5 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractLineMarkersTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractLineMarkersTest.java @@ -29,7 +29,7 @@ import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.testFramework.ExpectedHighlightingData; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.PluginTestCaseBase; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOutOfBlockModificationTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOutOfBlockModificationTest.java index 72a3d84f296..ef256526fb3 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOutOfBlockModificationTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOutOfBlockModificationTest.java @@ -22,7 +22,7 @@ import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiManager; import com.intellij.psi.impl.PsiModificationTrackerImpl; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.PluginTestCaseBase; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java index c0f03f95d74..961dafc27c3 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/AbstractOverrideImplementTest.java @@ -31,7 +31,7 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.psi.JetClassOrObject; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/InsertImportOnPasteTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/InsertImportOnPasteTestGenerated.java index fabe8874af0..8753f328225 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/InsertImportOnPasteTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/InsertImportOnPasteTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.codeInsight; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/JetInspectionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/JetInspectionTestGenerated.java index 6715922bdc3..5094cb4cee5 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/JetInspectionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/JetInspectionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.codeInsight; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/LineMarkersTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/LineMarkersTestGenerated.java index 6501b55ff1c..97f88389823 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/LineMarkersTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/LineMarkersTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.codeInsight; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OutOfBlockModificationTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OutOfBlockModificationTestGenerated.java index 0d66f788506..122cdf18780 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/OutOfBlockModificationTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/OutOfBlockModificationTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.codeInsight; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/AbstractCodeMoverTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/AbstractCodeMoverTest.java index 35fbca64e5f..ba1e8505079 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/AbstractCodeMoverTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/AbstractCodeMoverTest.java @@ -23,10 +23,9 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.actionSystem.EditorAction; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.util.io.FileUtil; -import com.intellij.psi.PsiDocumentManager; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.jet.plugin.codeInsight.upDownMover.JetDeclarationMover; import org.jetbrains.jet.plugin.codeInsight.upDownMover.JetExpressionMover; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/CodeMoverTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/CodeMoverTestGenerated.java index befaa4316d0..4f765b701e2 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/CodeMoverTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/moveUpDown/CodeMoverTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.codeInsight.moveUpDown; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/smartEnter/SmartEnterTest.kt b/idea/tests/org/jetbrains/jet/plugin/codeInsight/smartEnter/SmartEnterTest.kt index d89f83ee08f..f43f4810660 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/smartEnter/SmartEnterTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/smartEnter/SmartEnterTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.codeInsight.smartEnter import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import com.intellij.openapi.actionSystem.IdeActions import org.jetbrains.kotlin.plugin.JetFileType -import org.jetbrains.jet.test.util.trimIndent +import org.jetbrains.kotlin.test.util.trimIndent import com.intellij.testFramework.LightProjectDescriptor import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/AbstractSurroundWithTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/AbstractSurroundWithTest.java index 15035044ed8..a1e800506de 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/AbstractSurroundWithTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/AbstractSurroundWithTest.java @@ -26,7 +26,7 @@ import com.intellij.psi.PsiElement; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.jet.plugin.codeInsight.surroundWith.expression.KotlinNotSurrounder; import org.jetbrains.jet.plugin.codeInsight.surroundWith.expression.KotlinParenthesesSurrounder; import org.jetbrains.jet.plugin.codeInsight.surroundWith.expression.KotlinStringTemplateSurrounder; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/SurroundWithTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/SurroundWithTestGenerated.java index ab27bc4f232..801286054db 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/SurroundWithTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/surroundWith/SurroundWithTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.codeInsight.surroundWith; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/unwrap/AbstractUnwrapRemoveTest.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/unwrap/AbstractUnwrapRemoveTest.java index eebcba41899..594b8ff799b 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/unwrap/AbstractUnwrapRemoveTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/unwrap/AbstractUnwrapRemoveTest.java @@ -24,7 +24,7 @@ import com.intellij.psi.PsiElement; import com.intellij.testFramework.LightCodeInsightTestCase; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.io.File; import java.util.List; diff --git a/idea/tests/org/jetbrains/jet/plugin/codeInsight/unwrap/UnwrapRemoveTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/codeInsight/unwrap/UnwrapRemoveTestGenerated.java index 6f743e0cb80..297f7b8f2cc 100644 --- a/idea/tests/org/jetbrains/jet/plugin/codeInsight/unwrap/UnwrapRemoveTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/codeInsight/unwrap/UnwrapRemoveTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.codeInsight.unwrap; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/configuration/AbstractConfigureProjectByChangingFileTest.java b/idea/tests/org/jetbrains/jet/plugin/configuration/AbstractConfigureProjectByChangingFileTest.java index b21a4dbc3c8..0e566b0393a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/configuration/AbstractConfigureProjectByChangingFileTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/configuration/AbstractConfigureProjectByChangingFileTest.java @@ -19,8 +19,8 @@ package org.jetbrains.jet.plugin.configuration; import com.intellij.testFramework.LightCodeInsightTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.maven.model.MavenConstants; -import org.jetbrains.jet.InTextDirectivesUtils; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.plugins.groovy.lang.psi.GroovyFile; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java index cdd1a9a7788..aa5dacac102 100644 --- a/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/configuration/ConfigureProjectByChangingFileTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.configuration; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java index 17a616254a6..5a0582c8e49 100644 --- a/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/conversion/copy/JavaToKotlinCopyPasteConversionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.conversion.copy; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/coverage/AbstractKotlinCoverageOutputFilesTest.kt b/idea/tests/org/jetbrains/jet/plugin/coverage/AbstractKotlinCoverageOutputFilesTest.kt index 10064cb8638..88c66bbf44f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/coverage/AbstractKotlinCoverageOutputFilesTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/coverage/AbstractKotlinCoverageOutputFilesTest.kt @@ -25,7 +25,7 @@ import com.intellij.openapi.fileEditor.impl.LoadTextUtil import kotlin.test.assertEquals import java.io.File import com.intellij.testFramework.UsefulTestCase -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils public abstract class AbstractKotlinCoverageOutputFilesTest(): JetLightCodeInsightFixtureTestCase() { private val TEST_DATA_PATH = PluginTestCaseBase.getTestDataPathBase() + "/coverage/outputFiles" diff --git a/idea/tests/org/jetbrains/jet/plugin/coverage/KotlinCoverageOutputFilesTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/coverage/KotlinCoverageOutputFilesTestGenerated.java index 4d636e2ef46..442a270fe65 100644 --- a/idea/tests/org/jetbrains/jet/plugin/coverage/KotlinCoverageOutputFilesTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/coverage/KotlinCoverageOutputFilesTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.coverage; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt index 6ba8ccbfc15..f3d4110408f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractKotlinSteppingTest.kt @@ -24,7 +24,7 @@ import com.intellij.debugger.ui.breakpoints.LineBreakpoint import com.intellij.debugger.actions.MethodSmartStepTarget import com.intellij.debugger.engine.BasicStepMethodFilter import org.jetbrains.jet.plugin.util.application.runReadAction -import org.jetbrains.jet.InTextDirectivesUtils.* +import org.jetbrains.kotlin.test.InTextDirectivesUtils.* import com.intellij.openapi.util.io.FileUtil import java.io.File import kotlin.properties.Delegates diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractSmartStepIntoTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractSmartStepIntoTest.kt index cd63306bd78..aa79d2826c1 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractSmartStepIntoTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/AbstractSmartStepIntoTest.kt @@ -21,7 +21,7 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture import org.jetbrains.jet.plugin.PluginTestCaseBase import com.intellij.debugger.actions.MethodSmartStepTarget -import org.jetbrains.jet.InTextDirectivesUtils +import org.jetbrains.kotlin.test.InTextDirectivesUtils import com.intellij.psi.util.PsiFormatUtil import com.intellij.psi.PsiSubstitutor import com.intellij.psi.util.PsiFormatUtilBase diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/JetPositionManagerTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/JetPositionManagerTestGenerated.java index d387acb4ef5..3f8963014ca 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/JetPositionManagerTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/JetPositionManagerTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.debugger; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java index 1179c770268..cd8335550be 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinDebuggerTestCase.java @@ -33,9 +33,9 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.testFramework.UsefulTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestCaseBuilder; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.MockLibraryUtil; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.MockLibraryUtil; import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.load.kotlin.PackageClassUtils; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java index 76866012eef..9c40061488d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/KotlinSteppingTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.debugger; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/SmartStepIntoTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/SmartStepIntoTestGenerated.java index 47433099603..76a075b5c96 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/SmartStepIntoTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/SmartStepIntoTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.debugger; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt index 49281426d45..7a5add5c74c 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractEditorForEvaluateExpressionTest.kt @@ -27,7 +27,7 @@ import org.jetbrains.jet.plugin.quickfix.ImportInsertHelper import org.jetbrains.kotlin.psi.JetFile import com.intellij.openapi.application.ApplicationManager import org.jetbrains.kotlin.name.FqName -import org.jetbrains.jet.InTextDirectivesUtils +import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.psi.JetCodeFragment import org.jetbrains.jet.plugin.caches.resolve.analyzeFully import org.jetbrains.kotlin.psi.JetTypeReference @@ -37,7 +37,7 @@ import org.jetbrains.jet.completion.ExpectedCompletionUtils import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.jet.completion.handlers.AbstractCompletionHandlerTest import com.intellij.codeInsight.completion.CompletionType -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils public abstract class AbstractCodeFragmentHighlightingTest : AbstractJetPsiCheckerTest() { override fun doTest(filePath: String) { diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt index 2ec42750a09..34717ba5253 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractKotlinEvaluateExpressionTest.kt @@ -27,7 +27,7 @@ import org.junit.Assert import org.jetbrains.kotlin.plugin.JetFileType import com.intellij.openapi.util.io.FileUtil import java.io.File -import org.jetbrains.jet.InTextDirectivesUtils +import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.eval4j.jdi.asValue import org.jetbrains.eval4j.Value import org.jetbrains.eval4j.ObjectValue diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt index ce1a9f784e0..2371883ff98 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/AbstractSelectExpressionForDebuggerTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.debugger.evaluate import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.jet.plugin.debugger.KotlinEditorTextProvider import org.jetbrains.jet.plugin.PluginTestCaseBase -import org.jetbrains.jet.InTextDirectivesUtils +import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.junit.Assert public abstract class AbstractSelectExpressionForDebuggerTest : LightCodeInsightFixtureTestCase() { diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java index 2afd1431dbd..dcbeb4d6e9a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionHandlerTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.debugger.evaluate; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionTestGenerated.java index f53f974e03d..2f8e6dfae13 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentCompletionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.debugger.evaluate; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java index 12ac643452a..e10f827e62f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/CodeFragmentHighlightingTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.debugger.evaluate; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java index ca57d8f6e78..2a0f7e6aa76 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/KotlinEvaluateExpressionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.debugger.evaluate; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java index 0c70580af39..b06f915a446 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.debugger.evaluate; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibrarySourceTest.java b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibrarySourceTest.java index 75eee7f39c0..6eadad1ae6b 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibrarySourceTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/navigation/NavigateToLibrarySourceTest.java @@ -26,7 +26,7 @@ import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.jet.plugin.JdkAndMockLibraryProjectDescriptor; import org.jetbrains.jet.plugin.navigation.NavigationTestUtils; import org.jetbrains.jet.plugin.references.JetReference; diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt index 57eb8f91c61..11fe525c81f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/AbstractClsStubBuilderTest.kt @@ -18,9 +18,9 @@ package org.jetbrains.jet.plugin.decompiler.stubBuilder import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.psi.stubs.elements.JetFileStubBuilder -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils import java.io.File -import org.jetbrains.jet.MockLibraryUtil +import org.jetbrains.kotlin.test.MockLibraryUtil import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.util.indexing.FileContentImpl import com.intellij.psi.PsiElement diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java index 88031534ae2..16fb5eec19c 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.decompiler.stubBuilder; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt index 1ac899de0f6..08283ba99ed 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.decompiler.stubBuilder import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.jet.plugin.JetJdkAndLibraryProjectDescriptor import java.io.File -import org.jetbrains.jet.JetTestCaseBuilder +import org.jetbrains.kotlin.test.JetTestCaseBuilder import org.jetbrains.jet.plugin.decompiler.navigation.NavigateToDecompiledLibraryTest class ClsStubBuilderForWrongAbiVersionTest : AbstractClsStubBuilderTest() { diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt index e26e7383f4b..6459ffe4615 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt @@ -17,7 +17,7 @@ package org.jetbrains.jet.plugin.decompiler.textBuilder import com.intellij.testFramework.LightProjectDescriptor -import org.jetbrains.jet.JetTestCaseBuilder +import org.jetbrains.kotlin.test.JetTestCaseBuilder import com.intellij.psi.PsiManager import org.junit.Assert import org.jetbrains.jet.plugin.JetJdkAndLibraryProjectDescriptor diff --git a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextTestGenerated.java index 19b46d82aee..fb8fd1dc8f6 100644 --- a/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/decompiler/textBuilder/DecompiledTextTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.decompiler.textBuilder; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/folding/FoldingAfterOptimizeImportsTest.kt b/idea/tests/org/jetbrains/jet/plugin/folding/FoldingAfterOptimizeImportsTest.kt index bea76b946e3..1bc2caf9990 100644 --- a/idea/tests/org/jetbrains/jet/plugin/folding/FoldingAfterOptimizeImportsTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/folding/FoldingAfterOptimizeImportsTest.kt @@ -23,7 +23,7 @@ import com.intellij.openapi.editor.FoldRegion import org.jetbrains.jet.plugin.PluginTestCaseBase import java.io.File import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture -import org.jetbrains.jet.InTextDirectivesUtils +import org.jetbrains.kotlin.test.InTextDirectivesUtils import com.intellij.openapi.editor.Editor import org.jetbrains.jet.plugin.folding.AbstractKotlinFoldingTest.doTestWithSettings import org.jetbrains.jet.plugin.imports.KotlinImportOptimizer diff --git a/idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java index d29609e055d..b60e34de310 100644 --- a/idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/folding/KotlinFoldingTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.folding; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java index f8dbbc482a5..614e25b9b40 100644 --- a/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/hierarchy/HierarchyTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.hierarchy; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java index 50443afa45f..86604ef23de 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractDiagnosticMessageTest.java @@ -22,9 +22,9 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.JetLiteFixture; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.test.ConfigurationKind; +import org.jetbrains.kotlin.test.JetLiteFixture; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.analyzer.AnalysisResult; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.kotlin.diagnostics.DiagnosticFactory; diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java index 0841a393809..20633c7e926 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/AbstractHighlightingTest.java @@ -22,7 +22,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.rt.execution.junit.FileComparisonFailure; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.JetLightProjectDescriptor; import org.jetbrains.jet.testing.TagsTestDataUtil; diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTestGenerated.java index ffd8c4f8a68..d6b75ddb58a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/DiagnosticMessageTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.highlighter; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/highlighter/HighlightingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/highlighter/HighlightingTestGenerated.java index 5854df2bfaf..bfd580d980f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/highlighter/HighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/highlighter/HighlightingTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.highlighter; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java index a2865abaf67..8a8b14e5395 100644 --- a/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/imports/OptimizeImportsTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.imports; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractIntentionTest.java b/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractIntentionTest.java index b8d52c3080e..a2640018d49 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractIntentionTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/intentions/AbstractIntentionTest.java @@ -17,8 +17,6 @@ package org.jetbrains.jet.plugin.intentions; import com.google.common.collect.Lists; -import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; -import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.util.SystemInfo; @@ -26,7 +24,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.testFramework.LightCodeInsightTestCase; import com.intellij.util.PathUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.DirectiveBasedActionUtils; import org.jetbrains.jet.plugin.PluginTestCaseBase; diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestGenerated.java index 49cb4f71417..38b19b63202 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/intentions/IntentionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.intentions; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/intentions/declarations/JoinLinesTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/intentions/declarations/JoinLinesTestGenerated.java index 1c0b06229a3..ecda816edb6 100644 --- a/idea/tests/org/jetbrains/jet/plugin/intentions/declarations/JoinLinesTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/intentions/declarations/JoinLinesTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.intentions.declarations; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractGotoSuperTest.java b/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractGotoSuperTest.java index da96d770676..aaa665c7305 100644 --- a/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractGotoSuperTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractGotoSuperTest.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.plugin.navigation; import com.intellij.codeInsight.CodeInsightActionHandler; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.plugin.JetFileType; import java.util.List; diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractKotlinGotoTest.java b/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractKotlinGotoTest.java index fa69614c717..d30ee0580bd 100644 --- a/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractKotlinGotoTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/navigation/AbstractKotlinGotoTest.java @@ -30,9 +30,9 @@ import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.jet.testing.ReferenceUtils; import org.junit.Assert; diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/GotoSuperTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/navigation/GotoSuperTestGenerated.java index 23a124fcc21..23f550e3c22 100644 --- a/idea/tests/org/jetbrains/jet/plugin/navigation/GotoSuperTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/navigation/GotoSuperTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.navigation; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/KotlinGotoTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/navigation/KotlinGotoTestGenerated.java index 6bf17ace207..c97002333b3 100644 --- a/idea/tests/org/jetbrains/jet/plugin/navigation/KotlinGotoTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/navigation/KotlinGotoTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.navigation; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/navigation/NavigationTestUtils.java b/idea/tests/org/jetbrains/jet/plugin/navigation/NavigationTestUtils.java index 0bc2d05f3d7..9e01ca152e8 100644 --- a/idea/tests/org/jetbrains/jet/plugin/navigation/NavigationTestUtils.java +++ b/idea/tests/org/jetbrains/jet/plugin/navigation/NavigationTestUtils.java @@ -34,7 +34,7 @@ import com.intellij.util.containers.MultiMap; import junit.framework.TestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.jet.testing.ReferenceUtils; import org.junit.Assert; diff --git a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java index 17cce773ff7..5de4d84a428 100644 --- a/idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/parameterInfo/FunctionParameterInfoTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.parameterInfo; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java index f07c8b62bbc..cb9555a29fc 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixMultiFileTest.java @@ -26,16 +26,13 @@ import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiFile; import com.intellij.util.ArrayUtil; -import com.intellij.util.Function; -import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.UIUtil; -import jet.runtime.typeinfo.JetValueParameter; import junit.framework.ComparisonFailure; import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.InTextDirectivesUtils; -import org.jetbrains.jet.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.DirectiveBasedActionUtils; import org.jetbrains.jet.plugin.KotlinDaemonAnalyzerTestCase; diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java index 6681797e84b..280306387fc 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/AbstractQuickFixTest.java @@ -29,12 +29,12 @@ import com.intellij.openapi.util.Pair; import com.intellij.psi.PsiElement; import org.apache.commons.lang.SystemUtils; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.DirectiveBasedActionUtils; import org.jetbrains.jet.plugin.KotlinLightQuickFixTestCase; import org.jetbrains.jet.plugin.PluginTestCaseBase; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.TestMetadata; import org.jetbrains.jet.testing.ConfigLibraryUtil; import org.junit.Assert; diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java index ab35a55e735..7da56dc926b 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixMultiFileTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.quickfix; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java index 582bc756941..1f1f4d6d13d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/quickfix/QuickFixTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.quickfix; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/AbstractInlineTest.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/AbstractInlineTest.java index 873aded84fd..a71699b7d6d 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/AbstractInlineTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/AbstractInlineTest.java @@ -23,7 +23,7 @@ import com.intellij.psi.PsiElement; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase; import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/InlineTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/InlineTestGenerated.java index c045e622f16..d6c155bf9e4 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/InlineTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/inline/InlineTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.refactoring.inline; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt index a737dad5362..61d604ecffb 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.refactoring.introduce.introduceVariable import com.intellij.ide.DataManager import com.intellij.psi.PsiElement -import org.jetbrains.jet.JetTestCaseBuilder +import org.jetbrains.kotlin.test.JetTestCaseBuilder import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractKotlinFunctionHandler import java.io.File @@ -26,9 +26,9 @@ import org.jetbrains.jet.plugin.refactoring.extractFunction.selectElements import org.jetbrains.kotlin.psi.JetTreeVisitorVoid import com.intellij.psi.PsiComment import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture -import org.jetbrains.jet.InTextDirectivesUtils +import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.renderer.DescriptorRenderer import kotlin.test.assertEquals import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/JetExtractionTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/JetExtractionTestGenerated.java index d355472963b..eb1ef45f46f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/JetExtractionTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/JetExtractionTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.refactoring.introduce.introduceVariable; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt index 31e532bff84..b30ef168b4a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/AbstractJetMoveTest.kt @@ -33,24 +33,19 @@ import com.intellij.codeInsight.TargetElementUtilBase import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.openapi.editor.EditorFactory import com.intellij.openapi.editor.Document -import com.intellij.openapi.application.ApplicationManager import com.intellij.psi.PsiDocumentManager -import com.intellij.openapi.util.Computable -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesProcessor import com.intellij.refactoring.move.moveClassesOrPackages.MultipleRootsMoveDestination import com.intellij.refactoring.PackageWrapper import com.intellij.psi.JavaPsiFacade import com.intellij.psi.PsiClass import com.intellij.refactoring.move.moveInner.MoveInnerProcessor -import com.intellij.psi.search.GlobalSearchScope import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassToInnerProcessor import com.intellij.psi.PsiFile import com.intellij.psi.PsiManager import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesProcessor import com.intellij.refactoring.move.MoveHandler -import org.jetbrains.jet.getString -import org.jetbrains.jet.getNullableString import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.MoveKotlinTopLevelDeclarationsProcessor import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.MoveDestinationKotlinMoveTarget @@ -58,7 +53,6 @@ import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.MoveKo import org.jetbrains.jet.plugin.refactoring.move.moveTopLevelDeclarations.JetFileKotlinMoveTarget import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.search.allScope -import org.jetbrains.jet.InTextDirectivesUtils import org.jetbrains.jet.testing.ConfigLibraryUtil import org.jetbrains.jet.plugin.util.application.runWriteAction diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java index 0f78ab05385..177a4693912 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/JetMoveTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.refactoring.move; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/compiler/tests/org/jetbrains/jet/jsonUtils.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/jsonUtils.kt similarity index 64% rename from compiler/tests/org/jetbrains/jet/jsonUtils.kt rename to idea/tests/org/jetbrains/jet/plugin/refactoring/move/jsonUtils.kt index 05871f0f96f..af0c994dcf5 100644 --- a/compiler/tests/org/jetbrains/jet/jsonUtils.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/move/jsonUtils.kt @@ -14,17 +14,14 @@ * limitations under the License. */ -package org.jetbrains.jet +package org.jetbrains.jet.plugin.refactoring.move import com.google.gson.JsonObject -public fun JsonObject.getString(name: String): String { - val member = getNullableString(name) - if (member == null) { - throw IllegalStateException("Member with name '$name' is expected in '$this'") - } - - return member +fun JsonObject.getString(name: String): String { + return getNullableString(name) ?: throw IllegalStateException("Member with name '$name' is expected in '$this'") } -public fun JsonObject.getNullableString(name: String): String? = this[name]?.getAsString() \ No newline at end of file +fun JsonObject.getNullableString(name: String): String? { + return this[name]?.getAsString() +} diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java index 58e65fad330..61b85a27392 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/nameSuggester/JetNameSuggesterTest.java @@ -19,13 +19,12 @@ package org.jetbrains.jet.plugin.refactoring.nameSuggester; import com.intellij.openapi.util.text.StringUtil; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.psi.JetExpression; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.PluginTestCaseBase; import org.jetbrains.jet.plugin.refactoring.EmptyValidator; import org.jetbrains.jet.plugin.refactoring.JetNameSuggester; -import org.jetbrains.jet.plugin.refactoring.JetNameValidator; import org.jetbrains.jet.plugin.refactoring.JetRefactoringUtil; import java.util.Arrays; diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt index 2f878a879ca..b5983e2bbc0 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.kt @@ -22,7 +22,6 @@ import java.io.File import org.junit.Assert import com.google.gson.JsonParser import com.google.gson.JsonObject -import com.intellij.refactoring.util.CommonRefactoringUtil import com.intellij.openapi.util.text.StringUtil import com.intellij.openapi.fileEditor.FileDocumentManager import com.intellij.psi.PsiDocumentManager @@ -38,13 +37,12 @@ import com.intellij.openapi.module.Module import org.jetbrains.kotlin.resolve.BindingContext import java.util.Collections import org.jetbrains.kotlin.name.Name -import org.jetbrains.kotlin.resolve.BindingContextUtils import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.name.FqNameUnsafe import org.jetbrains.kotlin.name.isSubpackageOf -import org.jetbrains.jet.getString -import org.jetbrains.jet.getNullableString +import org.jetbrains.jet.plugin.refactoring.move.getString +import org.jetbrains.jet.plugin.refactoring.move.getNullableString import org.jetbrains.jet.plugin.search.allScope import org.jetbrains.jet.plugin.caches.resolve.analyzeFully import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java index 18c8ca70565..e7f3ecb845e 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.refactoring.rename; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/structureView/AbstractKotlinFileStructureTest.kt b/idea/tests/org/jetbrains/jet/plugin/structureView/AbstractKotlinFileStructureTest.kt index 89afaa933c5..73cfd0c98da 100644 --- a/idea/tests/org/jetbrains/jet/plugin/structureView/AbstractKotlinFileStructureTest.kt +++ b/idea/tests/org/jetbrains/jet/plugin/structureView/AbstractKotlinFileStructureTest.kt @@ -25,10 +25,10 @@ import com.intellij.ui.treeStructure.filtered.FilteringTreeStructure import com.intellij.ide.util.FileStructurePopup import com.intellij.ide.actions.ViewStructureAction import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider -import org.jetbrains.jet.JetTestUtils -import org.jetbrains.jet.InTextDirectivesUtils +import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.InTextDirectivesUtils import com.intellij.openapi.ui.Queryable.PrintInfo -import org.jetbrains.jet.test.util.configureWithExtraFile +import org.jetbrains.kotlin.test.util.configureWithExtraFile public abstract class AbstractKotlinFileStructureTest : JetLightCodeInsightFixtureTestCase() { override fun getTestDataPath() = PluginTestCaseBase.getTestDataPathBase() + "/structureView/fileStructure" diff --git a/idea/tests/org/jetbrains/jet/plugin/structureView/KotlinFileStructureTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/structureView/KotlinFileStructureTestGenerated.java index d1e988cf81d..0de9aa22d43 100644 --- a/idea/tests/org/jetbrains/jet/plugin/structureView/KotlinFileStructureTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/structureView/KotlinFileStructureTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.structureView; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.java b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.java index 136cf05b809..ca72fb576bd 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractResolveByStubTest.java @@ -32,13 +32,13 @@ import org.jetbrains.kotlin.name.FqName; import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.jet.plugin.KotlinCodeInsightTestCase; import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage; -import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; +import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator; import org.junit.Assert; import java.io.File; import static com.intellij.openapi.roots.ModuleRootModificationUtil.updateModel; -import static org.jetbrains.jet.test.util.DescriptorValidator.ValidationVisitor.errorTypesForbidden; +import static org.jetbrains.kotlin.test.util.DescriptorValidator.ValidationVisitor.errorTypesForbidden; public abstract class AbstractResolveByStubTest extends KotlinCodeInsightTestCase { protected void doTest(String testFileName) throws Exception { diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractStubBuilderTest.java b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractStubBuilderTest.java index 099d1bd4b8d..2cec900bd3c 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractStubBuilderTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/AbstractStubBuilderTest.java @@ -20,7 +20,7 @@ import com.intellij.psi.impl.DebugUtil; import com.intellij.psi.stubs.StubElement; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.kotlin.psi.stubs.elements.JetFileStubBuilder; import org.jetbrains.kotlin.name.SpecialNames; diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/AstAccessControl.kt b/idea/tests/org/jetbrains/jet/plugin/stubs/AstAccessControl.kt index 2223d23a59a..56b03e9f895 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/AstAccessControl.kt +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/AstAccessControl.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.plugin.JetFileType import com.intellij.openapi.project.Project import com.intellij.openapi.Disposable import com.intellij.openapi.vfs.VfsUtilCore -import org.jetbrains.jet.InTextDirectivesUtils +import org.jetbrains.kotlin.test.InTextDirectivesUtils import kotlin.test.fail public object AstAccessControl { diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/MultiFileHighlightingTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/stubs/MultiFileHighlightingTestGenerated.java index e6cce22720f..5cbf9b0ca50 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/MultiFileHighlightingTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/MultiFileHighlightingTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.stubs; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/ResolveByStubTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/stubs/ResolveByStubTestGenerated.java index 79edc7033a1..a67ff7ca25f 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/ResolveByStubTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/ResolveByStubTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.stubs; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/plugin/stubs/StubBuilderTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/stubs/StubBuilderTestGenerated.java index a5db76d2425..d5e4b0277f0 100644 --- a/idea/tests/org/jetbrains/jet/plugin/stubs/StubBuilderTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/stubs/StubBuilderTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.plugin.stubs; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/psi/injection/StringInjectionHostTest.kt b/idea/tests/org/jetbrains/jet/psi/injection/StringInjectionHostTest.kt index 34438c5a5b6..e296f2fc601 100644 --- a/idea/tests/org/jetbrains/jet/psi/injection/StringInjectionHostTest.kt +++ b/idea/tests/org/jetbrains/jet/psi/injection/StringInjectionHostTest.kt @@ -21,8 +21,8 @@ import org.jetbrains.kotlin.psi.JetStringTemplateExpression import org.junit.Assert.* import com.intellij.openapi.util.TextRange import java.util.HashMap -import org.jetbrains.jet.JetLiteFixture -import org.jetbrains.jet.ConfigurationKind +import org.jetbrains.kotlin.test.JetLiteFixture +import org.jetbrains.kotlin.test.ConfigurationKind public class StringInjectionHostTest: JetLiteFixture() { public fun testRegular() { diff --git a/idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt b/idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt index 0baba41d16d..d5a49a376a9 100644 --- a/idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt +++ b/idea/tests/org/jetbrains/jet/psi/patternMatching/AbstractJetPsiUnifierTest.kt @@ -27,12 +27,12 @@ import org.jetbrains.jet.plugin.util.psi.patternMatching.JetPsiUnifier import org.jetbrains.jet.plugin.caches.resolve.analyzeFully import org.jetbrains.jet.plugin.util.psi.patternMatching.toRange import java.io.File -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.JetTypeReference import org.jetbrains.kotlin.psi.JetWhenCondition import org.jetbrains.jet.plugin.DirectiveBasedActionUtils -import org.jetbrains.jet.InTextDirectivesUtils +import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.jet.testing.ConfigLibraryUtil import org.jetbrains.jet.plugin.PluginTestCaseBase diff --git a/idea/tests/org/jetbrains/jet/psi/patternMatching/JetPsiUnifierTestGenerated.java b/idea/tests/org/jetbrains/jet/psi/patternMatching/JetPsiUnifierTestGenerated.java index d13ca9c4edb..cc85ab34f7c 100644 --- a/idea/tests/org/jetbrains/jet/psi/patternMatching/JetPsiUnifierTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/psi/patternMatching/JetPsiUnifierTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.psi.patternMatching; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt b/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt index 787db4d00f3..cadc66244cb 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt +++ b/idea/tests/org/jetbrains/jet/resolve/AbstractPartialBodyResolveTest.kt @@ -20,12 +20,12 @@ import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.jet.JetTestCaseBuilder +import org.jetbrains.kotlin.test.JetTestCaseBuilder import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import java.util.HashSet -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils import java.io.File import org.jetbrains.kotlin.psi.JetBlockExpression import org.junit.Assert diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt b/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt index 71bcc0ef6f8..f371c3b43c9 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveInLibrarySourcesTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.resolve import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import org.jetbrains.jet.plugin.navigation.NavigationTestUtils -import org.jetbrains.jet.InTextDirectivesUtils +import org.jetbrains.kotlin.test.InTextDirectivesUtils import java.io.File import org.jetbrains.jet.plugin.PluginTestCaseBase import org.junit.Assert diff --git a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveTest.java b/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveTest.java index 4c6fc07a834..0cf18ae34eb 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveTest.java +++ b/idea/tests/org/jetbrains/jet/resolve/AbstractReferenceResolveTest.java @@ -27,12 +27,12 @@ import com.intellij.psi.impl.file.impl.FileManager; import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.InTextDirectivesUtils; -import org.jetbrains.jet.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; import org.jetbrains.kotlin.psi.JetFile; import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor; import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver; -import org.jetbrains.jet.test.util.UtilPackage; +import org.jetbrains.kotlin.test.util.UtilPackage; import org.jetbrains.jet.testing.ReferenceUtils; import org.junit.Assert; diff --git a/idea/tests/org/jetbrains/jet/resolve/AdditionalResolveDescriptorRendererTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/AdditionalResolveDescriptorRendererTestGenerated.java index b7e09c8f23d..d455977a3bf 100644 --- a/idea/tests/org/jetbrains/jet/resolve/AdditionalResolveDescriptorRendererTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/resolve/AdditionalResolveDescriptorRendererTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.resolve; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/resolve/PartialBodyResolveTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/PartialBodyResolveTestGenerated.java index 7b4739ebcef..b4bda52c733 100644 --- a/idea/tests/org/jetbrains/jet/resolve/PartialBodyResolveTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/resolve/PartialBodyResolveTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.resolve; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInJavaTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInJavaTestGenerated.java index fb598550774..c26663da1d1 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInJavaTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInJavaTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.resolve; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java index 1dd792fcc58..e6b5faa6f03 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveInLibrarySourcesTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.resolve; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java index 14c3e5f0d2d..a61637b0d5b 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.resolve; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java index a74e014b44f..efd484f3588 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/resolve/ReferenceResolveWithLibTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.resolve; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java b/idea/tests/org/jetbrains/jet/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java index b4e94fa66a7..b5e9d1f23fb 100644 --- a/idea/tests/org/jetbrains/jet/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/resolve/ReferenceToJavaWithWrongFileStructureTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.resolve; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java b/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java index 8830aab2ff2..883b5081aa0 100644 --- a/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/safeDelete/JetSafeDeleteTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.safeDelete; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/search/AbstractSearcherTest.java b/idea/tests/org/jetbrains/jet/search/AbstractSearcherTest.java index c285ccc19c9..940b08528f4 100644 --- a/idea/tests/org/jetbrains/jet/search/AbstractSearcherTest.java +++ b/idea/tests/org/jetbrains/jet/search/AbstractSearcherTest.java @@ -24,7 +24,7 @@ import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import com.intellij.util.Query; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.jet.plugin.JetLightProjectDescriptor; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/search/AnnotatedMembersSearchTest.java b/idea/tests/org/jetbrains/jet/search/AnnotatedMembersSearchTest.java index 503f3853027..3c80e3c16af 100644 --- a/idea/tests/org/jetbrains/jet/search/AnnotatedMembersSearchTest.java +++ b/idea/tests/org/jetbrains/jet/search/AnnotatedMembersSearchTest.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.search; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiClass; import com.intellij.psi.search.searches.AnnotatedMembersSearch; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.jet.plugin.PluginTestCaseBase; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/search/ClassInheritorsSearchTest.java b/idea/tests/org/jetbrains/jet/search/ClassInheritorsSearchTest.java index 9c7a892a1f6..605475294cc 100644 --- a/idea/tests/org/jetbrains/jet/search/ClassInheritorsSearchTest.java +++ b/idea/tests/org/jetbrains/jet/search/ClassInheritorsSearchTest.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.search; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiClass; import com.intellij.psi.search.searches.ClassInheritorsSearch; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.jet.plugin.PluginTestCaseBase; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java b/idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java index 660e7e662ad..6a50e451f0e 100644 --- a/idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java +++ b/idea/tests/org/jetbrains/jet/search/JUnitMembersSearcherTest.java @@ -23,7 +23,7 @@ import com.intellij.psi.search.searches.AnnotatedMembersSearch; import com.intellij.psi.search.searches.ClassInheritorsSearch; import com.intellij.testFramework.LightProjectDescriptor; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.jet.plugin.JetJdkAndLibraryProjectDescriptor; import org.jetbrains.jet.plugin.PluginTestCaseBase; diff --git a/idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt b/idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt index 8b31d5f4b19..b3a5b62912a 100644 --- a/idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt +++ b/idea/tests/org/jetbrains/jet/shortenRefs/AbstractShortenRefsTest.kt @@ -23,10 +23,10 @@ import com.intellij.openapi.application.ApplicationManager import java.io.File import com.intellij.openapi.command.CommandProcessor import org.jetbrains.jet.plugin.codeInsight.ShortenReferences -import org.jetbrains.jet.JetTestCaseBuilder +import org.jetbrains.kotlin.test.JetTestCaseBuilder import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase import com.intellij.codeInsight.CodeInsightSettings -import org.jetbrains.jet.InTextDirectivesUtils +import org.jetbrains.kotlin.test.InTextDirectivesUtils public abstract class AbstractShortenRefsTest : JetLightCodeInsightFixtureTestCase() { override fun getTestDataPath() = JetTestCaseBuilder.getHomeDirectory() diff --git a/idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java b/idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java index 43acc4b8f07..55c28250c17 100644 --- a/idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/shortenRefs/ShortenRefsTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.jet.shortenRefs; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/jet/testing/ReferenceUtils.java b/idea/tests/org/jetbrains/jet/testing/ReferenceUtils.java index a51deea7d32..e9f8a198c30 100644 --- a/idea/tests/org/jetbrains/jet/testing/ReferenceUtils.java +++ b/idea/tests/org/jetbrains/jet/testing/ReferenceUtils.java @@ -25,7 +25,7 @@ import com.intellij.util.PathUtil; import kotlin.Function1; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import org.jetbrains.kotlin.psi.JetClass; import org.jetbrains.kotlin.psi.JetObjectDeclaration; import org.jetbrains.jet.plugin.PluginTestCaseBase; diff --git a/idea/tests/org/jetbrains/jet/testing/SettingsConfigurator.java b/idea/tests/org/jetbrains/jet/testing/SettingsConfigurator.java index 67746f10537..fd7a6f827a9 100644 --- a/idea/tests/org/jetbrains/jet/testing/SettingsConfigurator.java +++ b/idea/tests/org/jetbrains/jet/testing/SettingsConfigurator.java @@ -19,7 +19,7 @@ package org.jetbrains.jet.testing; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import kotlin.Pair; -import org.jetbrains.jet.InTextDirectivesUtils; +import org.jetbrains.kotlin.test.InTextDirectivesUtils; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/idea/tests/org/jetbrains/kotlin/checkers/JetJsCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/JetJsCheckerTestGenerated.java index 5aa89ce2465..2b9023eaad0 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/JetJsCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/JetJsCheckerTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/checkers/JetPsiCheckerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/checkers/JetPsiCheckerTestGenerated.java index 2d7f5999454..c201134c813 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/JetPsiCheckerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/JetPsiCheckerTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.checkers; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java b/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java index aa9cdac10b7..1eb0ac19705 100644 --- a/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java +++ b/idea/tests/org/jetbrains/kotlin/checkers/KotlinAndJavaCheckerTest.java @@ -21,7 +21,7 @@ import com.intellij.codeInspection.nullable.NullableStuffInspection; import com.intellij.openapi.projectRoots.Sdk; import com.siyeh.ig.bugs.StaticCallOnSubclassInspection; import com.siyeh.ig.bugs.StaticFieldReferenceOnSubclassInspection; -import org.jetbrains.jet.JetTestCaseBuilder; +import org.jetbrains.kotlin.test.JetTestCaseBuilder; import org.jetbrains.jet.plugin.KotlinDaemonAnalyzerTestCase; import org.jetbrains.jet.plugin.PluginTestCaseBase; diff --git a/idea/tests/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java b/idea/tests/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java index 3dbdfa9260c..50a2427df1d 100644 --- a/idea/tests/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java +++ b/idea/tests/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.modules; import junit.framework.TestCase; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.kotlin.test.JetTestUtils; import java.io.File; import java.util.Arrays; diff --git a/idea/tests/org/jetbrains/kotlin/resolve/jvm/JavaTypeSubstitutorTestGenerated.java b/idea/tests/org/jetbrains/kotlin/resolve/jvm/JavaTypeSubstitutorTestGenerated.java index 578da16e069..0da9afe6043 100644 --- a/idea/tests/org/jetbrains/kotlin/resolve/jvm/JavaTypeSubstitutorTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/resolve/jvm/JavaTypeSubstitutorTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.resolve.jvm; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt index 5a53d98dee7..c91dcc67c10 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.j2k import java.io.File import com.intellij.testFramework.LightPlatformTestCase import com.intellij.psi.codeStyle.CodeStyleManager -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils import com.intellij.openapi.project.Project import com.intellij.openapi.command.WriteCommandAction import org.jetbrains.jet.plugin.j2k.J2kPostProcessor diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt index 8dfee91fc14..399a0b6a168 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt @@ -21,10 +21,10 @@ import com.intellij.openapi.util.io.FileUtil import java.util.regex.Pattern import com.intellij.testFramework.LightPlatformTestCase import com.intellij.psi.codeStyle.CodeStyleManager -import org.jetbrains.jet.JetTestUtils +import org.jetbrains.kotlin.test.JetTestUtils import com.intellij.openapi.project.Project import com.intellij.openapi.command.WriteCommandAction -import org.jetbrains.jet.test.util.trimIndent +import org.jetbrains.kotlin.test.util.trimIndent import org.jetbrains.jet.plugin.j2k.J2kPostProcessor import org.jetbrains.jet.plugin.JetWithJdkAndRuntimeLightProjectDescriptor import com.intellij.psi.PsiJavaFile diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt index 98db75ff6d7..de819dc5f1a 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterTest.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.diagnostics.Severity import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages import org.jetbrains.kotlin.psi.JetFile import org.jetbrains.jet.plugin.caches.resolve.analyzeFullyAndGetResult -import org.jetbrains.jet.JetTestCaseBuilder +import org.jetbrains.kotlin.test.JetTestCaseBuilder import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess public abstract class AbstractJavaToKotlinConverterTest : LightCodeInsightFixtureTestCase() { diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java index 5454cdba9f3..221f0ca36e0 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.j2k; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterMultiFileTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterMultiFileTestGenerated.java index 9b1b4e51b0a..6ec2d1f3893 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterMultiFileTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterMultiFileTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.j2k; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java index dd0ab94456a..e068e0ce308 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.j2k; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 842ccd9ec46..04a01820fee 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java index a540b85ebce..684eb0ad5a7 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/BasicTest.java @@ -29,16 +29,11 @@ import com.intellij.psi.PsiManager; import com.intellij.util.Consumer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.kotlin.config.CompilerConfiguration; -import org.jetbrains.kotlin.psi.JetFile; -import org.jetbrains.kotlin.psi.JetPsiFactory; -import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; -import org.jetbrains.kotlin.plugin.JetFileType; import org.jetbrains.kotlin.backend.common.output.OutputFileCollection; import org.jetbrains.kotlin.cli.common.output.outputUtils.OutputUtilsPackage; import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles; import org.jetbrains.kotlin.cli.jvm.compiler.JetCoreEnvironment; +import org.jetbrains.kotlin.config.CompilerConfiguration; import org.jetbrains.kotlin.js.JavaScript; import org.jetbrains.kotlin.js.config.Config; import org.jetbrains.kotlin.js.config.EcmaVersion; @@ -49,6 +44,11 @@ import org.jetbrains.kotlin.js.facade.Status; import org.jetbrains.kotlin.js.test.rhino.RhinoResultChecker; import org.jetbrains.kotlin.js.test.utils.JsTestUtils; import org.jetbrains.kotlin.js.translate.context.Namer; +import org.jetbrains.kotlin.plugin.JetFileType; +import org.jetbrains.kotlin.psi.JetFile; +import org.jetbrains.kotlin.psi.JetPsiFactory; +import org.jetbrains.kotlin.resolve.lazy.KotlinTestWithEnvironment; +import org.jetbrains.kotlin.test.JetTestUtils; import java.io.File; import java.io.IOException; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BridgeTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BridgeTestGenerated.java index a0d389fd64c..ae8b72c0905 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BridgeTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/BridgeTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DynamicTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DynamicTestGenerated.java index 13b4fc9aeae..30e1af08f62 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DynamicTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DynamicTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiModuleTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiModuleTestGenerated.java index d228a5e0110..96fa472d76f 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiModuleTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiModuleTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java index c5611b97c60..686d1f3e88d 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/ReservedWordTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.js.test.semantics; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java index 930166cc2f7..7ad6ad26ac2 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/utils/DirectiveTestUtils.java @@ -27,8 +27,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.jetbrains.jet.InTextDirectivesUtils.findLinesWithPrefixesRemoved; import static org.jetbrains.kotlin.js.inline.util.UtilPackage.collectInstances; +import static org.jetbrains.kotlin.test.InTextDirectivesUtils.findLinesWithPrefixesRemoved; import static org.junit.Assert.*; public class DirectiveTestUtils {